summaryrefslogtreecommitdiff
path: root/spec/services/ci/process_pipeline_service_spec.rb
diff options
context:
space:
mode:
authorGrzegorz Bizon <grzesiek.bizon@gmail.com>2017-05-31 10:40:52 +0200
committerGrzegorz Bizon <grzesiek.bizon@gmail.com>2017-05-31 10:40:52 +0200
commitf8eb8feae3aa146c41433308abd2e184d73688e5 (patch)
tree010228a7feddd1ae73660de9ac600d5c22b07317 /spec/services/ci/process_pipeline_service_spec.rb
parent0f52544baddd570646f8ae4c1d00eed1cdb6b59d (diff)
downloadgitlab-ce-f8eb8feae3aa146c41433308abd2e184d73688e5.tar.gz
Fix pipeline processing specs related to protected actions
Diffstat (limited to 'spec/services/ci/process_pipeline_service_spec.rb')
-rw-r--r--spec/services/ci/process_pipeline_service_spec.rb7
1 files changed, 4 insertions, 3 deletions
diff --git a/spec/services/ci/process_pipeline_service_spec.rb b/spec/services/ci/process_pipeline_service_spec.rb
index fc5de5d069a..1557cb3c938 100644
--- a/spec/services/ci/process_pipeline_service_spec.rb
+++ b/spec/services/ci/process_pipeline_service_spec.rb
@@ -333,10 +333,11 @@ describe Ci::ProcessPipelineService, '#execute', :services do
context 'when pipeline is promoted sequentially up to the end' do
before do
- # We are using create(:empty_project), and users has to be master in
- # order to execute manual action when repository does not exist.
+ # Users need ability to merge into a branch in order to trigger
+ # protected manual actions.
#
- project.add_master(user)
+ create(:protected_branch, :developers_can_merge,
+ name: 'master', project: project)
end
it 'properly processes entire pipeline' do