diff --git a/lib/gitlab/client.rb b/lib/gitlab/client.rb index e5e327c84..abc22d2af 100644 --- a/lib/gitlab/client.rb +++ b/lib/gitlab/client.rb @@ -47,6 +47,7 @@ class Client < API include Pipelines include ProjectBadges include ProjectClusters + include ProjectExports include ProjectReleaseLinks include ProjectReleases include Projects diff --git a/spec/gitlab/client/project_releases_spec.rb b/spec/gitlab/client/project_releases_spec.rb index 43c07af1b..78e813f43 100644 --- a/spec/gitlab/client/project_releases_spec.rb +++ b/spec/gitlab/client/project_releases_spec.rb @@ -35,16 +35,16 @@ describe '.project_latest_release' do before do - stub_get('/projects/3/releases/permalink/latest', 'project_latest_release') + stub_get('/projects/3/releases/permalink/latest', 'project_release') @project_latest_release = Gitlab.project_latest_release(3) end it 'gets the correct resource' do - expect(a_get('/projects/3/releases/v0.1')).to have_been_made + expect(a_get('/projects/3/releases/permalink/latest')).to have_been_made end it 'returns information about a release' do - expect(@project_release.tag_name).to eq('v0.1') + expect(@project_latest_release.tag_name).to eq('v0.1') end end diff --git a/spec/gitlab/client/users_spec.rb b/spec/gitlab/client/users_spec.rb index 1a630451d..182d03681 100644 --- a/spec/gitlab/client/users_spec.rb +++ b/spec/gitlab/client/users_spec.rb @@ -720,34 +720,34 @@ describe '.memberships' do before do - stub_get('/user/2/memberships', 'memberships') + stub_get('/users/2/memberships', 'memberships') @memberships = Gitlab.memberships(2) end it 'gets the correct resource' do - expect(a_get('/user/2/memberships')).to have_been_made + expect(a_get('/users/2/memberships')).to have_been_made end it 'returns an information about all project and groups of user' do expect(@memberships.first.source_id).to eq 1 expect(@memberships.first.source_name).to eq 'Project one' expect(@memberships.first.source_type).to eq 'Project' - expect(@memberships.first.access_level).to eq 20 + expect(@memberships.first.access_level).to eq '20' end end describe 'get all personal access tokens' do describe 'get all' do before do - stub_get('/user_personal_access_tokens?user_id=2', 'personal_access_get_all') - @token = Gitlab.user_personal_access_tokens(2) + stub_get('/personal_access_tokens?user_id=2', 'personal_access_get_all') + @tokens = Gitlab.user_personal_access_tokens(2) end it 'gets the correct resource' do expect(a_get('/personal_access_tokens?user_id=2')).to have_been_made end - it 'gets an array of user impersonation tokens' do + it 'gets an array of user personal access tokens' do expect(@tokens.first.id).to eq(2) expect(@tokens.last.id).to eq(3) expect(@tokens.first.active).to be_truthy @@ -758,12 +758,12 @@ describe 'create personal access token' do before do - stub_post('/user/personal_access_tokens/', 'personal_access_create') + stub_post('/users/2/personal_access_tokens', 'personal_access_create') @token = Gitlab.create_personal_access_token(2, 'service_account_2', ['api']) end it 'gets the correct resource' do - expect(a_post('/user/personal_access_tokens').with(body: 'name=service_account_2&scopes%5B%5D=api')).to have_been_made + expect(a_post('/users/2/personal_access_tokens').with(body: 'name=service_account_2&scopes%5B%5D=api')).to have_been_made end it 'returns a valid personal access token' do @@ -795,12 +795,12 @@ end end - describe 'revoke personal accees token' do + describe 'revoke personal access token' do before do stub_request(:delete, "#{Gitlab.endpoint}/personal_access_tokens/2") .with(headers: { 'PRIVATE-TOKEN' => Gitlab.private_token }) .to_return(status: 204) - @token = Gitlab.revoke_user_impersonation_token(2) + @token = Gitlab.revoke_personal_access_token(2) end it 'revokes a personal access token' do