From 7460c39f60bcf326dee062bdf3aa2ddda38e86e5 Mon Sep 17 00:00:00 2001 From: Robert Speicher Date: Fri, 19 Jun 2015 12:14:53 -0400 Subject: [PATCH] Fix GitPushService spec --- spec/services/git_push_service_spec.rb | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/spec/services/git_push_service_spec.rb b/spec/services/git_push_service_spec.rb index dfbece18cdc..435b14eb245 100644 --- a/spec/services/git_push_service_spec.rb +++ b/spec/services/git_push_service_spec.rb @@ -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")