diff options
Diffstat (limited to 'spec/controllers/projects')
-rw-r--r-- | spec/controllers/projects/jobs_controller_spec.rb | 14 | ||||
-rw-r--r-- | spec/controllers/projects/pipelines_controller_spec.rb | 3 |
2 files changed, 11 insertions, 6 deletions
diff --git a/spec/controllers/projects/jobs_controller_spec.rb b/spec/controllers/projects/jobs_controller_spec.rb index 9ed48d98360..5a295ae47a6 100644 --- a/spec/controllers/projects/jobs_controller_spec.rb +++ b/spec/controllers/projects/jobs_controller_spec.rb @@ -7,6 +7,10 @@ describe Projects::JobsController do let(:pipeline) { create(:ci_pipeline, project: project) } let(:user) { create(:user) } + before do + stub_not_protect_default_branch + end + describe 'GET index' do context 'when scope is pending' do before do @@ -218,7 +222,7 @@ describe Projects::JobsController do describe 'POST retry' do before do - project.add_master(user) + project.add_developer(user) sign_in(user) post_retry @@ -250,7 +254,7 @@ describe Projects::JobsController do describe 'POST play' do before do - project.add_master(user) + project.add_developer(user) create(:protected_branch, :developers_can_merge, name: 'master', project: project) @@ -290,7 +294,7 @@ describe Projects::JobsController do describe 'POST cancel' do before do - project.add_master(user) + project.add_developer(user) sign_in(user) post_cancel @@ -326,7 +330,7 @@ describe Projects::JobsController do describe 'POST cancel_all' do before do - project.add_master(user) + project.add_developer(user) sign_in(user) end @@ -368,7 +372,7 @@ describe Projects::JobsController do describe 'POST erase' do before do - project.add_master(user) + project.add_developer(user) sign_in(user) post_erase diff --git a/spec/controllers/projects/pipelines_controller_spec.rb b/spec/controllers/projects/pipelines_controller_spec.rb index 3b4d7d069c9..c8de275ca3e 100644 --- a/spec/controllers/projects/pipelines_controller_spec.rb +++ b/spec/controllers/projects/pipelines_controller_spec.rb @@ -8,7 +8,8 @@ describe Projects::PipelinesController do let(:feature) { ProjectFeature::DISABLED } before do - project.add_master(user) + stub_not_protect_default_branch + project.add_developer(user) project.project_feature.update( builds_access_level: feature) |