Instead of adding master, stub_not_protect_default_branch

4 files changed, 16 insertions, 10 deletions

diff --git a/spec/lib/gitlab/ci/status/build/cancelable_spec.rb b/spec/lib/gitlab/ci/status/build/cancelable_spec.rb
index e7b880c9b09..5a7a42d84c0 100644
--- a/spec/lib/gitlab/ci/status/build/cancelable_spec.rb
+++ b/spec/lib/gitlab/ci/status/build/cancelable_spec.rb
@@ -48,7 +48,9 @@ describe Gitlab::Ci::Status::Build::Cancelable do
     describe '#has_action?' do
       context 'when user is allowed to update build' do
         before do
-          build.project.add_master(user)
+          stub_not_protect_default_branch
+
+          build.project.add_developer(user)
         end
 
         it { is_expected.to have_action }
diff --git a/spec/lib/gitlab/ci/status/build/factory_spec.rb b/spec/lib/gitlab/ci/status/build/factory_spec.rb
index bc21b8af67c..8768302eda1 100644
--- a/spec/lib/gitlab/ci/status/build/factory_spec.rb
+++ b/spec/lib/gitlab/ci/status/build/factory_spec.rb
@@ -7,7 +7,9 @@ describe Gitlab::Ci::Status::Build::Factory do
   let(:factory) { described_class.new(build, user) }
 
   before do
-    project.add_master(user)
+    stub_not_protect_default_branch
+
+    project.add_developer(user)
   end
 
   context 'when build is successful' do
@@ -232,11 +234,10 @@ describe Gitlab::Ci::Status::Build::Factory do
 
       context 'when user does not have ability to play action' do
         before do
-          project.team.truncate
-          project.add_developer(user)
+          allow(build.project).to receive(:empty_repo?).and_return(false)
 
           create(:protected_branch, :no_one_can_push,
-                 name: build.ref, project: project)
+                 name: build.ref, project: build.project)
         end
 
         it 'fabricates status that has no action' do
@@ -264,11 +265,10 @@ describe Gitlab::Ci::Status::Build::Factory do
 
       context 'when user is not allowed to execute manual action' do
         before do
-          project.team.truncate
-          project.add_developer(user)
+          allow(build.project).to receive(:empty_repo?).and_return(false)
 
           create(:protected_branch, :no_one_can_push,
-                 name: build.ref, project: project)
+                 name: build.ref, project: build.project)
         end
 
         it 'fabricates status with correct details' do
diff --git a/spec/lib/gitlab/ci/status/build/retryable_spec.rb b/spec/lib/gitlab/ci/status/build/retryable_spec.rb
index ed9752b4ed6..21026f2c968 100644
--- a/spec/lib/gitlab/ci/status/build/retryable_spec.rb
+++ b/spec/lib/gitlab/ci/status/build/retryable_spec.rb
@@ -48,7 +48,9 @@ describe Gitlab::Ci::Status::Build::Retryable do
     describe '#has_action?' do
       context 'when user is allowed to update build' do
         before do
-          build.project.add_master(user)
+          stub_not_protect_default_branch
+
+          build.project.add_developer(user)
         end
 
         it { is_expected.to have_action }
diff --git a/spec/lib/gitlab/ci/status/build/stop_spec.rb b/spec/lib/gitlab/ci/status/build/stop_spec.rb
index 7fe3cf7ea6d..e0425103f41 100644
--- a/spec/lib/gitlab/ci/status/build/stop_spec.rb
+++ b/spec/lib/gitlab/ci/status/build/stop_spec.rb
@@ -20,7 +20,9 @@ describe Gitlab::Ci::Status::Build::Stop do
     describe '#has_action?' do
       context 'when user is allowed to update build' do
         before do
-          build.project.add_master(user)
+          stub_not_protect_default_branch
+
+          build.project.add_developer(user)
         end
 
         it { is_expected.to have_action }