Add latest changes from gitlab-org/gitlab@13-3-stable-ee

1 files changed, 9 insertions, 5 deletions

diff --git a/spec/support/shared_examples/requests/api/composer_packages_shared_examples.rb b/spec/support/shared_examples/requests/api/composer_packages_shared_examples.rb
index 5257980d7df..09743c20fba 100644
--- a/spec/support/shared_examples/requests/api/composer_packages_shared_examples.rb
+++ b/spec/support/shared_examples/requests/api/composer_packages_shared_examples.rb
@@ -7,13 +7,17 @@ RSpec.shared_context 'Composer user type' do |user_type, add_member|
   end
 end
 
-RSpec.shared_examples 'Composer package index' do |user_type, status, add_member = true|
+RSpec.shared_examples 'Composer package index' do |user_type, status, add_member, include_package|
   include_context 'Composer user type', user_type, add_member do
+    let(:expected_packages) { include_package == :include_package ? [package] : [] }
+    let(:presenter) { ::Packages::Composer::PackagesPresenter.new(group, expected_packages ) }
+
     it 'returns the package index' do
       subject
 
       expect(response).to have_gitlab_http_status(status)
       expect(response).to match_response_schema('public_api/v4/packages/composer/index')
+      expect(json_response).to eq presenter.root
     end
   end
 end
@@ -68,7 +72,7 @@ RSpec.shared_examples 'Composer package creation' do |user_type, status, add_mem
 
       expect(response).to have_gitlab_http_status(status)
     end
-    it_behaves_like 'a gitlab tracking event', described_class.name, 'register_package'
+    it_behaves_like 'a gitlab tracking event', described_class.name, 'push_package'
   end
 end
 
@@ -85,7 +89,7 @@ end
 
 RSpec.shared_context 'Composer auth headers' do |user_role, user_token|
   let(:token) { user_token ? personal_access_token.token : 'wrong' }
-  let(:headers) { user_role == :anonymous ? {} : build_basic_auth_header(user.username, token) }
+  let(:headers) { user_role == :anonymous ? {} : basic_auth_header(user.username, token) }
 end
 
 RSpec.shared_context 'Composer api project access' do |project_visibility_level, user_role, user_token|
@@ -114,7 +118,7 @@ RSpec.shared_examples 'rejects Composer access with unknown group id' do
     end
 
     context 'as authenticated user' do
-      subject { get api(url), headers: build_basic_auth_header(user.username, personal_access_token.token) }
+      subject { get api(url), headers: basic_auth_header(user.username, personal_access_token.token) }
 
       it_behaves_like 'process Composer api request', :anonymous, :not_found
     end
@@ -130,7 +134,7 @@ RSpec.shared_examples 'rejects Composer access with unknown project id' do
     end
 
     context 'as authenticated user' do
-      subject { get api(url), headers: build_basic_auth_header(user.username, personal_access_token.token) }
+      subject { get api(url), headers: basic_auth_header(user.username, personal_access_token.token) }
 
       it_behaves_like 'process Composer api request', :anonymous, :not_found
     end