Add latest changes from gitlab-org/gitlab@master

2 files changed, 38 insertions, 4 deletions

diff --git a/spec/models/error_tracking/project_error_tracking_setting_spec.rb b/spec/models/error_tracking/project_error_tracking_setting_spec.rb
index d48f6f7f3e4..bb32cae6b1f 100644
--- a/spec/models/error_tracking/project_error_tracking_setting_spec.rb
+++ b/spec/models/error_tracking/project_error_tracking_setting_spec.rb
@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-RSpec.describe ErrorTracking::ProjectErrorTrackingSetting do
+RSpec.describe ErrorTracking::ProjectErrorTrackingSetting, feature_category: :error_tracking do
   include ReactiveCachingHelpers
   include Gitlab::Routing
 
@@ -352,7 +352,7 @@ RSpec.describe ErrorTracking::ProjectErrorTrackingSetting do
 
     context 'when sentry response is successful' do
       before do
-        allow(sentry_client).to receive(:update_issue).with(opts).and_return(true)
+        allow(sentry_client).to receive(:update_issue).with(**opts).and_return(true)
       end
 
       it 'returns the successful response' do
@@ -362,7 +362,7 @@ RSpec.describe ErrorTracking::ProjectErrorTrackingSetting do
 
     context 'when sentry raises an error' do
       before do
-        allow(sentry_client).to receive(:update_issue).with(opts).and_raise(StandardError)
+        allow(sentry_client).to receive(:update_issue).with(**opts).and_raise(StandardError)
       end
 
       it 'returns the successful response' do
@@ -391,7 +391,7 @@ RSpec.describe ErrorTracking::ProjectErrorTrackingSetting do
           setting.update!(sentry_project_id: nil)
 
           allow(sentry_client).to receive(:projects).and_return(sentry_projects)
-          allow(sentry_client).to receive(:update_issue).with(opts).and_return(true)
+          allow(sentry_client).to receive(:update_issue).with(**opts).and_return(true)
         end
 
         it 'tries to backfill it from sentry API' do
diff --git a/spec/models/project_feature_spec.rb b/spec/models/project_feature_spec.rb
index fe0b46c3117..5da6a66b3ae 100644
--- a/spec/models/project_feature_spec.rb
+++ b/spec/models/project_feature_spec.rb
@@ -314,6 +314,40 @@ RSpec.describe ProjectFeature, feature_category: :projects do
     end
   end
 
+  describe '#public_packages?' do
+    let_it_be(:public_project) { create(:project, :public) }
+
+    context 'with packages config enabled' do
+      context 'when project is private' do
+        it 'returns false' do
+          expect(project.project_feature.public_packages?).to eq(false)
+        end
+
+        context 'with package_registry_access_level set to public' do
+          before do
+            project.project_feature.update!(package_registry_access_level: ProjectFeature::PUBLIC)
+          end
+
+          it 'returns true' do
+            expect(project.project_feature.public_packages?).to eq(true)
+          end
+        end
+      end
+
+      context 'when project is public' do
+        it 'returns true' do
+          expect(public_project.project_feature.public_packages?).to eq(true)
+        end
+      end
+    end
+
+    it 'returns false if packages config is not enabled' do
+      stub_config(packages: { enabled: false })
+
+      expect(public_project.project_feature.public_packages?).to eq(false)
+    end
+  end
+
   # rubocop:disable Gitlab/FeatureAvailableUsage
   describe '#feature_available?' do
     let(:features) { ProjectFeature::FEATURES }