Add latest changes from gitlab-org/gitlab@15-5-stable-eev15.5.0-rc42

5 files changed, 10 insertions, 63 deletions

diff --git a/spec/controllers/admin/application_settings_controller_spec.rb b/spec/controllers/admin/application_settings_controller_spec.rb
index ab0cad989cb..0ad0a111156 100644
--- a/spec/controllers/admin/application_settings_controller_spec.rb
+++ b/spec/controllers/admin/application_settings_controller_spec.rb
@@ -211,6 +211,13 @@ RSpec.describe Admin::ApplicationSettingsController, :do_not_mock_admin_mode_set
       expect(ApplicationSetting.current.valid_runner_registrars).to eq(['project'])
     end
 
+    it 'updates can_create_group setting' do
+      put :update, params: { application_setting: { can_create_group: false } }
+
+      expect(response).to redirect_to(general_admin_application_settings_path)
+      expect(ApplicationSetting.current.can_create_group).to eq(false)
+    end
+
     context "personal access token prefix settings" do
       let(:application_settings) { ApplicationSetting.current }
 
diff --git a/spec/controllers/admin/cohorts_controller_spec.rb b/spec/controllers/admin/cohorts_controller_spec.rb
index 766073977c6..50626a5da91 100644
--- a/spec/controllers/admin/cohorts_controller_spec.rb
+++ b/spec/controllers/admin/cohorts_controller_spec.rb
@@ -14,7 +14,7 @@ RSpec.describe Admin::CohortsController do
       let(:target_id) { 'i_analytics_cohorts' }
     end
 
-    it_behaves_like 'Snowplow event tracking' do
+    it_behaves_like 'Snowplow event tracking with RedisHLL context' do
       subject { get :index }
 
       let(:feature_flag_name) { :route_hll_to_snowplow_phase2 }
diff --git a/spec/controllers/admin/dev_ops_report_controller_spec.rb b/spec/controllers/admin/dev_ops_report_controller_spec.rb
index 5d7a7e089aa..52a46b5e99a 100644
--- a/spec/controllers/admin/dev_ops_report_controller_spec.rb
+++ b/spec/controllers/admin/dev_ops_report_controller_spec.rb
@@ -29,7 +29,7 @@ RSpec.describe Admin::DevOpsReportController do
         let(:request_params) { { tab: 'devops-score' } }
       end
 
-      it_behaves_like 'Snowplow event tracking' do
+      it_behaves_like 'Snowplow event tracking with RedisHLL context' do
         subject { get :show, format: :html }
 
         let(:feature_flag_name) { :route_hll_to_snowplow_phase2 }
diff --git a/spec/controllers/admin/groups_controller_spec.rb b/spec/controllers/admin/groups_controller_spec.rb
index fb843ac6a7a..37cb0a1f289 100644
--- a/spec/controllers/admin/groups_controller_spec.rb
+++ b/spec/controllers/admin/groups_controller_spec.rb
@@ -44,64 +44,4 @@ RSpec.describe Admin::GroupsController do
       end.to change { Namespace::AdminNote.count }.by(1)
     end
   end
-
-  describe 'PUT #members_update' do
-    let_it_be(:group_user) { create(:user) }
-
-    it 'adds user to members', :aggregate_failures, :snowplow do
-      put :members_update, params: {
-                             id: group,
-                             user_id: group_user.id,
-                             access_level: Gitlab::Access::GUEST
-                           }
-
-      expect(controller).to set_flash.to 'Users were successfully added.'
-      expect(response).to redirect_to(admin_group_path(group))
-      expect(group.users).to include group_user
-      expect_snowplow_event(
-        category: 'Members::CreateService',
-        action: 'create_member',
-        label: 'admin-group-page',
-        property: 'existing_user',
-        user: admin
-      )
-    end
-
-    it 'can add unlimited members', :aggregate_failures do
-      put :members_update, params: {
-                             id: group,
-                             user_id: 1.upto(1000).to_a.join(','),
-                             access_level: Gitlab::Access::GUEST
-                           }
-
-      expect(controller).to set_flash.to 'Users were successfully added.'
-      expect(response).to redirect_to(admin_group_path(group))
-    end
-
-    it 'adds no user to members', :aggregate_failures do
-      put :members_update, params: {
-                             id: group,
-                             user_id: '',
-                             access_level: Gitlab::Access::GUEST
-                           }
-
-      expect(controller).to set_flash.to 'No users specified.'
-      expect(response).to redirect_to(admin_group_path(group))
-      expect(group.users).not_to include group_user
-    end
-
-    it 'updates the project_creation_level successfully' do
-      expect do
-        post :update, params: { id: group.to_param, group: { project_creation_level: ::Gitlab::Access::NO_ONE_PROJECT_ACCESS } }
-      end.to change { group.reload.project_creation_level }.to(::Gitlab::Access::NO_ONE_PROJECT_ACCESS)
-    end
-
-    it 'updates the subgroup_creation_level successfully' do
-      expect do
-        post :update,
-             params: { id: group.to_param,
-                       group: { subgroup_creation_level: ::Gitlab::Access::OWNER_SUBGROUP_ACCESS } }
-      end.to change { group.reload.subgroup_creation_level }.to(::Gitlab::Access::OWNER_SUBGROUP_ACCESS)
-    end
-  end
 end
diff --git a/spec/controllers/admin/usage_trends_controller_spec.rb b/spec/controllers/admin/usage_trends_controller_spec.rb
index 356f603bf57..87cf8988b4e 100644
--- a/spec/controllers/admin/usage_trends_controller_spec.rb
+++ b/spec/controllers/admin/usage_trends_controller_spec.rb
@@ -14,7 +14,7 @@ RSpec.describe Admin::UsageTrendsController do
       let(:target_id) { 'i_analytics_instance_statistics' }
     end
 
-    it_behaves_like 'Snowplow event tracking' do
+    it_behaves_like 'Snowplow event tracking with RedisHLL context' do
       subject { get :index }
 
       let(:feature_flag_name) { :route_hll_to_snowplow_phase2 }