Add latest changes from gitlab-org/gitlab@16-2-stable-eev16.2.0-rc42

4 files changed, 35 insertions, 99 deletions

diff --git a/spec/controllers/groups/children_controller_spec.rb b/spec/controllers/groups/children_controller_spec.rb
index ee8b2dce298..82dd8c18cfd 100644
--- a/spec/controllers/groups/children_controller_spec.rb
+++ b/spec/controllers/groups/children_controller_spec.rb
@@ -222,13 +222,13 @@ RSpec.describe Groups::ChildrenController, feature_category: :groups_and_project
           control = ActiveRecord::QueryRecorder.new { get_list }
           _new_project = create(:project, :public, namespace: group)
 
-          expect { get_list }.not_to exceed_query_limit(control).with_threshold(expected_queries_per_project)
+          expect { get_list }.not_to exceed_query_limit(control).with_threshold(expected_queries_per_project + 1)
         end
 
         context 'when rendering hierarchies' do
           # When loading hierarchies we load the all the ancestors for matched projects
-          # in 2 separate queries
-          let(:extra_queries_for_hierarchies) { 2 }
+          # in 3 separate queries
+          let(:extra_queries_for_hierarchies) { 3 }
 
           def get_filtered_list
             get :index, params: { group_id: group.to_param, filter: 'filter' }, format: :json
diff --git a/spec/controllers/groups/group_members_controller_spec.rb b/spec/controllers/groups/group_members_controller_spec.rb
index fe4b80e12fe..feebdd972aa 100644
--- a/spec/controllers/groups/group_members_controller_spec.rb
+++ b/spec/controllers/groups/group_members_controller_spec.rb
@@ -234,7 +234,7 @@ RSpec.describe Groups::GroupMembersController do
         it 'returns correct json response' do
           expect(json_response).to eq({
             "expires_soon" => false,
-            "expires_at_formatted" => expiry_date.to_time.in_time_zone.to_s(:medium)
+            "expires_at_formatted" => expiry_date.to_time.in_time_zone.to_fs(:medium)
           })
         end
       end
diff --git a/spec/controllers/groups/runners_controller_spec.rb b/spec/controllers/groups/runners_controller_spec.rb
index 9ae5cb6f87c..37242bce6bf 100644
--- a/spec/controllers/groups/runners_controller_spec.rb
+++ b/spec/controllers/groups/runners_controller_spec.rb
@@ -65,52 +65,28 @@ RSpec.describe Groups::RunnersController, feature_category: :runner_fleet do
   end
 
   describe '#new' do
-    context 'when create_runner_workflow_for_namespace is enabled' do
+    context 'when user is owner' do
       before do
-        stub_feature_flags(create_runner_workflow_for_namespace: [group])
-      end
-
-      context 'when user is owner' do
-        before do
-          group.add_owner(user)
-        end
-
-        it 'renders new with 200 status code' do
-          get :new, params: { group_id: group }
-
-          expect(response).to have_gitlab_http_status(:ok)
-          expect(response).to render_template(:new)
-        end
+        group.add_owner(user)
       end
 
-      context 'when user is not owner' do
-        before do
-          group.add_maintainer(user)
-        end
-
-        it 'renders a 404' do
-          get :new, params: { group_id: group }
+      it 'renders new with 200 status code' do
+        get :new, params: { group_id: group }
 
-          expect(response).to have_gitlab_http_status(:not_found)
-        end
+        expect(response).to have_gitlab_http_status(:ok)
+        expect(response).to render_template(:new)
       end
     end
 
-    context 'when create_runner_workflow_for_namespace is disabled' do
+    context 'when user is not owner' do
       before do
-        stub_feature_flags(create_runner_workflow_for_namespace: false)
+        group.add_maintainer(user)
       end
 
-      context 'when user is owner' do
-        before do
-          group.add_owner(user)
-        end
-
-        it 'renders a 404' do
-          get :new, params: { group_id: group }
+      it 'renders a 404' do
+        get :new, params: { group_id: group }
 
-          expect(response).to have_gitlab_http_status(:not_found)
-        end
+        expect(response).to have_gitlab_http_status(:not_found)
       end
     end
   end
@@ -118,66 +94,40 @@ RSpec.describe Groups::RunnersController, feature_category: :runner_fleet do
   describe '#register' do
     subject(:register) { get :register, params: { group_id: group, id: new_runner } }
 
-    context 'when create_runner_workflow_for_namespace is enabled' do
+    context 'when user is owner' do
       before do
-        stub_feature_flags(create_runner_workflow_for_namespace: [group])
+        group.add_owner(user)
       end
 
-      context 'when user is owner' do
-        before do
-          group.add_owner(user)
-        end
-
-        context 'when runner can be registered after creation' do
-          let_it_be(:new_runner) { create(:ci_runner, :group, groups: [group], registration_type: :authenticated_user) }
+      context 'when runner can be registered after creation' do
+        let_it_be(:new_runner) { create(:ci_runner, :group, groups: [group], registration_type: :authenticated_user) }
 
-          it 'renders a :register template' do
-            register
-
-            expect(response).to have_gitlab_http_status(:ok)
-            expect(response).to render_template(:register)
-          end
-        end
-
-        context 'when runner cannot be registered after creation' do
-          let_it_be(:new_runner) { runner }
-
-          it 'returns :not_found' do
-            register
+        it 'renders a :register template' do
+          register
 
-            expect(response).to have_gitlab_http_status(:not_found)
-          end
+          expect(response).to have_gitlab_http_status(:ok)
+          expect(response).to render_template(:register)
         end
       end
 
-      context 'when user is not owner' do
-        before do
-          group.add_maintainer(user)
-        end
-
-        context 'when runner can be registered after creation' do
-          let_it_be(:new_runner) { create(:ci_runner, :group, groups: [group], registration_type: :authenticated_user) }
+      context 'when runner cannot be registered after creation' do
+        let_it_be(:new_runner) { runner }
 
-          it 'returns :not_found' do
-            register
+        it 'returns :not_found' do
+          register
 
-            expect(response).to have_gitlab_http_status(:not_found)
-          end
+          expect(response).to have_gitlab_http_status(:not_found)
         end
       end
     end
 
-    context 'when create_runner_workflow_for_namespace is disabled' do
-      let_it_be(:new_runner) { create(:ci_runner, :group, groups: [group], registration_type: :authenticated_user) }
-
+    context 'when user is not owner' do
       before do
-        stub_feature_flags(create_runner_workflow_for_namespace: false)
+        group.add_maintainer(user)
       end
 
-      context 'when user is owner' do
-        before do
-          group.add_owner(user)
-        end
+      context 'when runner can be registered after creation' do
+        let_it_be(:new_runner) { create(:ci_runner, :group, groups: [group], registration_type: :authenticated_user) }
 
         it 'returns :not_found' do
           register
diff --git a/spec/controllers/groups/uploads_controller_spec.rb b/spec/controllers/groups/uploads_controller_spec.rb
index 6649e8f057c..7795fff5541 100644
--- a/spec/controllers/groups/uploads_controller_spec.rb
+++ b/spec/controllers/groups/uploads_controller_spec.rb
@@ -76,31 +76,17 @@ RSpec.describe Groups::UploadsController do
         context 'when uploader class does not match the upload' do
           let(:uploader_class) { FileUploader }
 
-          it 'responds with status 200 but logs a deprecation message' do
-            expect(Gitlab::AppJsonLogger).to receive(:info).with(
-              message: 'Deprecated usage of build_uploader_from_params',
-              uploader_class: uploader_class.name,
-              path: filename,
-              exists: true
-            )
-
+          it 'responds with status 404' do
             show_upload
 
-            expect(response).to have_gitlab_http_status(:ok)
+            expect(response).to have_gitlab_http_status(:not_found)
           end
         end
 
         context 'when filename does not match' do
           let(:invalid_filename) { 'invalid_filename.jpg' }
 
-          it 'responds with status 404 and logs a deprecation message' do
-            expect(Gitlab::AppJsonLogger).to receive(:info).with(
-              message: 'Deprecated usage of build_uploader_from_params',
-              uploader_class: uploader_class.name,
-              path: invalid_filename,
-              exists: false
-            )
-
+          it 'responds with status 404' do
             get :show, params: params.merge(secret: secret, filename: invalid_filename)
 
             expect(response).to have_gitlab_http_status(:not_found)