Commit 3e2ab194 authored by Robert Speicher's avatar Robert Speicher

Merge branch '15886-refactor-composer-tests' into 'master'

Refactor php composer specs

Closes #15886

See merge request gitlab-org/gitlab!31726
parents 71be5dc3 a5bf6fa9
...@@ -8,11 +8,12 @@ describe API::ComposerPackages do ...@@ -8,11 +8,12 @@ describe API::ComposerPackages do
let_it_be(:group, reload: true) { create(:group, :public) } let_it_be(:group, reload: true) { create(:group, :public) }
let_it_be(:personal_access_token) { create(:personal_access_token, user: user) } let_it_be(:personal_access_token) { create(:personal_access_token, user: user) }
let_it_be(:project, reload: true) { create(:project, :repository, path: 'my.project') } let_it_be(:project, reload: true) { create(:project, :repository, path: 'my.project') }
let(:headers) { {} }
describe 'GET /api/v4/group/:id/-/packages/composer/packages' do describe 'GET /api/v4/group/:id/-/packages/composer/packages' do
let(:url) { "/group/#{group.id}/-/packages/composer/packages.json" } let(:url) { "/group/#{group.id}/-/packages/composer/packages.json" }
subject { get api(url) } subject { get api(url), headers: headers }
context 'with packages features enabled' do context 'with packages features enabled' do
before do before do
...@@ -44,16 +45,9 @@ describe API::ComposerPackages do ...@@ -44,16 +45,9 @@ describe API::ComposerPackages do
end end
with_them do with_them do
let(:token) { user_token ? personal_access_token.token : 'wrong' } include_context 'Composer api group access', params[:project_visibility_level], params[:user_role], params[:user_token] do
let(:headers) { user_role == :anonymous ? {} : build_basic_auth_header(user.username, token) } it_behaves_like params[:shared_examples_name], params[:user_role], params[:expected_status], params[:member]
subject { get api(url), headers: headers }
before do
group.update!(visibility_level: Gitlab::VisibilityLevel.const_get(project_visibility_level, false))
end end
it_behaves_like params[:shared_examples_name], params[:user_role], params[:expected_status], params[:member]
end end
end end
...@@ -67,7 +61,7 @@ describe API::ComposerPackages do ...@@ -67,7 +61,7 @@ describe API::ComposerPackages do
let(:sha) { '123' } let(:sha) { '123' }
let(:url) { "/group/#{group.id}/-/packages/composer/p/#{sha}.json" } let(:url) { "/group/#{group.id}/-/packages/composer/p/#{sha}.json" }
subject { get api(url) } subject { get api(url), headers: headers }
context 'with packages features enabled' do context 'with packages features enabled' do
before do before do
...@@ -99,16 +93,9 @@ describe API::ComposerPackages do ...@@ -99,16 +93,9 @@ describe API::ComposerPackages do
end end
with_them do with_them do
let(:token) { user_token ? personal_access_token.token : 'wrong' } include_context 'Composer api group access', params[:project_visibility_level], params[:user_role], params[:user_token] do
let(:headers) { user_role == :anonymous ? {} : build_basic_auth_header(user.username, token) } it_behaves_like params[:shared_examples_name], params[:user_role], params[:expected_status], params[:member]
subject { get api(url), headers: headers }
before do
group.update!(visibility_level: Gitlab::VisibilityLevel.const_get(project_visibility_level, false))
end end
it_behaves_like params[:shared_examples_name], params[:user_role], params[:expected_status], params[:member]
end end
end end
...@@ -122,7 +109,7 @@ describe API::ComposerPackages do ...@@ -122,7 +109,7 @@ describe API::ComposerPackages do
let(:package_name) { 'foobar' } let(:package_name) { 'foobar' }
let(:url) { "/group/#{group.id}/-/packages/composer/#{package_name}.json" } let(:url) { "/group/#{group.id}/-/packages/composer/#{package_name}.json" }
subject { get api(url) } subject { get api(url), headers: headers }
context 'with packages features enabled' do context 'with packages features enabled' do
before do before do
...@@ -154,16 +141,9 @@ describe API::ComposerPackages do ...@@ -154,16 +141,9 @@ describe API::ComposerPackages do
end end
with_them do with_them do
let(:token) { user_token ? personal_access_token.token : 'wrong' } include_context 'Composer api group access', params[:project_visibility_level], params[:user_role], params[:user_token] do
let(:headers) { user_role == :anonymous ? {} : build_basic_auth_header(user.username, token) } it_behaves_like params[:shared_examples_name], params[:user_role], params[:expected_status], params[:member]
subject { get api(url), headers: headers }
before do
group.update!(visibility_level: Gitlab::VisibilityLevel.const_get(project_visibility_level, false))
end end
it_behaves_like params[:shared_examples_name], params[:user_role], params[:expected_status], params[:member]
end end
end end
...@@ -210,14 +190,9 @@ describe API::ComposerPackages do ...@@ -210,14 +190,9 @@ describe API::ComposerPackages do
end end
with_them do with_them do
let(:token) { user_token ? personal_access_token.token : 'wrong' } include_context 'Composer api project access', params[:project_visibility_level], params[:user_role], params[:user_token] do
let(:headers) { user_role == :anonymous ? {} : build_basic_auth_header(user.username, token) } it_behaves_like params[:shared_examples_name], params[:user_role], params[:expected_status], params[:member]
before do
project.update!(visibility_level: Gitlab::VisibilityLevel.const_get(project_visibility_level, false))
end end
it_behaves_like params[:shared_examples_name], params[:user_role], params[:expected_status], params[:member]
end end
end end
......
...@@ -11,6 +11,27 @@ RSpec.shared_examples 'process Composer api request' do |user_type, status, add_ ...@@ -11,6 +11,27 @@ RSpec.shared_examples 'process Composer api request' do |user_type, status, add_
end end
end 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) }
end
RSpec.shared_context 'Composer api project access' do |project_visibility_level, user_role, user_token|
include_context 'Composer auth headers', user_role, user_token do
before do
project.update!(visibility_level: Gitlab::VisibilityLevel.const_get(project_visibility_level, false))
end
end
end
RSpec.shared_context 'Composer api group access' do |project_visibility_level, user_role, user_token|
include_context 'Composer auth headers', user_role, user_token do
before do
group.update!(visibility_level: Gitlab::VisibilityLevel.const_get(project_visibility_level, false))
end
end
end
RSpec.shared_examples 'rejects Composer access with unknown group id' do RSpec.shared_examples 'rejects Composer access with unknown group id' do
context 'with an unknown group' do context 'with an unknown group' do
let(:group) { double(id: non_existing_record_id) } let(:group) { double(id: non_existing_record_id) }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment