Add latest changes from gitlab-org/gitlab@master

4 files changed, 19 insertions, 3 deletions

diff --git a/spec/support/shared_examples/features/packages_shared_examples.rb b/spec/support/shared_examples/features/packages_shared_examples.rb
index e51ea0e2ad6..b2d087819a1 100644
--- a/spec/support/shared_examples/features/packages_shared_examples.rb
+++ b/spec/support/shared_examples/features/packages_shared_examples.rb
@@ -19,6 +19,10 @@ RSpec.shared_examples 'packages list' do |check_project_name: false|
 end
 
 RSpec.shared_examples 'package details link' do |property|
+  before do
+    stub_application_setting(npm_package_requests_forwarding: false)
+  end
+
   it 'navigates to the correct url' do
     page.within(packages_table_selector) do
       click_link package.name
diff --git a/spec/support/shared_examples/requests/api/debian_packages_shared_examples.rb b/spec/support/shared_examples/requests/api/debian_packages_shared_examples.rb
index 66554f18e80..bc7ad570441 100644
--- a/spec/support/shared_examples/requests/api/debian_packages_shared_examples.rb
+++ b/spec/support/shared_examples/requests/api/debian_packages_shared_examples.rb
@@ -166,6 +166,18 @@ RSpec.shared_examples 'Debian packages write endpoint' do |desired_behavior, suc
   it_behaves_like 'rejects Debian access with unknown container id', :unauthorized, :basic
 end
 
+RSpec.shared_examples 'Debian packages endpoint catching ObjectStorage::RemoteStoreError' do
+  include_context 'Debian repository access', :public, :developer, :basic do
+    it "returns forbidden" do
+      expect(::Packages::Debian::CreatePackageFileService).to receive(:new).and_raise ObjectStorage::RemoteStoreError
+
+      subject
+
+      expect(response).to have_gitlab_http_status(:forbidden)
+    end
+  end
+end
+
 RSpec.shared_examples 'Debian packages index endpoint' do |success_body|
   it_behaves_like 'Debian packages read endpoint', 'GET', :success, success_body
 
diff --git a/spec/support/shared_examples/requests/api/packages_shared_examples.rb b/spec/support/shared_examples/requests/api/packages_shared_examples.rb
index 1f2450c864b..678c73637ee 100644
--- a/spec/support/shared_examples/requests/api/packages_shared_examples.rb
+++ b/spec/support/shared_examples/requests/api/packages_shared_examples.rb
@@ -161,11 +161,11 @@ RSpec.shared_examples 'a package tracking event' do |category, action, service_p
   end
 end
 
-RSpec.shared_examples 'not a package tracking event' do
+RSpec.shared_examples 'not a package tracking event' do |category, action|
   it 'does not create a gitlab tracking event', :snowplow, :aggregate_failures do
     subject
 
-    expect_no_snowplow_event
+    expect_no_snowplow_event category: category, action: action
   end
 end
 
diff --git a/spec/support/shared_examples/services/security/ci_configuration/create_service_shared_examples.rb b/spec/support/shared_examples/services/security/ci_configuration/create_service_shared_examples.rb
index 094c91f2ab5..21dc3c2bf70 100644
--- a/spec/support/shared_examples/services/security/ci_configuration/create_service_shared_examples.rb
+++ b/spec/support/shared_examples/services/security/ci_configuration/create_service_shared_examples.rb
@@ -169,7 +169,7 @@ RSpec.shared_examples_for 'services security ci configuration create service' do
         it 'returns an error' do
           expect { result }.to raise_error { |error|
             expect(error).to be_a(Gitlab::Graphql::Errors::MutationError)
-            expect(error.message).to eq('UF: You must <a target="_blank" rel="noopener noreferrer" ' \
+            expect(error.message).to eq('UF You must <a target="_blank" rel="noopener noreferrer" ' \
                                         'href="http://localhost/help/user/project/repository/index.md' \
                                         '#add-files-to-a-repository">add at least one file to the repository' \
                                         '</a> before using Security features.')