Add latest changes from gitlab-org/gitlab@master

3 files changed, 21 insertions, 4 deletions

diff --git a/spec/lib/gitlab/search_results_spec.rb b/spec/lib/gitlab/search_results_spec.rb
index 26cba53502d..86dde15cc8a 100644
--- a/spec/lib/gitlab/search_results_spec.rb
+++ b/spec/lib/gitlab/search_results_spec.rb
@@ -57,8 +57,8 @@ describe Gitlab::SearchResults do
 
       where(:count, :expected) do
         23   | '23'
-        100  | '100'
-        101  | max_limited_count
+        99   | '99'
+        100  | max_limited_count
         1234 | max_limited_count
       end
 
diff --git a/spec/policies/group_policy_spec.rb b/spec/policies/group_policy_spec.rb
index be55d94daec..d697840601f 100644
--- a/spec/policies/group_policy_spec.rb
+++ b/spec/policies/group_policy_spec.rb
@@ -9,6 +9,7 @@ describe GroupPolicy do
 
     it do
       expect_allowed(:read_group)
+      expect_allowed(*read_group_permissions)
       expect_disallowed(:upload_file)
       expect_disallowed(*reporter_permissions)
       expect_disallowed(*developer_permissions)
@@ -27,6 +28,7 @@ describe GroupPolicy do
     end
 
     it { expect_disallowed(:read_group) }
+    it { expect_disallowed(*read_group_permissions) }
   end
 
   context 'with foreign user and public project' do
@@ -39,6 +41,7 @@ describe GroupPolicy do
     end
 
     it { expect_disallowed(:read_group) }
+    it { expect_disallowed(*read_group_permissions) }
   end
 
   context 'has projects' do
@@ -49,13 +52,13 @@ describe GroupPolicy do
       project.add_developer(current_user)
     end
 
-    it { expect_allowed(:read_label, :read_list) }
+    it { expect_allowed(*read_group_permissions) }
 
     context 'in subgroups' do
       let(:subgroup) { create(:group, :private, parent: group) }
       let(:project) { create(:project, namespace: subgroup) }
 
-      it { expect_allowed(:read_label, :read_list) }
+      it { expect_allowed(*read_group_permissions) }
     end
   end
 
@@ -63,6 +66,7 @@ describe GroupPolicy do
     let(:current_user) { guest }
 
     it do
+      expect_allowed(*read_group_permissions)
       expect_allowed(*guest_permissions)
       expect_disallowed(*reporter_permissions)
       expect_disallowed(*developer_permissions)
@@ -75,6 +79,7 @@ describe GroupPolicy do
     let(:current_user) { reporter }
 
     it do
+      expect_allowed(*read_group_permissions)
       expect_allowed(*guest_permissions)
       expect_allowed(*reporter_permissions)
       expect_disallowed(*developer_permissions)
@@ -87,6 +92,7 @@ describe GroupPolicy do
     let(:current_user) { developer }
 
     it do
+      expect_allowed(*read_group_permissions)
       expect_allowed(*guest_permissions)
       expect_allowed(*reporter_permissions)
       expect_allowed(*developer_permissions)
@@ -110,6 +116,7 @@ describe GroupPolicy do
         updated_owner_permissions =
           owner_permissions - create_subgroup_permission
 
+        expect_allowed(*read_group_permissions)
         expect_allowed(*guest_permissions)
         expect_allowed(*reporter_permissions)
         expect_allowed(*developer_permissions)
@@ -120,6 +127,7 @@ describe GroupPolicy do
 
     context 'with subgroup_creation_level set to owner' do
       it 'allows every maintainer permission' do
+        expect_allowed(*read_group_permissions)
         expect_allowed(*guest_permissions)
         expect_allowed(*reporter_permissions)
         expect_allowed(*developer_permissions)
@@ -133,6 +141,7 @@ describe GroupPolicy do
     let(:current_user) { owner }
 
     it do
+      expect_allowed(*read_group_permissions)
       expect_allowed(*guest_permissions)
       expect_allowed(*reporter_permissions)
       expect_allowed(*developer_permissions)
@@ -145,6 +154,7 @@ describe GroupPolicy do
     let(:current_user) { admin }
 
     it do
+      expect_allowed(*read_group_permissions)
       expect_allowed(*guest_permissions)
       expect_allowed(*reporter_permissions)
       expect_allowed(*developer_permissions)
@@ -176,6 +186,7 @@ describe GroupPolicy do
       let(:current_user) { nil }
 
       it do
+        expect_disallowed(*read_group_permissions)
         expect_disallowed(*guest_permissions)
         expect_disallowed(*reporter_permissions)
         expect_disallowed(*developer_permissions)
@@ -188,6 +199,7 @@ describe GroupPolicy do
       let(:current_user) { guest }
 
       it do
+        expect_allowed(*read_group_permissions)
         expect_allowed(*guest_permissions)
         expect_disallowed(*reporter_permissions)
         expect_disallowed(*developer_permissions)
@@ -200,6 +212,7 @@ describe GroupPolicy do
       let(:current_user) { reporter }
 
       it do
+        expect_allowed(*read_group_permissions)
         expect_allowed(*guest_permissions)
         expect_allowed(*reporter_permissions)
         expect_disallowed(*developer_permissions)
@@ -212,6 +225,7 @@ describe GroupPolicy do
       let(:current_user) { developer }
 
       it do
+        expect_allowed(*read_group_permissions)
         expect_allowed(*guest_permissions)
         expect_allowed(*reporter_permissions)
         expect_allowed(*developer_permissions)
@@ -224,6 +238,7 @@ describe GroupPolicy do
       let(:current_user) { maintainer }
 
       it do
+        expect_allowed(*read_group_permissions)
         expect_allowed(*guest_permissions)
         expect_allowed(*reporter_permissions)
         expect_allowed(*developer_permissions)
@@ -236,6 +251,7 @@ describe GroupPolicy do
       let(:current_user) { owner }
 
       it do
+        expect_allowed(*read_group_permissions)
         expect_allowed(*guest_permissions)
         expect_allowed(*reporter_permissions)
         expect_allowed(*developer_permissions)
diff --git a/spec/support/shared_contexts/policies/group_policy_shared_context.rb b/spec/support/shared_contexts/policies/group_policy_shared_context.rb
index b89723b1e1a..2f3a1b911e4 100644
--- a/spec/support/shared_contexts/policies/group_policy_shared_context.rb
+++ b/spec/support/shared_contexts/policies/group_policy_shared_context.rb
@@ -16,6 +16,7 @@ RSpec.shared_context 'GroupPolicy context' do
       read_group_merge_requests
    ]
   end
+  let(:read_group_permissions) { %i[read_label read_list read_milestone] }
   let(:reporter_permissions) { %i[admin_label read_container_image] }
   let(:developer_permissions) { [:admin_milestone] }
   let(:maintainer_permissions) do