kotovalexarian-likes-gitlab
/
gitlab-org--gitlab-foss
1
0
Fork 0
Code Releases Activity

Fix GitPushService spec

This commit is contained in:
Robert Speicher 2015-06-19 12:14:53 -04:00 committed by Dmitriy Zaporozhets
parent 2120e2dd95
commit 7460c39f60
1 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
spec/services/git_push_service_spec.rb
View File

@ -124,8 +124,9 @@ describe GitPushService do
end
it "when pushing a branch for the first time with default branch protection disabled" do
allow_any_instance_of(ApplicationSetting).
to receive(:default_branch_protection).and_return(0)
allow(ApplicationSetting.current_application_settings).
to receive(:default_branch_protection).
and_return(Gitlab::Access::PROTECTION_NONE)
expect(project).to receive(:execute_hooks)
expect(project.default_branch).to eq("master")
@ -134,8 +135,9 @@ describe GitPushService do
end
it "when pushing a branch for the first time with default branch protection set to 'developers can push'" do
allow_any_instance_of(ApplicationSetting).
to receive(:default_branch_protection).and_return(1)
allow(ApplicationSetting.current_application_settings).
to receive(:default_branch_protection).
and_return(Gitlab::Access::PROTECTION_DEV_CAN_PUSH)
expect(project).to receive(:execute_hooks)
expect(project.default_branch).to eq("master")