Add latest changes from gitlab-org/gitlab@15-7-stable-eev15.7.0-rc42

1 files changed, 41 insertions, 15 deletions

diff --git a/spec/requests/api/nuget_project_packages_spec.rb b/spec/requests/api/nuget_project_packages_spec.rb
index f608f296295..1e0d35ad451 100644
--- a/spec/requests/api/nuget_project_packages_spec.rb
+++ b/spec/requests/api/nuget_project_packages_spec.rb
@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 require 'spec_helper'
 
-RSpec.describe API::NugetProjectPackages do
+RSpec.describe API::NugetProjectPackages, feature_category: :package_registry do
   include_context 'nuget api setup'
 
   using RSpec::Parameterized::TableSyntax
@@ -9,38 +9,62 @@ RSpec.describe API::NugetProjectPackages do
   let_it_be_with_reload(:project) { create(:project, :public) }
   let_it_be(:deploy_token) { create(:deploy_token, read_package_registry: true, write_package_registry: true) }
   let_it_be(:project_deploy_token) { create(:project_deploy_token, deploy_token: deploy_token, project: project) }
+  let_it_be(:package_name) { 'Dummy.Package' }
 
   let(:target) { project }
   let(:target_type) { 'projects' }
+  let(:snowplow_gitlab_standard_context) { { project: project, namespace: project.namespace, property: 'i_package_nuget_user' } }
 
-  describe 'GET /api/v4/projects/:id/packages/nuget' do
-    it_behaves_like 'handling nuget service requests' do
-      let(:url) { "/projects/#{target.id}/packages/nuget/index.json" }
-      let(:snowplow_gitlab_standard_context) { { project: project, namespace: project.namespace } }
+  shared_examples 'accept get request on private project with access to package registry for everyone' do
+    subject { get api(url) }
+
+    before do
+      update_visibility_to(Gitlab::VisibilityLevel::PRIVATE)
+      project.project_feature.update!(package_registry_access_level: ProjectFeature::PUBLIC)
     end
+
+    it_behaves_like 'returning response status', :ok
+  end
+
+  describe 'GET /api/v4/projects/:id/packages/nuget' do
+    let(:url) { "/projects/#{target.id}/packages/nuget/index.json" }
+
+    it_behaves_like 'handling nuget service requests'
+
+    it_behaves_like 'accept get request on private project with access to package registry for everyone'
   end
 
   describe 'GET /api/v4/projects/:id/packages/nuget/metadata/*package_name/index' do
-    it_behaves_like 'handling nuget metadata requests with package name' do
-      let(:url) { "/projects/#{target.id}/packages/nuget/metadata/#{package_name}/index.json" }
+    let(:url) { "/projects/#{target.id}/packages/nuget/metadata/#{package_name}/index.json" }
+
+    it_behaves_like 'handling nuget metadata requests with package name'
+
+    it_behaves_like 'accept get request on private project with access to package registry for everyone' do
+      let_it_be(:packages) { create_list(:nuget_package, 5, :with_metadatum, name: package_name, project: project) }
     end
   end
 
   describe 'GET /api/v4/projects/:id/packages/nuget/metadata/*package_name/*package_version' do
-    it_behaves_like 'handling nuget metadata requests with package name and package version' do
-      let(:url) { "/projects/#{target.id}/packages/nuget/metadata/#{package_name}/#{package.version}.json" }
+    let(:url) { "/projects/#{target.id}/packages/nuget/metadata/#{package_name}/#{package.version}.json" }
+
+    it_behaves_like 'handling nuget metadata requests with package name and package version'
+
+    it_behaves_like 'accept get request on private project with access to package registry for everyone' do
+      let_it_be(:package) { create(:nuget_package, :with_metadatum, name: package_name, project: project) }
     end
   end
 
   describe 'GET /api/v4/projects/:id/packages/nuget/query' do
-    it_behaves_like 'handling nuget search requests' do
-      let(:url) { "/projects/#{target.id}/packages/nuget/query?#{query_parameters.to_query}" }
-      let(:snowplow_gitlab_standard_context) { { project: project, namespace: project.namespace } }
+    let(:url) { "/projects/#{target.id}/packages/nuget/query?#{query_parameters.to_query}" }
+
+    it_behaves_like 'handling nuget search requests'
+
+    it_behaves_like 'accept get request on private project with access to package registry for everyone' do
+      let_it_be(:query_parameters) { { q: 'query', take: 5, skip: 0, prerelease: true } }
     end
   end
 
   describe 'GET /api/v4/projects/:id/packages/nuget/download/*package_name/index' do
-    let_it_be(:package_name) { 'Dummy.Package' }
     let_it_be(:packages) { create_list(:nuget_package, 5, name: package_name, project: project) }
 
     let(:url) { "/projects/#{target.id}/packages/nuget/download/#{package_name}/index.json" }
@@ -88,10 +112,11 @@ RSpec.describe API::NugetProjectPackages do
     it_behaves_like 'rejects nuget access with unknown target id'
 
     it_behaves_like 'rejects nuget access with invalid target id'
+
+    it_behaves_like 'accept get request on private project with access to package registry for everyone'
   end
 
   describe 'GET /api/v4/projects/:id/packages/nuget/download/*package_name/*package_version/*package_filename' do
-    let_it_be(:package_name) { 'Dummy.Package' }
     let_it_be(:package) { create(:nuget_package, :with_symbol_package, project: project, name: package_name) }
 
     let(:format) { 'nupkg' }
@@ -124,7 +149,6 @@ RSpec.describe API::NugetProjectPackages do
       with_them do
         let(:token) { user_token ? personal_access_token.token : 'wrong' }
         let(:headers) { user_role == :anonymous ? {} : basic_auth_header(user.username, token) }
-        let(:snowplow_gitlab_standard_context) { { project: project, namespace: project.namespace } }
 
         subject { get api(url), headers: headers }
 
@@ -134,6 +158,8 @@ RSpec.describe API::NugetProjectPackages do
 
         it_behaves_like params[:shared_examples_name], params[:user_role], params[:expected_status], params[:member]
       end
+
+      it_behaves_like 'accept get request on private project with access to package registry for everyone'
     end
 
     it_behaves_like 'deploy token for package GET requests' do