diff options
Diffstat (limited to 'spec/controllers/projects')
8 files changed, 31 insertions, 23 deletions
diff --git a/spec/controllers/projects/clusters_controller_spec.rb b/spec/controllers/projects/clusters_controller_spec.rb index a224a2101d3..a5683a27837 100644 --- a/spec/controllers/projects/clusters_controller_spec.rb +++ b/spec/controllers/projects/clusters_controller_spec.rb @@ -387,7 +387,7 @@ describe Projects::ClustersController do cluster = project.clusters.first - expect(response.status).to eq(201) + expect(response).to have_gitlab_http_status(:created) expect(response.location).to eq(project_cluster_path(project, cluster)) expect(cluster).to be_aws expect(cluster).to be_kubernetes @@ -403,7 +403,7 @@ describe Projects::ClustersController do it 'does not create a cluster' do expect { post_create_aws }.not_to change { Clusters::Cluster.count } - expect(response.status).to eq(422) + expect(response).to have_gitlab_http_status(:unprocessable_entity) expect(response.content_type).to eq('application/json') expect(response.body).to include('is invalid') end @@ -450,7 +450,7 @@ describe Projects::ClustersController do it 'creates an Aws::Role record' do expect { go }.to change { Aws::Role.count } - expect(response.status).to eq 200 + expect(response).to have_gitlab_http_status(:ok) role = Aws::Role.last expect(role.user).to eq user @@ -464,7 +464,7 @@ describe Projects::ClustersController do it 'does not create a record' do expect { go }.not_to change { Aws::Role.count } - expect(response.status).to eq 422 + expect(response).to have_gitlab_http_status(:unprocessable_entity) end end diff --git a/spec/controllers/projects/group_links_controller_spec.rb b/spec/controllers/projects/group_links_controller_spec.rb index f8271bc8e8a..28999257957 100644 --- a/spec/controllers/projects/group_links_controller_spec.rb +++ b/spec/controllers/projects/group_links_controller_spec.rb @@ -59,7 +59,7 @@ describe Projects::GroupLinksController do include_context 'link project to group' it 'renders 404' do - expect(response.status).to eq 404 + expect(response).to have_gitlab_http_status(:not_found) end it 'does not share project with that group' do @@ -73,7 +73,7 @@ describe Projects::GroupLinksController do include_context 'link project to group' it 'renders 404' do - expect(response.status).to eq 404 + expect(response).to have_gitlab_http_status(:not_found) end it 'does not share project with that group' do diff --git a/spec/controllers/projects/merge_requests_controller_spec.rb b/spec/controllers/projects/merge_requests_controller_spec.rb index 2b1890f6cbd..5104c83283d 100644 --- a/spec/controllers/projects/merge_requests_controller_spec.rb +++ b/spec/controllers/projects/merge_requests_controller_spec.rb @@ -1557,7 +1557,7 @@ describe Projects::MergeRequestsController do post_rebase - expect(response.status).to eq(200) + expect(response).to have_gitlab_http_status(:ok) end end @@ -1572,7 +1572,7 @@ describe Projects::MergeRequestsController do post_rebase - expect(response.status).to eq(200) + expect(response).to have_gitlab_http_status(:ok) end end @@ -1583,7 +1583,7 @@ describe Projects::MergeRequestsController do post_rebase - expect(response.status).to eq(409) + expect(response).to have_gitlab_http_status(:conflict) expect(json_response['merge_error']).to eq('Failed to enqueue the rebase operation, possibly due to a long-lived transaction. Try again later.') end end @@ -1605,7 +1605,7 @@ describe Projects::MergeRequestsController do post_rebase - expect(response.status).to eq(404) + expect(response).to have_gitlab_http_status(:not_found) end end @@ -1621,7 +1621,7 @@ describe Projects::MergeRequestsController do post_rebase - expect(response.status).to eq(200) + expect(response).to have_gitlab_http_status(:ok) end end end @@ -1639,7 +1639,7 @@ describe Projects::MergeRequestsController do it 'returns 200' do get :discussions, params: { namespace_id: project.namespace, project_id: project, id: merge_request.iid } - expect(response.status).to eq(200) + expect(response).to have_gitlab_http_status(:ok) end context 'highlight preloading' do diff --git a/spec/controllers/projects/pipelines_controller_spec.rb b/spec/controllers/projects/pipelines_controller_spec.rb index 74931fcdeb2..0368130118f 100644 --- a/spec/controllers/projects/pipelines_controller_spec.rb +++ b/spec/controllers/projects/pipelines_controller_spec.rb @@ -923,10 +923,18 @@ describe Projects::PipelinesController do end context 'ref provided' do + render_views + before do create(:ci_pipeline, ref: 'master', project: project) end + it 'shows a 404 if no pipeline exists' do + get :show, params: { namespace_id: project.namespace, project_id: project, latest: true, ref: 'non-existence' } + + expect(response).to have_gitlab_http_status(:not_found) + end + it 'shows the latest pipeline for the provided ref' do get :show, params: { namespace_id: project.namespace, project_id: project, latest: true, ref: branch_secondary.name } diff --git a/spec/controllers/projects/project_members_controller_spec.rb b/spec/controllers/projects/project_members_controller_spec.rb index 09420cc8556..f354bba902a 100644 --- a/spec/controllers/projects/project_members_controller_spec.rb +++ b/spec/controllers/projects/project_members_controller_spec.rb @@ -392,7 +392,7 @@ describe Projects::ProjectMembersController do end it 'responds with not found' do - expect(response.status).to eq 404 + expect(response).to have_gitlab_http_status(:not_found) end end end diff --git a/spec/controllers/projects/protected_branches_controller_spec.rb b/spec/controllers/projects/protected_branches_controller_spec.rb index 0ebbb4b581f..262f77a7328 100644 --- a/spec/controllers/projects/protected_branches_controller_spec.rb +++ b/spec/controllers/projects/protected_branches_controller_spec.rb @@ -103,7 +103,7 @@ describe Projects::ProtectedBranchesController do it "prevents deletion of the protected branch rule" do delete(:destroy, params: base_params) - expect(response.status).to eq(403) + expect(response).to have_gitlab_http_status(:forbidden) end end end diff --git a/spec/controllers/projects/releases_controller_spec.rb b/spec/controllers/projects/releases_controller_spec.rb index 4c957e22d24..45f4433ed0a 100644 --- a/spec/controllers/projects/releases_controller_spec.rb +++ b/spec/controllers/projects/releases_controller_spec.rb @@ -36,7 +36,7 @@ describe Projects::ReleasesController do it 'renders a 200' do get_index - expect(response.status).to eq(200) + expect(response).to have_gitlab_http_status(:ok) end context 'when the project is private' do @@ -54,7 +54,7 @@ describe Projects::ReleasesController do get_index - expect(response.status).to eq(200) + expect(response).to have_gitlab_http_status(:ok) end end @@ -66,7 +66,7 @@ describe Projects::ReleasesController do get_index - expect(response.status).to eq(404) + expect(response).to have_gitlab_http_status(:not_found) end end end diff --git a/spec/controllers/projects/templates_controller_spec.rb b/spec/controllers/projects/templates_controller_spec.rb index b4b04878181..fcd9b4aa8bd 100644 --- a/spec/controllers/projects/templates_controller_spec.rb +++ b/spec/controllers/projects/templates_controller_spec.rb @@ -15,7 +15,7 @@ describe Projects::TemplatesController do it do get(:show, params: { namespace_id: project.namespace, template_type: 'issue', key: 'issue_template', project_id: project }, format: :json) - expect(response.status).to eq(200) + expect(response).to have_gitlab_http_status(:ok) expect(json_response['name']).to eq('issue_template') expect(json_response['content']).to eq('issue content') end @@ -25,7 +25,7 @@ describe Projects::TemplatesController do it do get(:show, params: { namespace_id: project.namespace, template_type: 'merge_request', key: 'merge_request_template', project_id: project }, format: :json) - expect(response.status).to eq(200) + expect(response).to have_gitlab_http_status(:ok) expect(json_response['name']).to eq('merge_request_template') expect(json_response['content']).to eq('merge request content') end @@ -35,7 +35,7 @@ describe Projects::TemplatesController do it do get(:show, params: { namespace_id: project.namespace, template_type: 'issue', key: 'issue_template', project_id: project }, format: :json) - expect(response.status).to eq(404) + expect(response).to have_gitlab_http_status(:not_found) end end @@ -43,7 +43,7 @@ describe Projects::TemplatesController do it do get(:show, params: { namespace_id: project.namespace, template_type: 'merge_request', key: 'merge_request_template', project_id: project }, format: :json) - expect(response.status).to eq(404) + expect(response).to have_gitlab_http_status(:not_found) end end @@ -57,13 +57,13 @@ describe Projects::TemplatesController do it 'renders 404 when the format type is invalid' do get(:show, params: { namespace_id: project.namespace, template_type: 'issue', key: 'issue_template', project_id: project }, format: :html) - expect(response.status).to eq(404) + expect(response).to have_gitlab_http_status(:not_found) end it 'renders 404 when the key is unknown' do get(:show, params: { namespace_id: project.namespace, template_type: 'issue', key: 'unknown_template', project_id: project }, format: :json) - expect(response.status).to eq(404) + expect(response).to have_gitlab_http_status(:not_found) end end |