summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRémy Coutable <remy@rymai.me>2019-03-27 13:45:00 +0100
committerRémy Coutable <remy@rymai.me>2019-03-27 15:41:46 +0100
commitce4b70ce18893f7c2bdf6a52ce66dc5197eae40d (patch)
treedf7652a1b91fb6bc0d7f53b3faf0d92c995b10cf
parent1983d05ccd6f7484ed1634d744ac0f414c4967ff (diff)
downloadgitlab-ce-ce4b70ce18893f7c2bdf6a52ce66dc5197eae40d.tar.gz
Factorize policy helpers into PolicyHelpers
Signed-off-by: Rémy Coutable <remy@rymai.me>
-rw-r--r--spec/policies/board_policy_spec.rb8
-rw-r--r--spec/policies/group_policy_spec.rb8
-rw-r--r--spec/policies/project_snippet_policy_spec.rb8
-rw-r--r--spec/spec_helper.rb1
-rw-r--r--spec/support/helpers/policy_helpers.rb11
-rw-r--r--spec/support/shared_context/policies/project_policy_shared_context.rb8
6 files changed, 12 insertions, 32 deletions
diff --git a/spec/policies/board_policy_spec.rb b/spec/policies/board_policy_spec.rb
index 4b76d65ef69..52c23951e37 100644
--- a/spec/policies/board_policy_spec.rb
+++ b/spec/policies/board_policy_spec.rb
@@ -17,14 +17,6 @@ describe BoardPolicy do
]
end
- def expect_allowed(*permissions)
- permissions.each { |p| is_expected.to be_allowed(p) }
- end
-
- def expect_disallowed(*permissions)
- permissions.each { |p| is_expected.not_to be_allowed(p) }
- end
-
context 'group board' do
subject { described_class.new(user, group_board) }
diff --git a/spec/policies/group_policy_spec.rb b/spec/policies/group_policy_spec.rb
index 92bdaa8b8b8..6a5136c835e 100644
--- a/spec/policies/group_policy_spec.rb
+++ b/spec/policies/group_policy_spec.rb
@@ -51,14 +51,6 @@ describe GroupPolicy do
subject { described_class.new(current_user, group) }
- def expect_allowed(*permissions)
- permissions.each { |p| is_expected.to be_allowed(p) }
- end
-
- def expect_disallowed(*permissions)
- permissions.each { |p| is_expected.not_to be_allowed(p) }
- end
-
context 'with no user' do
let(:group) { create(:group, :public) }
let(:current_user) { nil }
diff --git a/spec/policies/project_snippet_policy_spec.rb b/spec/policies/project_snippet_policy_spec.rb
index c44797c1e7a..2e9ef1e89fd 100644
--- a/spec/policies/project_snippet_policy_spec.rb
+++ b/spec/policies/project_snippet_policy_spec.rb
@@ -15,14 +15,6 @@ describe ProjectSnippetPolicy do
subject { described_class.new(current_user, snippet) }
- def expect_allowed(*permissions)
- permissions.each { |p| is_expected.to be_allowed(p) }
- end
-
- def expect_disallowed(*permissions)
- permissions.each { |p| is_expected.not_to be_allowed(p) }
- end
-
context 'public snippet' do
let(:snippet_visibility) { :public }
diff --git a/spec/spec_helper.rb b/spec/spec_helper.rb
index e8d7b18bf04..b3bd453ebd6 100644
--- a/spec/spec_helper.rb
+++ b/spec/spec_helper.rb
@@ -96,6 +96,7 @@ RSpec.configure do |config|
config.include MigrationsHelpers, :migration
config.include RedisHelpers
config.include Rails.application.routes.url_helpers, type: :routing
+ config.include PolicyHelpers, type: :policy
if ENV['CI']
# This includes the first try, i.e. tests will be run 4 times before failing.
diff --git a/spec/support/helpers/policy_helpers.rb b/spec/support/helpers/policy_helpers.rb
new file mode 100644
index 00000000000..3d780eb5fb1
--- /dev/null
+++ b/spec/support/helpers/policy_helpers.rb
@@ -0,0 +1,11 @@
+# frozen_string_literal: true
+
+module PolicyHelpers
+ def expect_allowed(*permissions)
+ permissions.each { |p| is_expected.to be_allowed(p) }
+ end
+
+ def expect_disallowed(*permissions)
+ permissions.each { |p| is_expected.not_to be_allowed(p) }
+ end
+end
diff --git a/spec/support/shared_context/policies/project_policy_shared_context.rb b/spec/support/shared_context/policies/project_policy_shared_context.rb
index 2c71aabd292..8bcd26ec0cd 100644
--- a/spec/support/shared_context/policies/project_policy_shared_context.rb
+++ b/spec/support/shared_context/policies/project_policy_shared_context.rb
@@ -85,12 +85,4 @@ RSpec.shared_context 'ProjectPolicy context' do
project.add_developer(developer)
project.add_reporter(reporter)
end
-
- def expect_allowed(*permissions)
- permissions.each { |p| is_expected.to be_allowed(p) }
- end
-
- def expect_disallowed(*permissions)
- permissions.each { |p| is_expected.not_to be_allowed(p) }
- end
end