summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGitLab Bot <gitlab-bot@gitlab.com>2023-04-28 07:22:02 +0000
committerGitLab Bot <gitlab-bot@gitlab.com>2023-04-28 07:22:02 +0000
commit744353cf92f3554af6e71e2da32bec1f2936e47f (patch)
tree4d2ec0288ede6ab7161f2bf14d2ca937b5c3a382
parent4fb90744807a91bae64296558a748c9b08c6bca3 (diff)
downloadgitlab-ce-744353cf92f3554af6e71e2da32bec1f2936e47f.tar.gz
Add latest changes from gitlab-org/gitlab@15-11-stable-ee
-rw-r--r--spec/requests/api/debian_group_packages_spec.rb2
-rw-r--r--spec/requests/api/debian_project_packages_spec.rb2
-rw-r--r--spec/support/shared_examples/requests/api/packages_shared_examples.rb4
3 files changed, 4 insertions, 4 deletions
diff --git a/spec/requests/api/debian_group_packages_spec.rb b/spec/requests/api/debian_group_packages_spec.rb
index 18e5bfd711e..9c726e5a5f7 100644
--- a/spec/requests/api/debian_group_packages_spec.rb
+++ b/spec/requests/api/debian_group_packages_spec.rb
@@ -18,7 +18,7 @@ RSpec.describe API::DebianGroupPackages, feature_category: :package_registry do
shared_examples 'not a Debian package tracking event' do
include_context 'Debian repository access', :public, :developer, :basic do
- it_behaves_like 'not a package tracking event'
+ it_behaves_like 'not a package tracking event', described_class.name, /.*/
end
end
diff --git a/spec/requests/api/debian_project_packages_spec.rb b/spec/requests/api/debian_project_packages_spec.rb
index 17a413ed059..2c49e110dbb 100644
--- a/spec/requests/api/debian_project_packages_spec.rb
+++ b/spec/requests/api/debian_project_packages_spec.rb
@@ -18,7 +18,7 @@ RSpec.describe API::DebianProjectPackages, feature_category: :package_registry d
shared_examples 'not a Debian package tracking event' do
include_context 'Debian repository access', :public, :developer, :basic do
- it_behaves_like 'not a package tracking event'
+ it_behaves_like 'not a package tracking event', described_class.name, /.*/
end
end
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