Add latest changes from gitlab-org/gitlab@master

3 files changed, 51 insertions, 1 deletions

diff --git a/spec/finders/concerns/packages/finder_helper_spec.rb b/spec/finders/concerns/packages/finder_helper_spec.rb
index 94bcec6163e..f81e940c7ed 100644
--- a/spec/finders/concerns/packages/finder_helper_spec.rb
+++ b/spec/finders/concerns/packages/finder_helper_spec.rb
@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-RSpec.describe ::Packages::FinderHelper do
+RSpec.describe ::Packages::FinderHelper, feature_category: :package_registry do
   describe '#packages_for_project' do
     let_it_be_with_reload(:project1) { create(:project) }
     let_it_be(:package1) { create(:package, project: project1) }
@@ -107,6 +107,34 @@ RSpec.describe ::Packages::FinderHelper do
 
         it_behaves_like params[:shared_example_name]
       end
+
+      context 'when the second project has the package registry disabled' do
+        before do
+          project1.update!(visibility_level: Gitlab::VisibilityLevel::PUBLIC)
+          project2.update!(visibility_level: Gitlab::VisibilityLevel::PUBLIC,
+            package_registry_access_level: 'disabled', packages_enabled: false)
+        end
+
+        it_behaves_like 'returning both packages'
+
+        context 'with with_package_registry_enabled set to true' do
+          let(:finder_class) do
+            Class.new do
+              include ::Packages::FinderHelper
+
+              def initialize(user)
+                @current_user = user
+              end
+
+              def execute(group)
+                packages_visible_to_user(@current_user, within_group: group, with_package_registry_enabled: true)
+              end
+            end
+          end
+
+          it_behaves_like 'returning package1'
+        end
+      end
     end
 
     context 'with a group deploy token' do
diff --git a/spec/finders/packages/npm/packages_for_user_finder_spec.rb b/spec/finders/packages/npm/packages_for_user_finder_spec.rb
index e2dc21e1008..ffbb4f9e484 100644
--- a/spec/finders/packages/npm/packages_for_user_finder_spec.rb
+++ b/spec/finders/packages/npm/packages_for_user_finder_spec.rb
@@ -36,6 +36,24 @@ RSpec.describe ::Packages::Npm::PackagesForUserFinder, feature_category: :packag
       end
 
       it_behaves_like 'searches for packages'
+
+      context 'when an user is a reporter of both projects' do
+        before_all do
+          project2.add_reporter(user)
+        end
+
+        it { is_expected.to contain_exactly(package, package_with_diff_project) }
+
+        context 'when the second project has the package registry disabled' do
+          before_all do
+            project.update!(visibility_level: Gitlab::VisibilityLevel::PUBLIC)
+            project2.update!(visibility_level: Gitlab::VisibilityLevel::PUBLIC,
+              package_registry_access_level: 'disabled', packages_enabled: false)
+          end
+
+          it_behaves_like 'searches for packages'
+        end
+      end
     end
   end
 end
diff --git a/spec/finders/projects/ml/model_finder_spec.rb b/spec/finders/projects/ml/model_finder_spec.rb
index 48333ae49e5..1d869e1792d 100644
--- a/spec/finders/projects/ml/model_finder_spec.rb
+++ b/spec/finders/projects/ml/model_finder_spec.rb
@@ -22,4 +22,8 @@ RSpec.describe Projects::Ml::ModelFinder, feature_category: :mlops do
   it 'does not return models belonging to a different project' do
     is_expected.not_to include(model3)
   end
+
+  it 'includes version count' do
+    expect(models[0].version_count).to be(models[0].versions.count)
+  end
 end