summaryrefslogtreecommitdiff
path: root/spec/policies
diff options
context:
space:
mode:
authorLin Jen-Shin <godfat@godfat.org>2017-07-04 05:20:44 +0800
committerLin Jen-Shin <godfat@godfat.org>2017-07-04 16:02:30 +0800
commit005870d5ce1a00b3405d0ae3a639d0c4befcb7a2 (patch)
tree69fbec62f3e8392dc9e273c68488a1814033aec2 /spec/policies
parent39573c6dde39de2345f100586c2c10f74187f6c1 (diff)
downloadgitlab-ce-005870d5ce1a00b3405d0ae3a639d0c4befcb7a2.tar.gz
Fix bad conflict resolution
Diffstat (limited to 'spec/policies')
-rw-r--r--spec/policies/ci/build_policy_spec.rb6
-rw-r--r--spec/policies/ci/pipeline_policy_spec.rb10
2 files changed, 8 insertions, 8 deletions
diff --git a/spec/policies/ci/build_policy_spec.rb b/spec/policies/ci/build_policy_spec.rb
index 2a8e6653eb8..9e2b0506bf3 100644
--- a/spec/policies/ci/build_policy_spec.rb
+++ b/spec/policies/ci/build_policy_spec.rb
@@ -110,7 +110,7 @@ describe Ci::BuildPolicy, :models do
let(:branch_policy) { :no_one_can_push }
it 'does not include ability to update build' do
- expect(policies).to be_disallowed :update_build
+ expect(policy).to be_disallowed :update_build
end
end
@@ -118,7 +118,7 @@ describe Ci::BuildPolicy, :models do
let(:branch_policy) { :developers_can_push }
it 'includes ability to update build' do
- expect(policies).to be_allowed :update_build
+ expect(policy).to be_allowed :update_build
end
end
@@ -126,7 +126,7 @@ describe Ci::BuildPolicy, :models do
let(:branch_policy) { :developers_can_merge }
it 'includes ability to update build' do
- expect(policies).to be_allowed :update_build
+ expect(policy).to be_allowed :update_build
end
end
end
diff --git a/spec/policies/ci/pipeline_policy_spec.rb b/spec/policies/ci/pipeline_policy_spec.rb
index db09be96875..cc04230411f 100644
--- a/spec/policies/ci/pipeline_policy_spec.rb
+++ b/spec/policies/ci/pipeline_policy_spec.rb
@@ -4,8 +4,8 @@ describe Ci::PipelinePolicy, :models do
let(:user) { create(:user) }
let(:pipeline) { create(:ci_empty_pipeline, project: project) }
- let(:policies) do
- described_class.abilities(user, pipeline).to_set
+ let(:policy) do
+ described_class.new(user, pipeline)
end
describe 'rules' do
@@ -23,7 +23,7 @@ describe Ci::PipelinePolicy, :models do
let(:branch_policy) { :no_one_can_push }
it 'does not include ability to update pipeline' do
- expect(policies).to be_disallowed :update_pipeline
+ expect(policy).to be_disallowed :update_pipeline
end
end
@@ -31,7 +31,7 @@ describe Ci::PipelinePolicy, :models do
let(:branch_policy) { :developers_can_push }
it 'includes ability to update pipeline' do
- expect(policies).to be_allowed :update_pipeline
+ expect(policy).to be_allowed :update_pipeline
end
end
@@ -39,7 +39,7 @@ describe Ci::PipelinePolicy, :models do
let(:branch_policy) { :developers_can_merge }
it 'includes ability to update pipeline' do
- expect(policies).to be_allowed :update_pipeline
+ expect(policy).to be_allowed :update_pipeline
end
end
end