Add latest changes from gitlab-org/gitlab@master

2 files changed, 77 insertions, 0 deletions

diff --git a/spec/policies/concerns/crud_policy_helpers_spec.rb b/spec/policies/concerns/crud_policy_helpers_spec.rb
new file mode 100644
index 00000000000..69bf9ad12d6
--- /dev/null
+++ b/spec/policies/concerns/crud_policy_helpers_spec.rb
@@ -0,0 +1,50 @@
+# frozen_string_literal: true
+
+require 'spec_helper'
+
+RSpec.describe CrudPolicyHelpers do
+  let(:policy_test_class) do
+    Class.new do
+      include CrudPolicyHelpers
+    end
+  end
+
+  let(:feature_name) { :foo }
+
+  before do
+    stub_const('PolicyTestClass', policy_test_class)
+  end
+
+  describe '.create_read_update_admin_destroy' do
+    it 'returns an array of the appropriate abilites given a feature name' do
+      expect(PolicyTestClass.create_read_update_admin_destroy(feature_name)).to eq([
+        :read_foo,
+        :create_foo,
+        :update_foo,
+        :admin_foo,
+        :destroy_foo
+      ])
+    end
+  end
+
+  describe '.create_update_admin_destroy' do
+    it 'returns an array of the appropriate abilites given a feature name' do
+      expect(PolicyTestClass.create_update_admin_destroy(feature_name)).to eq([
+        :create_foo,
+        :update_foo,
+        :admin_foo,
+        :destroy_foo
+      ])
+    end
+  end
+
+  describe '.create_update_admin' do
+    it 'returns an array of the appropriate abilites given a feature name' do
+      expect(PolicyTestClass.create_update_admin(feature_name)).to eq([
+        :create_foo,
+        :update_foo,
+        :admin_foo
+      ])
+    end
+  end
+end
diff --git a/spec/policies/concerns/readonly_abilities_spec.rb b/spec/policies/concerns/readonly_abilities_spec.rb
new file mode 100644
index 00000000000..864924a091d
--- /dev/null
+++ b/spec/policies/concerns/readonly_abilities_spec.rb
@@ -0,0 +1,27 @@
+# frozen_string_literal: true
+
+require 'spec_helper'
+
+RSpec.describe ReadonlyAbilities do
+  let(:test_class) do
+    Class.new do
+      include ReadonlyAbilities
+    end
+  end
+
+  before do
+    stub_const('TestClass', test_class)
+  end
+
+  describe '.readonly_abilities' do
+    it 'returns an array of abilites to be prevented when readonly' do
+      expect(TestClass.readonly_abilities).to include(*described_class::READONLY_ABILITIES)
+    end
+  end
+
+  describe '.readonly_features' do
+    it 'returns an array of features to be prevented when readonly' do
+      expect(TestClass.readonly_features).to include(*described_class::READONLY_FEATURES)
+    end
+  end
+end