summaryrefslogtreecommitdiff
path: root/spec/services/ci
diff options
context:
space:
mode:
authorGrzegorz Bizon <grzesiek.bizon@gmail.com>2017-03-03 15:18:31 +0100
committerGrzegorz Bizon <grzesiek.bizon@gmail.com>2017-03-06 10:04:04 +0100
commit9b27f49d2eb52357a920a6a0155a75721848dc77 (patch)
treefcb099bfe8d85d142f7d7cc37c8d186e8e4e84d7 /spec/services/ci
parentd87132b46344b460bb8cba87df48218f65df29f3 (diff)
downloadgitlab-ce-9b27f49d2eb52357a920a6a0155a75721848dc77.tar.gz
Adjust pipeline retry specs to use manual statuses
Diffstat (limited to 'spec/services/ci')
-rw-r--r--spec/services/ci/retry_pipeline_service_spec.rb8
1 files changed, 4 insertions, 4 deletions
diff --git a/spec/services/ci/retry_pipeline_service_spec.rb b/spec/services/ci/retry_pipeline_service_spec.rb
index 2ba8c6f68fe..ed2f07c4a7c 100644
--- a/spec/services/ci/retry_pipeline_service_spec.rb
+++ b/spec/services/ci/retry_pipeline_service_spec.rb
@@ -100,7 +100,7 @@ describe Ci::RetryPipelineService, '#execute', :services do
service.execute(pipeline)
expect(build('rspec 1')).to be_pending
- expect(build('staging')).to be_skipped
+ expect(build('staging')).to be_manual
expect(build('rspec 2')).to be_created
expect(pipeline.reload).to be_running
end
@@ -117,7 +117,7 @@ describe Ci::RetryPipelineService, '#execute', :services do
service.execute(pipeline)
expect(build('rspec 1')).to be_pending
- expect(build('rspec 2')).to be_skipped
+ expect(build('rspec 2')).to be_manual
expect(build('staging')).to be_created
expect(pipeline.reload).to be_running
end
@@ -144,11 +144,11 @@ describe Ci::RetryPipelineService, '#execute', :services do
create_build('staging', :created, 0, when: :manual, allow_failure: true)
end
- it 'retries canceled job and skipps the manual action' do
+ it 'retries canceled job and processes the manual action' do
service.execute(pipeline)
expect(build('rspec 1')).to be_pending
- expect(build('staging')).to be_skipped
+ expect(build('staging')).to be_manual
expect(pipeline.reload).to be_running
end
end