Instead of adding master, stub_not_protect_default_branch

This commit is contained in:
Lin Jen-Shin 2017-07-18 22:32:34 +08:00
parent 1ed6d1541c
commit 7bd5e57125
14 changed files with 66 additions and 29 deletions

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

@ -734,8 +734,10 @@ describe Ci::Pipeline, models: true do
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 @@ describe Ci::Pipeline, models: true do
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

View File

@ -7,8 +7,10 @@ describe JobEntity do
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 @@ describe JobEntity do
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 @@ describe JobEntity do
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

View File

@ -9,6 +9,8 @@ describe PipelineDetailsEntity do
end
before do
stub_not_protect_default_branch
allow(request).to receive(:current_user).and_return(user)
end
@ -52,7 +54,7 @@ describe PipelineDetailsEntity do
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 @@ describe PipelineDetailsEntity do
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

View File

@ -5,6 +5,8 @@ describe PipelineEntity do
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 @@ describe PipelineEntity do
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 @@ describe PipelineEntity do
context 'user has ability to cancel pipeline' do
before do
project.add_master(user)
project.add_developer(user)
end
it 'contains cancel path' do

View File

@ -9,7 +9,9 @@ describe Ci::ProcessPipelineService, '#execute', :services do
end
before do
project.add_master(user)
stub_not_protect_default_branch
project.add_developer(user)
end
context 'when simple pipeline is defined' do

View File

@ -85,7 +85,9 @@ describe Ci::RetryBuildService, :services do
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 @@ describe Ci::RetryBuildService, :services do
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'

View File

@ -244,7 +244,9 @@ describe CreateDeploymentService, services: true do
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) }

View File

@ -9,6 +9,11 @@ module StubConfiguration
.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