diff options
| author | Zeger-Jan van de Weg <git@zjvandeweg.nl> | 2017-11-12 13:02:38 +0100 |
|---|---|---|
| committer | Kamil Trzcinski <ayufan@ayufan.eu> | 2017-12-03 12:04:49 +0100 |
| commit | e2242cdf75d2734f78f694ab3191fcbb31947a6f (patch) | |
| tree | 2daa4fb459999a046f29c1e5e9a045c8e6726b6a | |
| parent | ba5697fd809563cb2fd619d7c50362303ab86434 (diff) | |
| download | gitlab-ce-e2242cdf75d2734f78f694ab3191fcbb31947a6f.tar.gz | |
Last test fixes multiple artifacts
| -rw-r--r-- | spec/requests/api/runner_spec.rb | 2 | ||||
| -rw-r--r-- | spec/tasks/gitlab/backup_rake_spec.rb | 1 |
2 files changed, 1 insertions, 2 deletions
diff --git a/spec/requests/api/runner_spec.rb b/spec/requests/api/runner_spec.rb index f320a366e6e..72962f5d0b4 100644 --- a/spec/requests/api/runner_spec.rb +++ b/spec/requests/api/runner_spec.rb @@ -1131,7 +1131,7 @@ describe API::Runner do # by configuring this path we allow to pass file from @tmpdir only # but all temporary files are stored in system tmp directory @tmpdir = Dir.mktmpdir - allow(ArtifactUploader).to receive(:artifacts_upload_path).and_return(@tmpdir) + allow(JobArtifactUploader).to receive(:artifacts_upload_path).and_return(@tmpdir) end after do diff --git a/spec/tasks/gitlab/backup_rake_spec.rb b/spec/tasks/gitlab/backup_rake_spec.rb index 52f81106829..bf2e11bc360 100644 --- a/spec/tasks/gitlab/backup_rake_spec.rb +++ b/spec/tasks/gitlab/backup_rake_spec.rb @@ -24,7 +24,6 @@ describe 'gitlab:app namespace rake task' do # We need this directory to run `gitlab:backup:create` task FileUtils.mkdir_p('public/uploads') - FileUtils.mkdir_p(Rails.root.join('tmp/tests/artifacts')) end before do |