diff options
author | Douwe Maan <douwe@gitlab.com> | 2019-05-02 13:28:39 +0300 |
---|---|---|
committer | Douwe Maan <douwe@gitlab.com> | 2019-05-02 13:28:39 +0300 |
commit | 86900f00004ed5f862c3b72b4f643036f97a8e56 (patch) | |
tree | bee69e311b41536d323f617984b340df28f3febc /spec/requests | |
parent | 743508bfa5f19b201790f14648667eb38e255282 (diff) | |
parent | d6cf6fd754842d67fe4bcc39e35a9a298ac60091 (diff) |
Merge branch '53064-bypassing-pipeline-jobs-by-canceling-the-pipeline-and-manually-running-later-jobs' into 'master'
Disable retrying cancelled jobs
Closes #53064
See merge request gitlab-org/gitlab-ce!27503
Diffstat (limited to 'spec/requests')
-rw-r--r-- | spec/requests/api/jobs_spec.rb | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/spec/requests/api/jobs_spec.rb b/spec/requests/api/jobs_spec.rb index ed2ef4c730b..c14507de186 100644 --- a/spec/requests/api/jobs_spec.rb +++ b/spec/requests/api/jobs_spec.rb @@ -863,7 +863,7 @@ describe API::Jobs do end describe 'POST /projects/:id/jobs/:job_id/retry' do - let(:job) { create(:ci_build, :canceled, pipeline: pipeline) } + let(:job) { create(:ci_build, :failed, pipeline: pipeline) } before do post api("/projects/#{project.id}/jobs/#{job.id}/retry", api_user) @@ -873,7 +873,7 @@ describe API::Jobs do context 'user with :update_build permission' do it 'retries non-running job' do expect(response).to have_gitlab_http_status(201) - expect(project.builds.first.status).to eq('canceled') + expect(project.builds.first.status).to eq('failed') expect(json_response['status']).to eq('pending') end end |