diff options
author | Douwe Maan <douwe@gitlab.com> | 2019-05-02 10:28:39 +0000 |
---|---|---|
committer | Douwe Maan <douwe@gitlab.com> | 2019-05-02 10:28:39 +0000 |
commit | 86900f00004ed5f862c3b72b4f643036f97a8e56 (patch) | |
tree | bee69e311b41536d323f617984b340df28f3febc /spec/lib | |
parent | 743508bfa5f19b201790f14648667eb38e255282 (diff) | |
parent | d6cf6fd754842d67fe4bcc39e35a9a298ac60091 (diff) | |
download | gitlab-ce-86900f00004ed5f862c3b72b4f643036f97a8e56.tar.gz |
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/lib')
-rw-r--r-- | spec/lib/gitlab/ci/status/build/factory_spec.rb | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/spec/lib/gitlab/ci/status/build/factory_spec.rb b/spec/lib/gitlab/ci/status/build/factory_spec.rb index b6231510b91..025439f1b6e 100644 --- a/spec/lib/gitlab/ci/status/build/factory_spec.rb +++ b/spec/lib/gitlab/ci/status/build/factory_spec.rb @@ -163,11 +163,11 @@ describe Gitlab::Ci::Status::Build::Factory do it 'matches correct extended statuses' do expect(factory.extended_statuses) - .to eq [Gitlab::Ci::Status::Build::Canceled, Gitlab::Ci::Status::Build::Retryable] + .to eq [Gitlab::Ci::Status::Build::Canceled] end - it 'fabricates a retryable build status' do - expect(status).to be_a Gitlab::Ci::Status::Build::Retryable + it 'does not fabricate a retryable build status' do + expect(status).not_to be_a Gitlab::Ci::Status::Build::Retryable end it 'fabricates status with correct details' do @@ -177,7 +177,7 @@ describe Gitlab::Ci::Status::Build::Factory do expect(status.illustration).to include(:image, :size, :title) expect(status.label).to eq 'canceled' expect(status).to have_details - expect(status).to have_action + expect(status).not_to have_action end end |