diff options
author | Grzegorz Bizon <grzegorz@gitlab.com> | 2018-03-06 16:20:33 +0000 |
---|---|---|
committer | Grzegorz Bizon <grzegorz@gitlab.com> | 2018-03-06 16:20:33 +0000 |
commit | 12bc2d8df0890fad3296b47395fb7279a11e43c1 (patch) | |
tree | fa1905eb722c4b11237fcfc52f95baecab0dc05c /spec/requests | |
parent | e5d03612552d1aedb24dcb1347bc507835a97757 (diff) | |
parent | 0ac1322045bd6d069aa74da04df7fb2d2797a3f0 (diff) | |
download | gitlab-ce-12bc2d8df0890fad3296b47395fb7279a11e43c1.tar.gz |
Merge branch 'proper-fix-for-artifacts-service' into 'master'
Add archive feature to trace
Closes #43022 and gitlab-ee#4170
See merge request gitlab-org/gitlab-ce!17314
Diffstat (limited to 'spec/requests')
-rw-r--r-- | spec/requests/api/runner_spec.rb | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/spec/requests/api/runner_spec.rb b/spec/requests/api/runner_spec.rb index ce1311ac97c..95c23726a79 100644 --- a/spec/requests/api/runner_spec.rb +++ b/spec/requests/api/runner_spec.rb @@ -698,10 +698,10 @@ describe API::Runner do end end - context 'when tace is given' do + context 'when trace is given' do it 'creates a trace artifact' do allow(BuildFinishedWorker).to receive(:perform_async).with(job.id) do - CreateTraceArtifactWorker.new.perform(job.id) + ArchiveTraceWorker.new.perform(job.id) end update_job(state: 'success', trace: 'BUILD TRACE UPDATED') |