diff options
author | Kamil Trzciński <ayufan@ayufan.eu> | 2017-05-21 13:00:59 +0300 |
---|---|---|
committer | Kamil Trzciński <ayufan@ayufan.eu> | 2017-05-21 13:00:59 +0300 |
commit | fe1a814bc6b34496b792fbcce852c8035ec436b5 (patch) | |
tree | 5e5ecb84fce04a3fa212884ef44a6e91b222c0da /spec | |
parent | f5f99c9037e52392ca388b6e839d93df88421c31 (diff) | |
parent | f71a9de14d118fb14666df9f78365779308312e1 (diff) |
Merge branch 'fix/gb/exclude-manual-actions-from-cancelable-jobs' into 'master'
Exclude manual actions when checking if pipeline can be canceled
Closes #31107
See merge request !11562
Diffstat (limited to 'spec')
-rw-r--r-- | spec/models/ci/pipeline_spec.rb | 10 |
1 files changed, 10 insertions, 0 deletions
diff --git a/spec/models/ci/pipeline_spec.rb b/spec/models/ci/pipeline_spec.rb index 157d17fbb68..56b24ce62f3 100644 --- a/spec/models/ci/pipeline_spec.rb +++ b/spec/models/ci/pipeline_spec.rb @@ -854,6 +854,16 @@ describe Ci::Pipeline, models: true do end end end + + context 'when there is a manual action present in the pipeline' do + before do + create(:ci_build, :manual, pipeline: pipeline) + end + + it 'is not cancelable' do + expect(pipeline).not_to be_cancelable + end + end end describe '#cancel_running' do |