Instead of adding master, stub_not_protect_default_branch

7bd5e571 · Lin Jen-Shin · 1ed6d154 · 7bd5e571 · 7bd5e571 · 7bd5e571
--- a/spec/controllers/projects/jobs_controller_spec.rb
+++ b/spec/controllers/projects/jobs_controller_spec.rb
@@ -7,6 +7,10 @@
  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 @@ def get_trace

  describe 'POST retry' do
    before do
-      project.add_master(user)
+      project.add_developer(user)
      sign_in(user)

      post_retry
@@ -250,7 +254,7 @@ def post_retry

  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 @@ def post_play

  describe 'POST cancel' do
    before do
-      project.add_master(user)
+      project.add_developer(user)
      sign_in(user)

      post_cancel
@@ -326,7 +330,7 @@ def post_cancel

  describe 'POST cancel_all' do
    before do
-      project.add_master(user)
+      project.add_developer(user)
      sign_in(user)
    end

@@ -368,7 +372,7 @@ def post_cancel_all

  describe 'POST erase' do
    before do
-      project.add_master(user)
+      project.add_developer(user)
      sign_in(user)

      post_erase

--- a/spec/controllers/projects/pipelines_controller_spec.rb
+++ b/spec/controllers/projects/pipelines_controller_spec.rb
@@ -8,7 +8,8 @@
  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)


--- 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 '#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 }

--- a/spec/lib/gitlab/ci/status/build/factory_spec.rb
+++ b/spec/lib/gitlab/ci/status/build/factory_spec.rb
@@ -7,7 +7,9 @@
  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 @@

      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 @@

      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

--- 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 '#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 }

--- 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 '#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 }

--- a/spec/models/ci/pipeline_spec.rb
+++ b/spec/models/ci/pipeline_spec.rb
@@ -734,8 +734,10 @@ def create_pipeline(status, ref, sha)

    context 'on failure and build retry' do
      before do
+        stub_not_protect_default_branch
+
        build.drop
-        project.add_master(user)
+        project.add_developer(user)

        Ci::Build.retry(build, user)
      end
@@ -999,7 +1001,9 @@ def create_pipeline(status, ref, sha)
    let(:latest_status) { pipeline.statuses.latest.pluck(:status) }

    before do
-      project.add_master(user)
+      stub_not_protect_default_branch
+
+      project.add_developer(user)
    end

    context 'when there is a failed build and failed external status' do

--- a/spec/serializers/job_entity_spec.rb
+++ b/spec/serializers/job_entity_spec.rb
@@ -7,8 +7,10 @@
  let(:request) { double('request') }

  before do
+    stub_not_protect_default_branch
    allow(request).to receive(:current_user).and_return(user)
-    project.add_master(user)
+
+    project.add_developer(user)
  end

  let(:entity) do
@@ -77,7 +79,7 @@
        project.add_developer(user)

        create(:protected_branch, :developers_can_merge,
-               name: 'master', project: project)
+               name: job.ref, project: job.project)
      end

      it 'contains path to play action' do
@@ -91,7 +93,10 @@

    context 'when user is not allowed to trigger action' do
      before do
-        project.team.truncate
+        allow(job.project).to receive(:empty_repo?).and_return(false)
+
+        create(:protected_branch, :no_one_can_push,
+               name: job.ref, project: job.project)
      end

      it 'does not contain path to play action' do

--- a/spec/serializers/pipeline_details_entity_spec.rb
+++ b/spec/serializers/pipeline_details_entity_spec.rb
@@ -9,6 +9,8 @@
  end

  before do
+    stub_not_protect_default_branch
+
    allow(request).to receive(:current_user).and_return(user)
  end

@@ -52,7 +54,7 @@

      context 'user has ability to retry pipeline' do
        before do
-          project.add_master(user)
+          project.add_developer(user)
        end

        it 'retryable flag is true' do
@@ -80,7 +82,7 @@

      context 'user has ability to cancel pipeline' do
        before do
-          project.add_master(user)
+          project.add_developer(user)
        end

        it 'cancelable flag is true' do

--- a/spec/serializers/pipeline_entity_spec.rb
+++ b/spec/serializers/pipeline_entity_spec.rb
@@ -5,6 +5,8 @@
  let(:request) { double('request') }

  before do
+    stub_not_protect_default_branch
+
    allow(request).to receive(:current_user).and_return(user)
  end

@@ -52,7 +54,7 @@

      context 'user has ability to retry pipeline' do
        before do
-          project.add_master(user)
+          project.add_developer(user)
        end

        it 'contains retry path' do
@@ -80,7 +82,7 @@

      context 'user has ability to cancel pipeline' do
        before do
-          project.add_master(user)
+          project.add_developer(user)
        end

        it 'contains cancel path' do

--- a/spec/services/ci/process_pipeline_service_spec.rb
+++ b/spec/services/ci/process_pipeline_service_spec.rb
@@ -9,7 +9,9 @@
  end

  before do
-    project.add_master(user)
+    stub_not_protect_default_branch
+
+    project.add_developer(user)
  end

  context 'when simple pipeline is defined' do

--- a/spec/services/ci/retry_build_service_spec.rb
+++ b/spec/services/ci/retry_build_service_spec.rb
@@ -85,7 +85,9 @@

    context 'when user has ability to execute build' do
      before do
-        project.add_master(user)
+        stub_not_protect_default_branch
+
+        project.add_developer(user)
      end

      it_behaves_like 'build duplication'
@@ -131,7 +133,9 @@

    context 'when user has ability to execute build' do
      before do
-        project.add_master(user)
+        stub_not_protect_default_branch
+
+        project.add_developer(user)
      end

      it_behaves_like 'build duplication'

--- a/spec/services/create_deployment_service_spec.rb
+++ b/spec/services/create_deployment_service_spec.rb
@@ -244,7 +244,9 @@
      context 'when job is retried' do
        it_behaves_like 'creates deployment' do
          before do
-            project.add_master(user)
+            stub_not_protect_default_branch
+
+            project.add_developer(user)
          end

          let(:deployable) { Ci::Build.retry(job, user) }

--- a/spec/support/stub_configuration.rb
+++ b/spec/support/stub_configuration.rb
@@ -9,6 +9,11 @@ def stub_application_setting(messages)
      .to receive_messages(messages)
  end

+  def stub_not_protect_default_branch
+    stub_application_setting(
+      default_branch_protection: Gitlab::Access::PROTECTION_NONE)
+  end
+
  def stub_config_setting(messages)
    allow(Gitlab.config.gitlab).to receive_messages(messages)
  end