diff options
Diffstat (limited to 'spec')
| -rw-r--r-- | spec/requests/api/groups_spec.rb | 5 | ||||
| -rw-r--r-- | spec/requests/api/project_hooks_spec.rb | 8 | ||||
| -rw-r--r-- | spec/requests/api/projects_spec.rb | 4 | ||||
| -rw-r--r-- | spec/requests/api/v3/deployments_spec.rb | 11 | ||||
| -rw-r--r-- | spec/requests/api/v3/notes_spec.rb | 64 | ||||
| -rw-r--r-- | spec/requests/api/v3/project_hooks_spec.rb | 43 |
6 files changed, 41 insertions, 94 deletions
diff --git a/spec/requests/api/groups_spec.rb b/spec/requests/api/groups_spec.rb index 858eb6a9635..2545da7b1db 100644 --- a/spec/requests/api/groups_spec.rb +++ b/spec/requests/api/groups_spec.rb @@ -77,8 +77,7 @@ describe API::Groups, api: true do build_artifacts_size: 345, }.stringify_keys exposed_attributes = attributes.dup - exposed_attributes['job_artifacts_size'] = exposed_attributes['build_artifacts_size'] - exposed_attributes.delete('build_artifacts_size') + exposed_attributes['job_artifacts_size'] = exposed_attributes.delete('build_artifacts_size') project1.statistics.update!(attributes) @@ -88,7 +87,7 @@ describe API::Groups, api: true do expect(response).to include_pagination_headers expect(json_response).to be_an Array expect(json_response) - .to satisfy_one { |group| group['statistics'] == attributes } + .to satisfy_one { |group| group['statistics'] == exposed_attributes } end end diff --git a/spec/requests/api/project_hooks_spec.rb b/spec/requests/api/project_hooks_spec.rb index f286568547d..b1f8c249092 100644 --- a/spec/requests/api/project_hooks_spec.rb +++ b/spec/requests/api/project_hooks_spec.rb @@ -33,7 +33,7 @@ describe API::ProjectHooks, 'ProjectHooks', api: true do expect(json_response.first['merge_requests_events']).to eq(true) expect(json_response.first['tag_push_events']).to eq(true) expect(json_response.first['note_events']).to eq(true) - expect(json_response.first['build_events']).to eq(true) + expect(json_response.first['job_events']).to eq(true) expect(json_response.first['pipeline_events']).to eq(true) expect(json_response.first['wiki_page_events']).to eq(true) expect(json_response.first['enable_ssl_verification']).to eq(true) @@ -59,7 +59,7 @@ describe API::ProjectHooks, 'ProjectHooks', api: true do expect(json_response['merge_requests_events']).to eq(hook.merge_requests_events) expect(json_response['tag_push_events']).to eq(hook.tag_push_events) expect(json_response['note_events']).to eq(hook.note_events) - expect(json_response['build_events']).to eq(hook.build_events) + expect(json_response['job_events']).to eq(hook.build_events) expect(json_response['pipeline_events']).to eq(hook.pipeline_events) expect(json_response['wiki_page_events']).to eq(hook.wiki_page_events) expect(json_response['enable_ssl_verification']).to eq(hook.enable_ssl_verification) @@ -98,7 +98,7 @@ describe API::ProjectHooks, 'ProjectHooks', api: true do expect(json_response['merge_requests_events']).to eq(false) expect(json_response['tag_push_events']).to eq(false) expect(json_response['note_events']).to eq(false) - expect(json_response['build_events']).to eq(false) + expect(json_response['job_events']).to eq(false) expect(json_response['pipeline_events']).to eq(false) expect(json_response['wiki_page_events']).to eq(true) expect(json_response['enable_ssl_verification']).to eq(true) @@ -144,7 +144,7 @@ describe API::ProjectHooks, 'ProjectHooks', api: true do expect(json_response['merge_requests_events']).to eq(hook.merge_requests_events) expect(json_response['tag_push_events']).to eq(hook.tag_push_events) expect(json_response['note_events']).to eq(hook.note_events) - expect(json_response['build_events']).to eq(hook.build_events) + expect(json_response['job_events']).to eq(hook.build_events) expect(json_response['pipeline_events']).to eq(hook.pipeline_events) expect(json_response['wiki_page_events']).to eq(hook.wiki_page_events) expect(json_response['enable_ssl_verification']).to eq(hook.enable_ssl_verification) diff --git a/spec/requests/api/projects_spec.rb b/spec/requests/api/projects_spec.rb index 03cae074803..77f79cd5bc7 100644 --- a/spec/requests/api/projects_spec.rb +++ b/spec/requests/api/projects_spec.rb @@ -594,7 +594,7 @@ describe API::Projects, api: true do expect(json_response['issues_enabled']).to be_present expect(json_response['merge_requests_enabled']).to be_present expect(json_response['wiki_enabled']).to be_present - expect(json_response['builds_enabled']).to be_present + expect(json_response['jobs_enabled']).to be_present expect(json_response['snippets_enabled']).to be_present expect(json_response['container_registry_enabled']).to be_present expect(json_response['created_at']).to be_present @@ -605,7 +605,7 @@ describe API::Projects, api: true do expect(json_response['avatar_url']).to be_nil expect(json_response['star_count']).to be_present expect(json_response['forks_count']).to be_present - expect(json_response['public_builds']).to be_present + expect(json_response['public_jobs']).to be_present expect(json_response['shared_with_groups']).to be_an Array expect(json_response['shared_with_groups'].length).to eq(1) expect(json_response['shared_with_groups'][0]['group_id']).to eq(group.id) diff --git a/spec/requests/api/v3/deployments_spec.rb b/spec/requests/api/v3/deployments_spec.rb index 31e3cfa1b2f..3c5ce407b32 100644 --- a/spec/requests/api/v3/deployments_spec.rb +++ b/spec/requests/api/v3/deployments_spec.rb @@ -12,6 +12,17 @@ describe API::Deployments, api: true do project.team << [user, :master] end + shared_examples 'a paginated resources' do + before do + # Fires the request + request + end + + it 'has pagination headers' do + expect(response).to include_pagination_headers + end + end + describe 'GET /projects/:id/deployments' do context 'as member of the project' do it_behaves_like 'a paginated resources' do diff --git a/spec/requests/api/v3/notes_spec.rb b/spec/requests/api/v3/notes_spec.rb index a2228132ba9..ddef2d5eb04 100644 --- a/spec/requests/api/v3/notes_spec.rb +++ b/spec/requests/api/v3/notes_spec.rb @@ -328,11 +328,7 @@ describe API::V3::Notes, api: true do end it 'returns a 400 bad request error if body not given' do -<<<<<<< HEAD put v3_api("/projects/#{project.id}/issues/#{issue.id}/"\ -======= - put api("/projects/#{project.id}/issues/#{issue.id}/"\ ->>>>>>> e306055d88... Pick API files from 8.16.6 "notes/#{issue_note.id}", user) expect(response).to have_http_status(400) @@ -341,11 +337,7 @@ describe API::V3::Notes, api: true do context 'when noteable is a Snippet' do it 'returns modified note' do -<<<<<<< HEAD put v3_api("/projects/#{project.id}/snippets/#{snippet.id}/"\ -======= - put api("/projects/#{project.id}/snippets/#{snippet.id}/"\ ->>>>>>> e306055d88... Pick API files from 8.16.6 "notes/#{snippet_note.id}", user), body: 'Hello!' expect(response).to have_http_status(200) @@ -353,11 +345,7 @@ describe API::V3::Notes, api: true do end it 'returns a 404 error when note id not found' do -<<<<<<< HEAD put v3_api("/projects/#{project.id}/snippets/#{snippet.id}/"\ -======= - put api("/projects/#{project.id}/snippets/#{snippet.id}/"\ ->>>>>>> e306055d88... Pick API files from 8.16.6 "notes/12345", user), body: "Hello!" expect(response).to have_http_status(404) @@ -366,11 +354,7 @@ describe API::V3::Notes, api: true do context 'when noteable is a Merge Request' do it 'returns modified note' do -<<<<<<< HEAD put v3_api("/projects/#{project.id}/merge_requests/#{merge_request.id}/"\ -======= - put api("/projects/#{project.id}/merge_requests/#{merge_request.id}/"\ ->>>>>>> e306055d88... Pick API files from 8.16.6 "notes/#{merge_request_note.id}", user), body: 'Hello!' expect(response).to have_http_status(200) @@ -378,11 +362,7 @@ describe API::V3::Notes, api: true do end it 'returns a 404 error when note id not found' do -<<<<<<< HEAD put v3_api("/projects/#{project.id}/merge_requests/#{merge_request.id}/"\ -======= - put api("/projects/#{project.id}/merge_requests/#{merge_request.id}/"\ ->>>>>>> e306055d88... Pick API files from 8.16.6 "notes/12345", user), body: "Hello!" expect(response).to have_http_status(404) @@ -393,7 +373,6 @@ describe API::V3::Notes, api: true do describe 'DELETE /projects/:id/noteable/:noteable_id/notes/:note_id' do context 'when noteable is an Issue' do it 'deletes a note' do -<<<<<<< HEAD delete v3_api("/projects/#{project.id}/issues/#{issue.id}/"\ "notes/#{issue_note.id}", user) @@ -401,24 +380,11 @@ describe API::V3::Notes, api: true do # Check if note is really deleted delete v3_api("/projects/#{project.id}/issues/#{issue.id}/"\ "notes/#{issue_note.id}", user) -======= - delete api("/projects/#{project.id}/issues/#{issue.id}/"\ - "notes/#{issue_note.id}", user) - - expect(response).to have_http_status(200) - # Check if note is really deleted - delete api("/projects/#{project.id}/issues/#{issue.id}/"\ - "notes/#{issue_note.id}", user) ->>>>>>> e306055d88... Pick API files from 8.16.6 expect(response).to have_http_status(404) end it 'returns a 404 error when note id not found' do -<<<<<<< HEAD delete v3_api("/projects/#{project.id}/issues/#{issue.id}/notes/12345", user) -======= - delete api("/projects/#{project.id}/issues/#{issue.id}/notes/12345", user) ->>>>>>> e306055d88... Pick API files from 8.16.6 expect(response).to have_http_status(404) end @@ -426,7 +392,6 @@ describe API::V3::Notes, api: true do context 'when noteable is a Snippet' do it 'deletes a note' do -<<<<<<< HEAD delete v3_api("/projects/#{project.id}/snippets/#{snippet.id}/"\ "notes/#{snippet_note.id}", user) @@ -434,26 +399,12 @@ describe API::V3::Notes, api: true do # Check if note is really deleted delete v3_api("/projects/#{project.id}/snippets/#{snippet.id}/"\ "notes/#{snippet_note.id}", user) -======= - delete api("/projects/#{project.id}/snippets/#{snippet.id}/"\ - "notes/#{snippet_note.id}", user) - - expect(response).to have_http_status(200) - # Check if note is really deleted - delete api("/projects/#{project.id}/snippets/#{snippet.id}/"\ - "notes/#{snippet_note.id}", user) ->>>>>>> e306055d88... Pick API files from 8.16.6 expect(response).to have_http_status(404) end it 'returns a 404 error when note id not found' do -<<<<<<< HEAD delete v3_api("/projects/#{project.id}/snippets/#{snippet.id}/"\ "notes/12345", user) -======= - delete api("/projects/#{project.id}/snippets/#{snippet.id}/"\ - "notes/12345", user) ->>>>>>> e306055d88... Pick API files from 8.16.6 expect(response).to have_http_status(404) end @@ -461,7 +412,6 @@ describe API::V3::Notes, api: true do context 'when noteable is a Merge Request' do it 'deletes a note' do -<<<<<<< HEAD delete v3_api("/projects/#{project.id}/merge_requests/"\ "#{merge_request.id}/notes/#{merge_request_note.id}", user) @@ -469,26 +419,12 @@ describe API::V3::Notes, api: true do # Check if note is really deleted delete v3_api("/projects/#{project.id}/merge_requests/"\ "#{merge_request.id}/notes/#{merge_request_note.id}", user) -======= - delete api("/projects/#{project.id}/merge_requests/"\ - "#{merge_request.id}/notes/#{merge_request_note.id}", user) - - expect(response).to have_http_status(200) - # Check if note is really deleted - delete api("/projects/#{project.id}/merge_requests/"\ - "#{merge_request.id}/notes/#{merge_request_note.id}", user) ->>>>>>> e306055d88... Pick API files from 8.16.6 expect(response).to have_http_status(404) end it 'returns a 404 error when note id not found' do -<<<<<<< HEAD delete v3_api("/projects/#{project.id}/merge_requests/"\ "#{merge_request.id}/notes/12345", user) -======= - delete api("/projects/#{project.id}/merge_requests/"\ - "#{merge_request.id}/notes/12345", user) ->>>>>>> e306055d88... Pick API files from 8.16.6 expect(response).to have_http_status(404) end diff --git a/spec/requests/api/v3/project_hooks_spec.rb b/spec/requests/api/v3/project_hooks_spec.rb index 36fbcf088e7..a981119dc5a 100644 --- a/spec/requests/api/v3/project_hooks_spec.rb +++ b/spec/requests/api/v3/project_hooks_spec.rb @@ -21,9 +21,9 @@ describe API::ProjectHooks, 'ProjectHooks', api: true do describe "GET /projects/:id/hooks" do context "authorized user" do it "returns project hooks" do - get api("/projects/#{project.id}/hooks", user) - expect(response).to have_http_status(200) + get v3_api("/projects/#{project.id}/hooks", user) + expect(response).to have_http_status(200) expect(json_response).to be_an Array expect(json_response.count).to eq(1) expect(json_response.first['url']).to eq("http://example.com") @@ -41,7 +41,8 @@ describe API::ProjectHooks, 'ProjectHooks', api: true do context "unauthorized user" do it "does not access project hooks" do - get api("/projects/#{project.id}/hooks", user3) + get v3_api("/projects/#{project.id}/hooks", user3) + expect(response).to have_http_status(403) end end @@ -50,7 +51,7 @@ describe API::ProjectHooks, 'ProjectHooks', api: true do describe "GET /projects/:id/hooks/:hook_id" do context "authorized user" do it "returns a project hook" do - get api("/projects/#{project.id}/hooks/#{hook.id}", user) + get v3_api("/projects/#{project.id}/hooks/#{hook.id}", user) expect(response).to have_http_status(200) expect(json_response['url']).to eq(hook.url) expect(json_response['issues_events']).to eq(hook.issues_events) @@ -65,20 +66,20 @@ describe API::ProjectHooks, 'ProjectHooks', api: true do end it "returns a 404 error if hook id is not available" do - get api("/projects/#{project.id}/hooks/1234", user) + get v3_api("/projects/#{project.id}/hooks/1234", user) expect(response).to have_http_status(404) end end context "unauthorized user" do it "does not access an existing hook" do - get api("/projects/#{project.id}/hooks/#{hook.id}", user3) + get v3_api("/projects/#{project.id}/hooks/#{hook.id}", user3) expect(response).to have_http_status(403) end end it "returns a 404 error if hook id is not available" do - get api("/projects/#{project.id}/hooks/1234", user) + get v3_api("/projects/#{project.id}/hooks/1234", user) expect(response).to have_http_status(404) end end @@ -86,7 +87,7 @@ describe API::ProjectHooks, 'ProjectHooks', api: true do describe "POST /projects/:id/hooks" do it "adds hook to project" do expect do - post api("/projects/#{project.id}/hooks", user), + post v3_api("/projects/#{project.id}/hooks", user), url: "http://example.com", issues_events: true, wiki_page_events: true end.to change {project.hooks.count}.by(1) @@ -108,7 +109,7 @@ describe API::ProjectHooks, 'ProjectHooks', api: true do token = "secret token" expect do - post api("/projects/#{project.id}/hooks", user), url: "http://example.com", token: token + post v3_api("/projects/#{project.id}/hooks", user), url: "http://example.com", token: token end.to change {project.hooks.count}.by(1) expect(response).to have_http_status(201) @@ -122,19 +123,19 @@ describe API::ProjectHooks, 'ProjectHooks', api: true do end it "returns a 400 error if url not given" do - post api("/projects/#{project.id}/hooks", user) + post v3_api("/projects/#{project.id}/hooks", user) expect(response).to have_http_status(400) end it "returns a 422 error if url not valid" do - post api("/projects/#{project.id}/hooks", user), "url" => "ftp://example.com" + post v3_api("/projects/#{project.id}/hooks", user), "url" => "ftp://example.com" expect(response).to have_http_status(422) end end describe "PUT /projects/:id/hooks/:hook_id" do it "updates an existing project hook" do - put api("/projects/#{project.id}/hooks/#{hook.id}", user), + put v3_api("/projects/#{project.id}/hooks/#{hook.id}", user), url: 'http://example.org', push_events: false expect(response).to have_http_status(200) expect(json_response['url']).to eq('http://example.org') @@ -152,7 +153,7 @@ describe API::ProjectHooks, 'ProjectHooks', api: true do it "adds the token without including it in the response" do token = "secret token" - put api("/projects/#{project.id}/hooks/#{hook.id}", user), url: "http://example.org", token: token + put v3_api("/projects/#{project.id}/hooks/#{hook.id}", user), url: "http://example.org", token: token expect(response).to have_http_status(200) expect(json_response["url"]).to eq("http://example.org") @@ -163,17 +164,17 @@ describe API::ProjectHooks, 'ProjectHooks', api: true do end it "returns 404 error if hook id not found" do - put api("/projects/#{project.id}/hooks/1234", user), url: 'http://example.org' + put v3_api("/projects/#{project.id}/hooks/1234", user), url: 'http://example.org' expect(response).to have_http_status(404) end it "returns 400 error if url is not given" do - put api("/projects/#{project.id}/hooks/#{hook.id}", user) + put v3_api("/projects/#{project.id}/hooks/#{hook.id}", user) expect(response).to have_http_status(400) end it "returns a 422 error if url is not valid" do - put api("/projects/#{project.id}/hooks/#{hook.id}", user), url: 'ftp://example.com' + put v3_api("/projects/#{project.id}/hooks/#{hook.id}", user), url: 'ftp://example.com' expect(response).to have_http_status(422) end end @@ -181,23 +182,23 @@ describe API::ProjectHooks, 'ProjectHooks', api: true do describe "DELETE /projects/:id/hooks/:hook_id" do it "deletes hook from project" do expect do - delete api("/projects/#{project.id}/hooks/#{hook.id}", user) + delete v3_api("/projects/#{project.id}/hooks/#{hook.id}", user) end.to change {project.hooks.count}.by(-1) expect(response).to have_http_status(200) end it "returns success when deleting hook" do - delete api("/projects/#{project.id}/hooks/#{hook.id}", user) + delete v3_api("/projects/#{project.id}/hooks/#{hook.id}", user) expect(response).to have_http_status(200) end it "returns a 404 error when deleting non existent hook" do - delete api("/projects/#{project.id}/hooks/42", user) + delete v3_api("/projects/#{project.id}/hooks/42", user) expect(response).to have_http_status(404) end it "returns a 404 error if hook id not given" do - delete api("/projects/#{project.id}/hooks", user) + delete v3_api("/projects/#{project.id}/hooks", user) expect(response).to have_http_status(404) end @@ -207,7 +208,7 @@ describe API::ProjectHooks, 'ProjectHooks', api: true do other_project = create(:project) other_project.team << [test_user, :master] - delete api("/projects/#{other_project.id}/hooks/#{hook.id}", test_user) + delete v3_api("/projects/#{other_project.id}/hooks/#{hook.id}", test_user) expect(response).to have_http_status(404) expect(WebHook.exists?(hook.id)).to be_truthy end |