Add latest changes from gitlab-org/gitlab@16-8-stable-eev16.8.0-rc42

6 files changed, 76 insertions, 20 deletions

diff --git a/spec/requests/projects/gcp/artifact_registry/docker_images_controller_spec.rb b/spec/requests/projects/gcp/artifact_registry/docker_images_controller_spec.rb
index d571999feb0..f1c87243516 100644
--- a/spec/requests/projects/gcp/artifact_registry/docker_images_controller_spec.rb
+++ b/spec/requests/projects/gcp/artifact_registry/docker_images_controller_spec.rb
@@ -14,7 +14,7 @@ RSpec.describe Projects::Gcp::ArtifactRegistry::DockerImagesController, feature_
   describe '#index' do
     let(:service_response) { ServiceResponse.success(payload: dummy_client_payload) }
     let(:service_double) do
-      instance_double('Integrations::GoogleCloudPlatform::ArtifactRegistry::ListDockerImagesService')
+      instance_double('GoogleCloudPlatform::ArtifactRegistry::ListDockerImagesService')
     end
 
     subject(:get_index_page) do
@@ -30,7 +30,7 @@ RSpec.describe Projects::Gcp::ArtifactRegistry::DockerImagesController, feature_
     end
 
     before do
-      allow_next_instance_of(Integrations::GoogleCloudPlatform::ArtifactRegistry::ListDockerImagesService) do |service|
+      allow_next_instance_of(GoogleCloudPlatform::ArtifactRegistry::ListDockerImagesService) do |service|
         allow(service).to receive(:execute).and_return(service_response)
       end
     end
@@ -58,6 +58,7 @@ RSpec.describe Projects::Gcp::ArtifactRegistry::DockerImagesController, feature_
         expect(response.body).to include('tag2')
         expect(response.body).to include('Prev')
         expect(response.body).to include('Next')
+        expect(response.body).to include('https://location.pkg.dev/project/repo/image@sha256:6a')
       end
 
       context 'when the service returns an error response' do
diff --git a/spec/requests/projects/google_cloud/databases_controller_spec.rb b/spec/requests/projects/google_cloud/databases_controller_spec.rb
index fa978a3921f..46f6d27644c 100644
--- a/spec/requests/projects/google_cloud/databases_controller_spec.rb
+++ b/spec/requests/projects/google_cloud/databases_controller_spec.rb
@@ -96,7 +96,7 @@ RSpec.describe Projects::GoogleCloud::DatabasesController, :snowplow, feature_ca
 
       context 'when EnableCloudsqlService fails' do
         before do
-          allow_next_instance_of(::GoogleCloud::EnableCloudsqlService) do |service|
+          allow_next_instance_of(::CloudSeed::GoogleCloud::EnableCloudsqlService) do |service|
             allow(service).to receive(:execute)
                                  .and_return({ status: :error, message: 'error' })
           end
@@ -125,7 +125,7 @@ RSpec.describe Projects::GoogleCloud::DatabasesController, :snowplow, feature_ca
 
       context 'when EnableCloudsqlService is successful' do
         before do
-          allow_next_instance_of(::GoogleCloud::EnableCloudsqlService) do |service|
+          allow_next_instance_of(::CloudSeed::GoogleCloud::EnableCloudsqlService) do |service|
             allow(service).to receive(:execute)
                                 .and_return({ status: :success, message: 'success' })
           end
@@ -133,7 +133,7 @@ RSpec.describe Projects::GoogleCloud::DatabasesController, :snowplow, feature_ca
 
         context 'when CreateCloudsqlInstanceService fails' do
           before do
-            allow_next_instance_of(::GoogleCloud::CreateCloudsqlInstanceService) do |service|
+            allow_next_instance_of(::CloudSeed::GoogleCloud::CreateCloudsqlInstanceService) do |service|
               allow(service).to receive(:execute)
                                    .and_return({ status: :error, message: 'error' })
             end
@@ -162,7 +162,7 @@ RSpec.describe Projects::GoogleCloud::DatabasesController, :snowplow, feature_ca
 
         context 'when CreateCloudsqlInstanceService is successful' do
           before do
-            allow_next_instance_of(::GoogleCloud::CreateCloudsqlInstanceService) do |service|
+            allow_next_instance_of(::CloudSeed::GoogleCloud::CreateCloudsqlInstanceService) do |service|
               allow(service).to receive(:execute)
                                   .and_return({ status: :success, message: 'success' })
             end
diff --git a/spec/requests/projects/google_cloud/deployments_controller_spec.rb b/spec/requests/projects/google_cloud/deployments_controller_spec.rb
index e9eac1e7ecd..1a6482477ef 100644
--- a/spec/requests/projects/google_cloud/deployments_controller_spec.rb
+++ b/spec/requests/projects/google_cloud/deployments_controller_spec.rb
@@ -110,7 +110,7 @@ RSpec.describe Projects::GoogleCloud::DeploymentsController, feature_category: :
 
     context 'when enable service fails' do
       before do
-        allow_next_instance_of(GoogleCloud::EnableCloudRunService) do |service|
+        allow_next_instance_of(CloudSeed::GoogleCloud::EnableCloudRunService) do |service|
           allow(service)
             .to receive(:execute)
             .and_return(
@@ -146,7 +146,7 @@ RSpec.describe Projects::GoogleCloud::DeploymentsController, feature_category: :
       before do
         mock_gcp_error = Google::Apis::ClientError.new('some_error')
 
-        allow_next_instance_of(GoogleCloud::EnableCloudRunService) do |service|
+        allow_next_instance_of(CloudSeed::GoogleCloud::EnableCloudRunService) do |service|
           allow(service).to receive(:execute).and_raise(mock_gcp_error)
         end
       end
@@ -173,14 +173,14 @@ RSpec.describe Projects::GoogleCloud::DeploymentsController, feature_category: :
 
     context 'GCP_PROJECT_IDs are defined' do
       before do
-        allow_next_instance_of(GoogleCloud::EnableCloudRunService) do |enable_cloud_run_service|
+        allow_next_instance_of(CloudSeed::GoogleCloud::EnableCloudRunService) do |enable_cloud_run_service|
           allow(enable_cloud_run_service).to receive(:execute).and_return({ status: :success })
         end
       end
 
       context 'when generate pipeline service fails' do
         before do
-          allow_next_instance_of(GoogleCloud::GeneratePipelineService) do |generate_pipeline_service|
+          allow_next_instance_of(CloudSeed::GoogleCloud::GeneratePipelineService) do |generate_pipeline_service|
             allow(generate_pipeline_service).to receive(:execute).and_return({ status: :error })
           end
         end
@@ -206,7 +206,7 @@ RSpec.describe Projects::GoogleCloud::DeploymentsController, feature_category: :
       end
 
       it 'redirects to create merge request form' do
-        allow_next_instance_of(GoogleCloud::GeneratePipelineService) do |service|
+        allow_next_instance_of(CloudSeed::GoogleCloud::GeneratePipelineService) do |service|
           allow(service).to receive(:execute).and_return({ status: :success })
         end
 
diff --git a/spec/requests/projects/ml/models_controller_spec.rb b/spec/requests/projects/ml/models_controller_spec.rb
index cda3f777a72..e469ee837bc 100644
--- a/spec/requests/projects/ml/models_controller_spec.rb
+++ b/spec/requests/projects/ml/models_controller_spec.rb
@@ -152,6 +152,27 @@ RSpec.describe Projects::Ml::ModelsController, feature_category: :mlops do
     end
   end
 
+  describe 'GET new' do
+    subject(:create_model_request) do
+      new_model
+      response
+    end
+
+    before do
+      create_model_request
+    end
+
+    it 'renders the template' do
+      is_expected.to render_template('projects/ml/models/new')
+    end
+
+    context 'when user does not have access' do
+      let(:write_model_registry) { false }
+
+      it { is_expected.to have_gitlab_http_status(:not_found) }
+    end
+  end
+
   describe 'destroy' do
     let(:model_for_deletion) do
       create(:ml_models, project: project)
@@ -198,4 +219,8 @@ RSpec.describe Projects::Ml::ModelsController, feature_category: :mlops do
   def delete_model
     delete project_ml_model_path(project, model_id)
   end
+
+  def new_model
+    get new_project_ml_model_path(project)
+  end
 end
diff --git a/spec/requests/projects/pipelines_controller_spec.rb b/spec/requests/projects/pipelines_controller_spec.rb
index aa3fefdef14..8be4fecea04 100644
--- a/spec/requests/projects/pipelines_controller_spec.rb
+++ b/spec/requests/projects/pipelines_controller_spec.rb
@@ -25,14 +25,14 @@ RSpec.describe Projects::PipelinesController, feature_category: :continuous_inte
 
       create_pipelines
 
-      control_count = ActiveRecord::QueryRecorder.new(skip_cached: false) do
+      control = ActiveRecord::QueryRecorder.new(skip_cached: false) do
         get_pipelines_index
-      end.count
+      end
 
       create_pipelines
 
       # There appears to be one extra query for Pipelines#has_warnings? for some reason
-      expect { get_pipelines_index }.not_to exceed_all_query_limit(control_count + 1)
+      expect { get_pipelines_index }.not_to exceed_all_query_limit(control).with_threshold(1)
       expect(response).to have_gitlab_http_status(:ok)
       expect(json_response['pipelines'].count).to eq(11)
     end
@@ -56,9 +56,9 @@ RSpec.describe Projects::PipelinesController, feature_category: :continuous_inte
     it 'does not execute N+1 queries' do
       request_build_stage
 
-      control_count = ActiveRecord::QueryRecorder.new(skip_cached: false) do
+      control = ActiveRecord::QueryRecorder.new(skip_cached: false) do
         request_build_stage
-      end.count
+      end
 
       create(:ci_build, pipeline: pipeline, stage: 'build')
 
@@ -70,7 +70,7 @@ RSpec.describe Projects::PipelinesController, feature_category: :continuous_inte
           status: :failed)
       end
 
-      expect { request_build_stage }.not_to exceed_all_query_limit(control_count)
+      expect { request_build_stage }.not_to exceed_all_query_limit(control)
 
       expect(response).to have_gitlab_http_status(:ok)
     end
@@ -134,14 +134,14 @@ RSpec.describe Projects::PipelinesController, feature_category: :continuous_inte
 
         request_build_stage(retried: true)
 
-        control_count = ActiveRecord::QueryRecorder.new(skip_cached: false) do
+        control = ActiveRecord::QueryRecorder.new(skip_cached: false) do
           request_build_stage(retried: true)
-        end.count
+        end
 
         create(:ci_build, :retried, :failed, pipeline: pipeline, stage: 'build')
         create(:ci_build, :failed, pipeline: pipeline, stage: 'build')
 
-        expect { request_build_stage(retried: true) }.not_to exceed_all_query_limit(control_count)
+        expect { request_build_stage(retried: true) }.not_to exceed_all_query_limit(control)
 
         expect(response).to have_gitlab_http_status(:ok)
       end
diff --git a/spec/requests/projects/settings/packages_and_registries_controller_spec.rb b/spec/requests/projects/settings/packages_and_registries_controller_spec.rb
index 2806beadd4e..c660be0f3bf 100644
--- a/spec/requests/projects/settings/packages_and_registries_controller_spec.rb
+++ b/spec/requests/projects/settings/packages_and_registries_controller_spec.rb
@@ -16,6 +16,36 @@ RSpec.describe Projects::Settings::PackagesAndRegistriesController, feature_cate
     stub_container_registry_config(enabled: container_registry_enabled)
   end
 
+  describe 'GET #show' do
+    context 'when user is authorized' do
+      let(:user) { project.creator }
+
+      subject { get namespace_project_settings_packages_and_registries_path(user.namespace, project) }
+
+      before do
+        sign_in(user)
+      end
+
+      it 'pushes the feature flag "packages_protected_packages" to the view' do
+        subject
+
+        expect(response.body).to have_pushed_frontend_feature_flags(packagesProtectedPackages: true)
+      end
+
+      context 'when feature flag "packages_protected_packages" is disabled' do
+        before do
+          stub_feature_flags(packages_protected_packages: false)
+        end
+
+        it 'does not push the feature flag "packages_protected_packages" to the view' do
+          subject
+
+          expect(response.body).not_to have_pushed_frontend_feature_flags(packagesProtectedPackages: true)
+        end
+      end
+    end
+  end
+
   describe 'GET #cleanup_tags' do
     subject { get cleanup_image_tags_namespace_project_settings_packages_and_registries_path(user.namespace, project) }