diff options
author | Grzegorz Bizon <grzegorz@gitlab.com> | 2017-05-31 21:15:40 +0000 |
---|---|---|
committer | Grzegorz Bizon <grzegorz@gitlab.com> | 2017-05-31 21:15:40 +0000 |
commit | eb728d37a7ed940d9d9b1f762c4ea65cc8e35a56 (patch) | |
tree | be6524aa6298385e9bcb93789989bd225b65b043 /spec/services/ci/retry_pipeline_service_spec.rb | |
parent | 161af17c1b69e7e00aefcd4f540a55755259ceda (diff) | |
parent | 3fc4b2c86090841d9a6245b9b73e46231610703e (diff) | |
download | gitlab-ce-eb728d37a7ed940d9d9b1f762c4ea65cc8e35a56.tar.gz |
Merge branch 'master' into 'trigger-source'
# Conflicts:
# db/schema.rb
Diffstat (limited to 'spec/services/ci/retry_pipeline_service_spec.rb')
-rw-r--r-- | spec/services/ci/retry_pipeline_service_spec.rb | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/spec/services/ci/retry_pipeline_service_spec.rb b/spec/services/ci/retry_pipeline_service_spec.rb index d941d56c0d8..3e860203063 100644 --- a/spec/services/ci/retry_pipeline_service_spec.rb +++ b/spec/services/ci/retry_pipeline_service_spec.rb @@ -6,9 +6,12 @@ describe Ci::RetryPipelineService, '#execute', :services do let(:pipeline) { create(:ci_pipeline, project: project) } let(:service) { described_class.new(project, user) } - context 'when user has ability to modify pipeline' do + context 'when user has full ability to modify pipeline' do before do - project.add_master(user) + project.add_developer(user) + + create(:protected_branch, :developers_can_merge, + name: pipeline.ref, project: project) end context 'when there are already retried jobs present' do |