Add latest changes from gitlab-org/gitlab@master

3 files changed, 27 insertions, 23 deletions

diff --git a/spec/policies/group_member_policy_spec.rb b/spec/policies/group_member_policy_spec.rb
index 4215fa09301..9e58ea81ef3 100644
--- a/spec/policies/group_member_policy_spec.rb
+++ b/spec/policies/group_member_policy_spec.rb
@@ -42,6 +42,7 @@ RSpec.describe GroupMemberPolicy do
     it do
       expect_disallowed(:destroy_group_member)
       expect_disallowed(:update_group_member)
+      expect_allowed(:read_group)
     end
   end
 
diff --git a/spec/policies/prometheus_service_policy_spec.rb b/spec/policies/prometheus_service_policy_spec.rb
deleted file mode 100644
index 71fa2b9d630..00000000000
--- a/spec/policies/prometheus_service_policy_spec.rb
+++ /dev/null
@@ -1,23 +0,0 @@
-# frozen_string_literal: true
-
-require 'spec_helper'
-
-RSpec.describe PrometheusServicePolicy, :models do
-  let(:integration) { create(:prometheus_service) }
-  let(:project) { integration.project }
-  let(:user) { create(:user) }
-
-  subject(:policy) { described_class.new(user, integration) }
-
-  describe 'rules' do
-    it { is_expected.to be_disallowed :admin_project }
-
-    context 'when maintainer' do
-      before do
-        project.add_maintainer(user)
-      end
-
-      it { is_expected.to be_allowed :admin_project }
-    end
-  end
-end
diff --git a/spec/policies/service_policy_spec.rb b/spec/policies/service_policy_spec.rb
new file mode 100644
index 00000000000..5d2c9c1f6c3
--- /dev/null
+++ b/spec/policies/service_policy_spec.rb
@@ -0,0 +1,26 @@
+# frozen_string_literal: true
+
+require 'spec_helper'
+
+RSpec.describe ServicePolicy, :models do
+  let_it_be(:user) { create(:user) }
+  let(:project) { integration.project }
+
+  subject(:policy) { Ability.policy_for(user, integration) }
+
+  context 'when the integration is a prometheus_service' do
+    let(:integration) { create(:prometheus_service) }
+
+    describe 'rules' do
+      it { is_expected.to be_disallowed :admin_project }
+
+      context 'when maintainer' do
+        before do
+          project.add_maintainer(user)
+        end
+
+        it { is_expected.to be_allowed :admin_project }
+      end
+    end
+  end
+end