Add latest changes from gitlab-org/gitlab@14-0-stable-eev14.0.0-rc42

3 files changed, 27 insertions, 26 deletions

diff --git a/spec/controllers/groups/group_members_controller_spec.rb b/spec/controllers/groups/group_members_controller_spec.rb
index b666f73110a..4b17326de09 100644
--- a/spec/controllers/groups/group_members_controller_spec.rb
+++ b/spec/controllers/groups/group_members_controller_spec.rb
@@ -17,7 +17,7 @@ RSpec.describe Groups::GroupMembersController do
   end
 
   describe 'GET index' do
-    it 'renders index with 200 status code' do
+    it 'renders index with 200 status code', :aggregate_failures do
       get :index, params: { group_id: group }
 
       expect(response).to have_gitlab_http_status(:ok)
@@ -32,14 +32,6 @@ RSpec.describe Groups::GroupMembersController do
         sign_in(user)
       end
 
-      it 'assigns max_access_for_group' do
-        allow(controller).to receive(:current_user).and_return(user)
-
-        get :index, params: { group_id: group }
-
-        expect(user.max_access_for_group[group.id]).to eq(Gitlab::Access::OWNER)
-      end
-
       it 'assigns invited members' do
         get :index, params: { group_id: group }
 
@@ -126,7 +118,7 @@ RSpec.describe Groups::GroupMembersController do
         group.add_developer(user)
       end
 
-      it 'returns 403' do
+      it 'returns 403', :aggregate_failures do
         post :create, params: {
                         group_id: group,
                         user_ids: group_user.id,
@@ -143,7 +135,7 @@ RSpec.describe Groups::GroupMembersController do
         group.add_owner(user)
       end
 
-      it 'adds user to members' do
+      it 'adds user to members', :aggregate_failures, :snowplow do
         post :create, params: {
                         group_id: group,
                         user_ids: group_user.id,
@@ -153,9 +145,16 @@ RSpec.describe Groups::GroupMembersController do
         expect(controller).to set_flash.to 'Users were successfully added.'
         expect(response).to redirect_to(group_group_members_path(group))
         expect(group.users).to include group_user
+        expect_snowplow_event(
+          category: 'Members::CreateService',
+          action: 'create_member',
+          label: 'group-members-page',
+          property: 'existing_user',
+          user: user
+        )
       end
 
-      it 'adds no user to members' do
+      it 'adds no user to members', :aggregate_failures do
         post :create, params: {
                         group_id: group,
                         user_ids: '',
@@ -185,7 +184,7 @@ RSpec.describe Groups::GroupMembersController do
       context 'when set to a date in the past' do
         let(:expires_at) { 2.days.ago }
 
-        it 'does not add user to members' do
+        it 'does not add user to members', :aggregate_failures do
           subject
 
           expect(flash[:alert]).to include('Expires at cannot be a date in the past')
@@ -197,7 +196,7 @@ RSpec.describe Groups::GroupMembersController do
       context 'when set to a date in the future' do
         let(:expires_at) { 5.days.from_now }
 
-        it 'adds user to members' do
+        it 'adds user to members', :aggregate_failures do
           subject
 
           expect(controller).to set_flash.to 'Users were successfully added.'
@@ -334,7 +333,7 @@ RSpec.describe Groups::GroupMembersController do
           group.add_developer(user)
         end
 
-        it 'returns 403' do
+        it 'returns 403', :aggregate_failures do
           delete :destroy, params: { group_id: group, id: member }
 
           expect(response).to have_gitlab_http_status(:forbidden)
@@ -347,7 +346,7 @@ RSpec.describe Groups::GroupMembersController do
           group.add_owner(user)
         end
 
-        it '[HTML] removes user from members' do
+        it '[HTML] removes user from members', :aggregate_failures do
           delete :destroy, params: { group_id: group, id: member }
 
           expect(controller).to set_flash.to 'User was successfully removed from group.'
@@ -356,7 +355,7 @@ RSpec.describe Groups::GroupMembersController do
           expect(sub_group.members).to include sub_member
         end
 
-        it '[HTML] removes user from members including subgroups and projects' do
+        it '[HTML] removes user from members including subgroups and projects', :aggregate_failures do
           delete :destroy, params: { group_id: group, id: member, remove_sub_memberships: true }
 
           expect(controller).to set_flash.to 'User was successfully removed from group and any subgroups and projects.'
@@ -365,7 +364,7 @@ RSpec.describe Groups::GroupMembersController do
           expect(sub_group.members).not_to include sub_member
         end
 
-        it '[JS] removes user from members' do
+        it '[JS] removes user from members', :aggregate_failures do
           delete :destroy, params: { group_id: group, id: member }, xhr: true
 
           expect(response).to be_successful
@@ -394,7 +393,7 @@ RSpec.describe Groups::GroupMembersController do
           group.add_developer(user)
         end
 
-        it 'removes user from members' do
+        it 'removes user from members', :aggregate_failures do
           delete :leave, params: { group_id: group }
 
           expect(controller).to set_flash.to "You left the \"#{group.name}\" group."
@@ -402,7 +401,7 @@ RSpec.describe Groups::GroupMembersController do
           expect(group.users).not_to include user
         end
 
-        it 'supports json request' do
+        it 'supports json request', :aggregate_failures do
           delete :leave, params: { group_id: group }, format: :json
 
           expect(response).to have_gitlab_http_status(:ok)
@@ -429,7 +428,7 @@ RSpec.describe Groups::GroupMembersController do
           group.request_access(user)
         end
 
-        it 'removes user from members' do
+        it 'removes user from members', :aggregate_failures do
           delete :leave, params: { group_id: group }
 
           expect(controller).to set_flash.to 'Your access request to the group has been withdrawn.'
@@ -446,7 +445,7 @@ RSpec.describe Groups::GroupMembersController do
       sign_in(user)
     end
 
-    it 'creates a new GroupMember that is not a team member' do
+    it 'creates a new GroupMember that is not a team member', :aggregate_failures do
       post :request_access, params: { group_id: group }
 
       expect(controller).to set_flash.to 'Your request for access has been queued for review.'
@@ -477,7 +476,7 @@ RSpec.describe Groups::GroupMembersController do
           group.add_developer(user)
         end
 
-        it 'returns 403' do
+        it 'returns 403', :aggregate_failures do
           post :approve_access_request, params: { group_id: group, id: member }
 
           expect(response).to have_gitlab_http_status(:forbidden)
@@ -490,7 +489,7 @@ RSpec.describe Groups::GroupMembersController do
           group.add_owner(user)
         end
 
-        it 'adds user to members' do
+        it 'adds user to members', :aggregate_failures do
           post :approve_access_request, params: { group_id: group, id: member }
 
           expect(response).to redirect_to(group_group_members_path(group))
diff --git a/spec/controllers/groups/registry/repositories_controller_spec.rb b/spec/controllers/groups/registry/repositories_controller_spec.rb
index 35c9a80266e..f4541eda293 100644
--- a/spec/controllers/groups/registry/repositories_controller_spec.rb
+++ b/spec/controllers/groups/registry/repositories_controller_spec.rb
@@ -75,6 +75,8 @@ RSpec.describe Groups::Registry::RepositoriesController do
 
       context 'json format' do
         let(:format) { :json }
+        let(:namespace) { group }
+        let(:snowplow_gitlab_standard_context) { { user: user, namespace: group } }
 
         it 'has the correct response schema' do
           subject
diff --git a/spec/controllers/groups/settings/integrations_controller_spec.rb b/spec/controllers/groups/settings/integrations_controller_spec.rb
index 63d99a1fab1..4f1f6dcaae4 100644
--- a/spec/controllers/groups/settings/integrations_controller_spec.rb
+++ b/spec/controllers/groups/settings/integrations_controller_spec.rb
@@ -124,8 +124,8 @@ RSpec.describe Groups::Settings::IntegrationsController do
       end
 
       it 'deletes the integration and all inheriting integrations' do
-        expect { subject }.to change { JiraService.for_group(group.id).count }.by(-1)
-          .and change { JiraService.inherit_from_id(integration.id).count }.by(-1)
+        expect { subject }.to change { Integrations::Jira.for_group(group.id).count }.by(-1)
+          .and change { Integrations::Jira.inherit_from_id(integration.id).count }.by(-1)
       end
     end
   end