Skip to content

G
gitlab-ce
Commit 6652f967 authored by Rémy Coutable's avatar Rémy Coutable
Browse files
Options

Merge branch 'ee-35644-refactor-have-http-status-into-have-gitlab-http-status' into 'master' 

Refactor `have_http_status` into `have_gitlab_http_status` in the specs

See merge request gitlab-org/gitlab-ee!3183
parents e744f0be 273f8556
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 2862 additions and 2857 deletions
changelogs/unreleased/35644-refactor-have-http-status-into-have-gitlab-http-status.yml 0 → 100644
View file @ 6652f967
---
title: Refactor have_http_status into have_gitlab_http_status
merge_request: 14958
author: Jacopo Beschi @jacopo-beschi
type: added
spec/controllers/admin/dashboard_controller_spec.rb
View file @ 6652f967
......@@ -6,21 +6,21 @@ describe Admin::DashboardController do
sign_in(create(:user, :admin))
get :index
expect(response).to have_http_status(200)
expect(response).to have_gitlab_http_status(200)
end
it "does not allow an auditor user to access the page" do
sign_in(create(:user, :auditor))
get :index
expect(response).to have_http_status(404)
expect(response).to have_gitlab_http_status(404)
end
it "does not allow a regular user to access the page" do
sign_in(create(:user))
get :index
expect(response).to have_http_status(404)
expect(response).to have_gitlab_http_status(404)
end
context 'with pending_delete projects' do
......
spec/controllers/admin/hooks_controller_spec.rb
View file @ 6652f967
......@@ -20,7 +20,7 @@ describe Admin::HooksController do
post :create, hook: hook_params
expect(response).to have_http_status(302)
expect(response).to have_gitlab_http_status(302)
expect(SystemHook.all.size).to eq(1)
expect(SystemHook.first).to have_attributes(hook_params)
end
......
spec/controllers/admin/impersonations_controller_spec.rb
View file @ 6652f967
......@@ -22,7 +22,7 @@ describe Admin::ImpersonationsController do
it "responds with status 404" do
delete :destroy
expect(response).to have_http_status(404)
expect(response).to have_gitlab_http_status(404)
end
it "doesn't sign us in" do
......@@ -46,7 +46,7 @@ describe Admin::ImpersonationsController do
it "responds with status 404" do
delete :destroy
expect(response).to have_http_status(404)
expect(response).to have_gitlab_http_status(404)
end
it "doesn't sign us in as the impersonator" do
......@@ -65,7 +65,7 @@ describe Admin::ImpersonationsController do
it "responds with status 404" do
delete :destroy
expect(response).to have_http_status(404)
expect(response).to have_gitlab_http_status(404)
end
it "doesn't sign us in as the impersonator" do
......
spec/controllers/admin/projects_controller_spec.rb
View file @ 6652f967
......@@ -27,7 +27,7 @@ describe Admin::ProjectsController do
get :index
expect(response).to have_http_status(200)
expect(response).to have_gitlab_http_status(200)
expect(response.body).not_to match(pending_delete_project.name)
expect(response.body).to match(project.name)
end
......
spec/controllers/admin/push_rules_controller_spec.rb
View file @ 6652f967
......@@ -32,7 +32,7 @@ describe Admin::PushRulesController do
it 'returns 404' do
patch :update, push_rule: params
expect(response).to have_http_status(404)
expect(response).to have_gitlab_http_status(404)
end
end
end
......@@ -41,7 +41,7 @@ describe Admin::PushRulesController do
it 'returns 200' do
get :show
expect(response).to have_http_status(200)
expect(response).to have_gitlab_http_status(200)
end
context 'push rules unlicensed' do
......@@ -52,7 +52,7 @@ describe Admin::PushRulesController do
it 'returns 404' do
get :show
expect(response).to have_http_status(404)
expect(response).to have_gitlab_http_status(404)
end
end
end
......
spec/controllers/admin/runners_controller_spec.rb
View file @ 6652f967
......@@ -11,7 +11,7 @@ describe Admin::RunnersController do
it 'lists all runners' do
get :index
expect(response).to have_http_status(200)
expect(response).to have_gitlab_http_status(200)
end
end
......@@ -19,13 +19,13 @@ describe Admin::RunnersController do
it 'shows a particular runner' do
get :show, id: runner.id
expect(response).to have_http_status(200)
expect(response).to have_gitlab_http_status(200)
end
it 'shows 404 for unknown runner' do
get :show, id: 0
expect(response).to have_http_status(404)
expect(response).to have_gitlab_http_status(404)
end
end
......@@ -39,7 +39,7 @@ describe Admin::RunnersController do
runner.reload
expect(response).to have_http_status(302)
expect(response).to have_gitlab_http_status(302)
expect(runner.description).to eq(new_desc)
end
end
......@@ -48,7 +48,7 @@ describe Admin::RunnersController do
it 'destroys the runner' do
delete :destroy, id: runner.id
expect(response).to have_http_status(302)
expect(response).to have_gitlab_http_status(302)
expect(Ci::Runner.find_by(id: runner.id)).to be_nil
end
end
......@@ -63,7 +63,7 @@ describe Admin::RunnersController do
runner.reload
expect(response).to have_http_status(302)
expect(response).to have_gitlab_http_status(302)
expect(runner.active).to eq(true)
end
end
......@@ -78,7 +78,7 @@ describe Admin::RunnersController do
runner.reload
expect(response).to have_http_status(302)
expect(response).to have_gitlab_http_status(302)
expect(runner.active).to eq(false)
end
end
......
spec/controllers/admin/services_controller_spec.rb
View file @ 6652f967
......@@ -20,7 +20,7 @@ describe Admin::ServicesController do
it 'successfully displays the template' do
get :edit, id: service.id
expect(response).to have_http_status(200)
expect(response).to have_gitlab_http_status(200)
end
end
end
......@@ -46,7 +46,7 @@ describe Admin::ServicesController do
put :update, id: service.id, service: { active: true }
expect(response).to have_http_status(302)
expect(response).to have_gitlab_http_status(302)
end
it 'does not call the propagation worker when service is not active' do
......@@ -54,7 +54,7 @@ describe Admin::ServicesController do
put :update, id: service.id, service: { properties: {} }
expect(response).to have_http_status(302)
expect(response).to have_gitlab_http_status(302)
end
end
end
spec/controllers/admin/spam_logs_controller_spec.rb
View file @ 6652f967
......@@ -14,7 +14,7 @@ describe Admin::SpamLogsController do
it 'lists all spam logs' do
get :index
expect(response).to have_http_status(200)
expect(response).to have_gitlab_http_status(200)
end
end
......@@ -22,14 +22,14 @@ describe Admin::SpamLogsController do
it 'removes only the spam log when removing log' do
expect { delete :destroy, id: first_spam.id }.to change { SpamLog.count }.by(-1)
expect(User.find(user.id)).to be_truthy
expect(response).to have_http_status(200)
expect(response).to have_gitlab_http_status(200)
end
it 'removes user and his spam logs when removing the user' do
delete :destroy, id: first_spam.id, remove_user: true
expect(flash[:notice]).to eq "User #{user.username} was successfully removed."
expect(response).to have_http_status(302)
expect(response).to have_gitlab_http_status(302)
expect(SpamLog.count).to eq(0)
expect { User.find(user.id) }.to raise_error(ActiveRecord::RecordNotFound)
end
......@@ -42,7 +42,7 @@ describe Admin::SpamLogsController do
it 'submits the log as ham' do
post :mark_as_ham, id: first_spam.id
expect(response).to have_http_status(302)
expect(response).to have_gitlab_http_status(302)
expect(SpamLog.find(first_spam.id).submitted_as_ham).to be_truthy
end
end
......
spec/controllers/admin/users_controller_spec.rb
View file @ 6652f967
......@@ -19,7 +19,7 @@ describe Admin::UsersController do
it 'deletes user and ghosts their contributions' do
delete :destroy, id: user.username, format: :json
expect(response).to have_http_status(200)
expect(response).to have_gitlab_http_status(200)
expect(User.exists?(user.id)).to be_falsy
expect(issue.reload.author).to be_ghost
end
......@@ -27,7 +27,7 @@ describe Admin::UsersController do
it 'deletes the user and their contributions when hard delete is specified' do
delete :destroy, id: user.username, hard_delete: true, format: :json
expect(response).to have_http_status(200)
expect(response).to have_gitlab_http_status(200)
expect(User.exists?(user.id)).to be_falsy
expect(Issue.exists?(issue.id)).to be_falsy
end
......
spec/controllers/application_controller_spec.rb
View file @ 6652f967
......@@ -65,7 +65,7 @@ describe ApplicationController do
context "when the 'private_token' param is populated with the private token" do
it "logs the user in" do
get :index, private_token: user.private_token
expect(response).to have_http_status(200)
expect(response).to have_gitlab_http_status(200)
expect(response.body).to eq("authenticated")
end
end
......@@ -74,7 +74,7 @@ describe ApplicationController do
it "logs the user in" do
@request.headers['PRIVATE-TOKEN'] = user.private_token
get :index
expect(response).to have_http_status(200)
expect(response).to have_gitlab_http_status(200)
expect(response.body).to eq("authenticated")
end
end
......@@ -99,7 +99,7 @@ describe ApplicationController do
context "when the 'personal_access_token' param is populated with the personal access token" do
it "logs the user in" do
get :index, private_token: personal_access_token.token
expect(response).to have_http_status(200)
expect(response).to have_gitlab_http_status(200)
expect(response.body).to eq('authenticated')
end
end
......@@ -108,7 +108,7 @@ describe ApplicationController do
it "logs the user in" do
@request.headers["PRIVATE-TOKEN"] = personal_access_token.token
get :index
expect(response).to have_http_status(200)
expect(response).to have_gitlab_http_status(200)
expect(response.body).to eq('authenticated')
end
end
......@@ -162,7 +162,7 @@ describe ApplicationController do
it 'returns 200 response' do
get :index, private_token: user.private_token, format: requested_format
expect(response).to have_http_status 200
expect(response).to have_gitlab_http_status 200
end
end
......@@ -170,7 +170,7 @@ describe ApplicationController do
it 'returns 404 response' do
get :index, private_token: user.private_token
expect(response).to have_http_status 404
expect(response).to have_gitlab_http_status 404
end
end
end
......@@ -187,7 +187,7 @@ describe ApplicationController do
context 'when the request format is atom' do
it "logs the user in" do
get :index, rss_token: user.rss_token, format: :atom
expect(response).to have_http_status 200
expect(response).to have_gitlab_http_status 200
expect(response.body).to eq 'authenticated'
end
end
......@@ -195,7 +195,7 @@ describe ApplicationController do
context 'when the request format is not atom' do
it "doesn't log the user in" do
get :index, rss_token: user.rss_token
expect(response.status).not_to have_http_status 200
expect(response.status).not_to have_gitlab_http_status 200
expect(response.body).not_to eq 'authenticated'
end
end
......
spec/controllers/autocomplete_controller_spec.rb
View file @ 6652f967
......@@ -30,7 +30,7 @@ describe AutocompleteController do
get(:users, project_id: 'unknown')
end
it { expect(response).to have_http_status(404) }
it { expect(response).to have_gitlab_http_status(404) }
end
end
......@@ -59,7 +59,7 @@ describe AutocompleteController do
get(:users, group_id: 'unknown')
end
it { expect(response).to have_http_status(404) }
it { expect(response).to have_gitlab_http_status(404) }
end
end
......@@ -138,7 +138,7 @@ describe AutocompleteController do
get(:users, project_id: project.id)
end
it { expect(response).to have_http_status(404) }
it { expect(response).to have_gitlab_http_status(404) }
end
describe 'GET #users with unknown project' do
......@@ -146,7 +146,7 @@ describe AutocompleteController do
get(:users, project_id: 'unknown')
end
it { expect(response).to have_http_status(404) }
it { expect(response).to have_gitlab_http_status(404) }
end
describe 'GET #users with inaccessible group' do
......@@ -155,7 +155,7 @@ describe AutocompleteController do
get(:users, group_id: user.namespace.id)
end
it { expect(response).to have_http_status(404) }
it { expect(response).to have_gitlab_http_status(404) }
end
describe 'GET #users with no project' do
......
spec/controllers/boards/issues_controller_spec.rb
View file @ 6652f967
......@@ -24,7 +24,7 @@ describe Boards::IssuesController do
it 'returns a not found 404 response' do
list_issues user: user, board: 999, list: list2
expect(response).to have_http_status(404)
expect(response).to have_gitlab_http_status(404)
end
end
......@@ -62,7 +62,7 @@ describe Boards::IssuesController do
it 'returns a not found 404 response' do
list_issues user: user, board: board, list: 999
expect(response).to have_http_status(404)
expect(response).to have_gitlab_http_status(404)
end
end
end
......@@ -93,7 +93,7 @@ describe Boards::IssuesController do
it 'returns a forbidden 403 response' do
list_issues user: user, board: board, list: list2
expect(response).to have_http_status(403)
expect(response).to have_gitlab_http_status(403)
end
end
......@@ -116,7 +116,7 @@ describe Boards::IssuesController do
it 'returns a successful 200 response' do
create_issue user: user, board: board, list: list1, title: 'New issue'
expect(response).to have_http_status(200)
expect(response).to have_gitlab_http_status(200)
end
it 'returns the created issue' do
......@@ -131,7 +131,7 @@ describe Boards::IssuesController do
it 'returns an unprocessable entity 422 response' do
create_issue user: user, board: board, list: list1, title: nil
expect(response).to have_http_status(422)
expect(response).to have_gitlab_http_status(422)
end
end
......@@ -141,7 +141,7 @@ describe Boards::IssuesController do
create_issue user: user, board: board, list: list, title: 'New issue'
expect(response).to have_http_status(404)
expect(response).to have_gitlab_http_status(404)
end
end
......@@ -149,7 +149,7 @@ describe Boards::IssuesController do
it 'returns a not found 404 response' do
create_issue user: user, board: 999, list: list1, title: 'New issue'
expect(response).to have_http_status(404)
expect(response).to have_gitlab_http_status(404)
end
end
......@@ -157,7 +157,7 @@ describe Boards::IssuesController do
it 'returns a not found 404 response' do
create_issue user: user, board: board, list: 999, title: 'New issue'
expect(response).to have_http_status(404)
expect(response).to have_gitlab_http_status(404)
end
end
end
......@@ -166,7 +166,7 @@ describe Boards::IssuesController do
it 'returns a forbidden 403 response' do
create_issue user: guest, board: board, list: list1, title: 'New issue'
expect(response).to have_http_status(403)
expect(response).to have_gitlab_http_status(403)
end
end
......@@ -187,7 +187,7 @@ describe Boards::IssuesController do
it 'returns a successful 200 response' do
move user: user, board: board, issue: issue, from_list_id: list1.id, to_list_id: list2.id
expect(response).to have_http_status(200)
expect(response).to have_gitlab_http_status(200)
end
it 'moves issue to the desired list' do
......@@ -201,19 +201,19 @@ describe Boards::IssuesController do
it 'returns a unprocessable entity 422 response for invalid lists' do
move user: user, board: board, issue: issue, from_list_id: nil, to_list_id: nil
expect(response).to have_http_status(422)
expect(response).to have_gitlab_http_status(422)
end
it 'returns a not found 404 response for invalid board id' do
move user: user, board: 999, issue: issue, from_list_id: list1.id, to_list_id: list2.id
expect(response).to have_http_status(404)
expect(response).to have_gitlab_http_status(404)
end
it 'returns a not found 404 response for invalid issue id' do
move user: user, board: board, issue: double(id: 999), from_list_id: list1.id, to_list_id: list2.id
expect(response).to have_http_status(404)
expect(response).to have_gitlab_http_status(404)
end
end
......@@ -227,7 +227,7 @@ describe Boards::IssuesController do
it 'returns a forbidden 403 response' do
move user: guest, board: board, issue: issue, from_list_id: list1.id, to_list_id: list2.id
expect(response).to have_http_status(403)
expect(response).to have_gitlab_http_status(403)
end
end
......
spec/controllers/boards/lists_controller_spec.rb
View file @ 6652f967
......@@ -15,7 +15,7 @@ describe Boards::ListsController do
it 'returns a successful 200 response' do
read_board_list user: user, board: board
expect(response).to have_http_status(200)
expect(response).to have_gitlab_http_status(200)
expect(response.content_type).to eq 'application/json'
end
......@@ -39,7 +39,7 @@ describe Boards::ListsController do
it 'returns a forbidden 403 response' do
read_board_list user: user, board: board
expect(response).to have_http_status(403)
expect(response).to have_gitlab_http_status(403)
end
end
......@@ -60,7 +60,7 @@ describe Boards::ListsController do
it 'returns a successful 200 response' do
create_board_list user: user, board: board, label_id: label.id
expect(response).to have_http_status(200)
expect(response).to have_gitlab_http_status(200)
end
it 'returns the created list' do
......@@ -75,7 +75,7 @@ describe Boards::ListsController do
it 'returns a not found 404 response' do
create_board_list user: user, board: board, label_id: nil
expect(response).to have_http_status(404)
expect(response).to have_gitlab_http_status(404)
end
end
......@@ -85,7 +85,7 @@ describe Boards::ListsController do
create_board_list user: user, board: board, label_id: label.id
expect(response).to have_http_status(404)
expect(response).to have_gitlab_http_status(404)
end
end
end
......@@ -96,7 +96,7 @@ describe Boards::ListsController do
create_board_list user: guest, board: board, label_id: label.id
expect(response).to have_http_status(403)
expect(response).to have_gitlab_http_status(403)
end
end
......@@ -119,7 +119,7 @@ describe Boards::ListsController do
it 'returns a successful 200 response' do
move user: user, board: board, list: planning, position: 1
expect(response).to have_http_status(200)
expect(response).to have_gitlab_http_status(200)
end
it 'moves the list to the desired position' do
......@@ -133,7 +133,7 @@ describe Boards::ListsController do
it 'returns an unprocessable entity 422 response' do
move user: user, board: board, list: planning, position: 6
expect(response).to have_http_status(422)
expect(response).to have_gitlab_http_status(422)
end
end
......@@ -141,7 +141,7 @@ describe Boards::ListsController do
it 'returns a not found 404 response' do
move user: user, board: board, list: 999, position: 1
expect(response).to have_http_status(404)
expect(response).to have_gitlab_http_status(404)
end
end
......@@ -149,7 +149,7 @@ describe Boards::ListsController do
it 'returns a forbidden 403 response' do
move user: guest, board: board, list: planning, position: 6
expect(response).to have_http_status(403)
expect(response).to have_gitlab_http_status(403)
end
end
......@@ -172,7 +172,7 @@ describe Boards::ListsController do
it 'returns a successful 200 response' do
remove_board_list user: user, board: board, list: planning
expect(response).to have_http_status(200)
expect(response).to have_gitlab_http_status(200)
end
it 'removes list from board' do
......@@ -184,7 +184,7 @@ describe Boards::ListsController do
it 'returns a not found 404 response' do
remove_board_list user: user, board: board, list: 999
expect(response).to have_http_status(404)
expect(response).to have_gitlab_http_status(404)
end
end
......@@ -192,7 +192,7 @@ describe Boards::ListsController do
it 'returns a forbidden 403 response' do
remove_board_list user: guest, board: board, list: planning
expect(response).to have_http_status(403)
expect(response).to have_gitlab_http_status(403)
end
end
......@@ -212,7 +212,7 @@ describe Boards::ListsController do
it 'returns a successful 200 response' do
generate_default_lists user: user, board: board
expect(response).to have_http_status(200)
expect(response).to have_gitlab_http_status(200)
end
it 'returns the defaults lists' do
......@@ -228,7 +228,7 @@ describe Boards::ListsController do
generate_default_lists user: user, board: board
expect(response).to have_http_status(422)
expect(response).to have_gitlab_http_status(422)
end
end
......@@ -236,7 +236,7 @@ describe Boards::ListsController do
it 'returns a forbidden 403 response' do
generate_default_lists user: guest, board: board
expect(response).to have_http_status(403)
expect(response).to have_gitlab_http_status(403)
end
end
......
spec/controllers/dashboard/milestones_controller_spec.rb
View file @ 6652f967
......@@ -32,7 +32,7 @@ describe Dashboard::MilestonesController do
it 'shows milestone page' do
view_milestone
expect(response).to have_http_status(200)
expect(response).to have_gitlab_http_status(200)
end
end
end
spec/controllers/dashboard/todos_controller_spec.rb
View file @ 6652f967
......@@ -18,19 +18,19 @@ describe Dashboard::TodosController do
get :index, project_id: unauthorized_project.id
expect(response).to have_http_status(404)
expect(response).to have_gitlab_http_status(404)
end
it 'renders 404 when given project does not exists' do
get :index, project_id: 999
expect(response).to have_http_status(404)
expect(response).to have_gitlab_http_status(404)
end
it 'renders 200 when filtering for "any project" todos' do
get :index, project_id: ''
expect(response).to have_http_status(200)
expect(response).to have_gitlab_http_status(200)
end
it 'renders 200 when user has access on given project' do
......@@ -38,7 +38,7 @@ describe Dashboard::TodosController do
get :index, project_id: authorized_project.id
expect(response).to have_http_status(200)
expect(response).to have_gitlab_http_status(200)
end
end
......@@ -61,7 +61,7 @@ describe Dashboard::TodosController do
get :index, page: last_page
expect(assigns(:todos).current_page).to eq(last_page)
expect(response).to have_http_status(200)
expect(response).to have_gitlab_http_status(200)
end
it 'does not redirect to external sites when provided a host field' do
......@@ -104,7 +104,7 @@ describe Dashboard::TodosController do
patch :restore, id: todo.id
expect(todo.reload).to be_pending
expect(response).to have_http_status(200)
expect(response).to have_gitlab_http_status(200)
expect(json_response).to eq({ "count" => "1", "done_count" => "0" })
end
end
......@@ -118,7 +118,7 @@ describe Dashboard::TodosController do
todos.each do |todo|
expect(todo.reload).to be_pending
end
expect(response).to have_http_status(200)
expect(response).to have_gitlab_http_status(200)
expect(json_response).to eq({ 'count' => '2', 'done_count' => '0' })
end
end
......
spec/controllers/groups/analytics_controller_spec.rb
View file @ 6652f967
......@@ -43,7 +43,7 @@ describe Groups::AnalyticsController do
get :show, group_id: group.path
expect(response).to have_http_status(404)
expect(response).to have_gitlab_http_status(404)
end
context 'unlicensed but we show promotions' do
......@@ -58,7 +58,7 @@ describe Groups::AnalyticsController do
get :show, group_id: group.path
expect(response).to have_http_status(200)
expect(response).to have_gitlab_http_status(200)
end
end
......
spec/controllers/groups/billings_controller_spec.rb
View file @ 6652f967
......@@ -21,7 +21,7 @@ describe Groups::BillingsController do
get :index, group_id: group
expect(response).to have_http_status(200)
expect(response).to have_gitlab_http_status(200)
expect(response).to render_template(:index)
end
......@@ -42,7 +42,7 @@ describe Groups::BillingsController do
get :index, group_id: group.id
expect(response).to have_http_status(404)
expect(response).to have_gitlab_http_status(404)
end
it 'renders 404 when it is not gitlab.com' do
......@@ -52,7 +52,7 @@ describe Groups::BillingsController do
get :index, group_id: group
expect(response).to have_http_status(404)
expect(response).to have_gitlab_http_status(404)
end
end
end
......
spec/controllers/groups/group_members_controller_spec.rb
View file @ 6652f967
......@@ -8,7 +8,7 @@ describe Groups::GroupMembersController do
it 'renders index with 200 status code' do
get :index, group_id: group
expect(response).to have_http_status(200)
expect(response).to have_gitlab_http_status(200)
expect(response).to render_template(:index)
end
end
......@@ -30,7 +30,7 @@ describe Groups::GroupMembersController do
user_ids: group_user.id,
access_level: Gitlab::Access::GUEST
expect(response).to have_http_status(403)
expect(response).to have_gitlab_http_status(403)
expect(group.users).not_to include group_user
end
end
......@@ -73,7 +73,7 @@ describe Groups::GroupMembersController do
it 'returns 403' do
delete :destroy, group_id: group, id: 42
expect(response).to have_http_status(403)
expect(response).to have_gitlab_http_status(403)
end
end
......@@ -86,7 +86,7 @@ describe Groups::GroupMembersController do
it 'returns 403' do
delete :destroy, group_id: group, id: member
expect(response).to have_http_status(403)
expect(response).to have_gitlab_http_status(403)
expect(group.members).to include member
end
end
......@@ -123,7 +123,7 @@ describe Groups::GroupMembersController do
it 'returns 404' do
delete :leave, group_id: group
expect(response).to have_http_status(404)
expect(response).to have_gitlab_http_status(404)
end
end
......@@ -144,7 +144,7 @@ describe Groups::GroupMembersController do
it 'supports json request' do
delete :leave, group_id: group, format: :json
expect(response).to have_http_status(200)
expect(response).to have_gitlab_http_status(200)
expect(json_response['notice']).to eq "You left the \"#{group.name}\" group."
end
end
......@@ -157,7 +157,7 @@ describe Groups::GroupMembersController do
it 'cannot removes himself from the group' do
delete :leave, group_id: group
expect(response).to have_http_status(403)
expect(response).to have_gitlab_http_status(403)
end
end
......@@ -204,7 +204,7 @@ describe Groups::GroupMembersController do
it 'returns 403' do
post :approve_access_request, group_id: group, id: 42
expect(response).to have_http_status(403)
expect(response).to have_gitlab_http_status(403)
end
end
......@@ -217,7 +217,7 @@ describe Groups::GroupMembersController do
it 'returns 403' do
post :approve_access_request, group_id: group, id: member
expect(response).to have_http_status(403)
expect(response).to have_gitlab_http_status(403)
expect(group.members).not_to include member
end
end
......
spec/controllers/groups/hooks_controller_spec.rb
View file @ 6652f967
......@@ -18,7 +18,7 @@ describe Groups::HooksController do
it 'is successfull' do
get :index, group_id: group.to_param
expect(response).to have_http_status(200)
expect(response).to have_gitlab_http_status(200)
end
end
......@@ -41,7 +41,7 @@ describe Groups::HooksController do
post :create, group_id: group.to_param, hook: hook_params
expect(response).to have_http_status(302)
expect(response).to have_gitlab_http_status(302)
expect(group.hooks.size).to eq(1)
expect(group.hooks.first).to have_attributes(hook_params)
end
......@@ -57,7 +57,7 @@ describe Groups::HooksController do
it 'renders a 404' do
get :index, group_id: group.to_param
expect(response).to have_http_status(404)
expect(response).to have_gitlab_http_status(404)
end
end
end
......
spec/controllers/groups/labels_controller_spec.rb
View file @ 6652f967
......@@ -16,7 +16,7 @@ describe Groups::LabelsController do
post :toggle_subscription, group_id: group.to_param, id: label.to_param
expect(response).to have_http_status(200)
expect(response).to have_gitlab_http_status(200)
end
end
end
spec/controllers/groups/milestones_controller_spec.rb
View file @ 6652f967
......@@ -35,7 +35,7 @@ describe Groups::MilestonesController do
it 'shows group milestones page' do
get :index, group_id: group.to_param
expect(response).to have_http_status(200)
expect(response).to have_gitlab_http_status(200)
end
context 'as JSON' do
......@@ -51,7 +51,7 @@ describe Groups::MilestonesController do
expect(milestones.count).to eq(2)
expect(milestones.first["title"]).to eq("group milestone")
expect(milestones.second["title"]).to eq("legacy")
expect(response).to have_http_status(200)
expect(response).to have_gitlab_http_status(200)
expect(response.content_type).to eq 'application/json'
end
end
......@@ -153,7 +153,7 @@ describe Groups::MilestonesController do
it 'does not redirect' do
get :index, group_id: group.to_param
expect(response).not_to have_http_status(301)
expect(response).not_to have_gitlab_http_status(301)
end
end
......@@ -172,7 +172,7 @@ describe Groups::MilestonesController do
it 'does not redirect' do
get :show, group_id: group.to_param, id: title
expect(response).not_to have_http_status(301)
expect(response).not_to have_gitlab_http_status(301)
end
end
......@@ -242,7 +242,7 @@ describe Groups::MilestonesController do
group_id: group.to_param,
milestone: { title: title }
expect(response).not_to have_http_status(404)
expect(response).not_to have_gitlab_http_status(404)
end
it 'does not redirect to the correct casing' do
......@@ -250,7 +250,7 @@ describe Groups::MilestonesController do
group_id: group.to_param,
milestone: { title: title }
expect(response).not_to have_http_status(301)
expect(response).not_to have_gitlab_http_status(301)
end
end
......@@ -262,7 +262,7 @@ describe Groups::MilestonesController do
group_id: redirect_route.path,
milestone: { title: title }
expect(response).to have_http_status(404)
expect(response).to have_gitlab_http_status(404)
end
end
end
......
spec/controllers/groups/settings/ci_cd_controller_spec.rb
View file @ 6652f967
......@@ -13,7 +13,7 @@ describe Groups::Settings::CiCdController do
it 'renders show with 200 status code' do
get :show, group_id: group
expect(response).to have_http_status(200)
expect(response).to have_gitlab_http_status(200)
expect(response).to render_template(:show)
end
end
......
spec/controllers/groups/variables_controller_spec.rb
View file @ 6652f967
......@@ -48,7 +48,7 @@ describe Groups::VariablesController do
post :update, group_id: group,
id: variable.id, variable: { key: '?', value: variable.value }
expect(response).to have_http_status(200)
expect(response).to have_gitlab_http_status(200)
expect(response).to render_template :show
end
end
......
spec/controllers/groups_controller_spec.rb
View file @ 6652f967
......@@ -68,7 +68,7 @@ describe GroupsController do
post :create, group: { name: 'new_group', path: "new_group" }
end.to change { Group.count }.by(1)
expect(response).to have_http_status(302)
expect(response).to have_gitlab_http_status(302)
end
context 'authorization' do
......@@ -79,7 +79,7 @@ describe GroupsController do
post :create, group: { name: 'new_group', path: "new_group" }
end.to change { Group.count }.by(1)
expect(response).to have_http_status(302)
expect(response).to have_gitlab_http_status(302)
end
it 'allows an auditor with "can_create_group" set to true to create a group' do
......@@ -89,7 +89,7 @@ describe GroupsController do
post :create, group: { name: 'new_group', path: "new_group" }
end.to change { Group.count }.by(1)
expect(response).to have_http_status(302)
expect(response).to have_gitlab_http_status(302)
end
end
......@@ -270,7 +270,7 @@ describe GroupsController do
it 'updates the path successfully' do
post :update, id: group.to_param, group: { path: 'new_path' }
expect(response).to have_http_status(302)
expect(response).to have_gitlab_http_status(302)
expect(controller).to set_flash[:notice]
end
......@@ -341,7 +341,7 @@ describe GroupsController do
it 'does not redirect' do
get :issues, id: group.to_param
expect(response).not_to have_http_status(301)
expect(response).not_to have_gitlab_http_status(301)
end
end
......@@ -360,7 +360,7 @@ describe GroupsController do
it 'does not redirect' do
get :show, id: group.to_param
expect(response).not_to have_http_status(301)
expect(response).not_to have_gitlab_http_status(301)
end
end
......@@ -427,13 +427,13 @@ describe GroupsController do
it 'does not 404' do
post :update, id: group.to_param.upcase, group: { path: 'new_path' }
expect(response).not_to have_http_status(404)
expect(response).not_to have_gitlab_http_status(404)
end
it 'does not redirect to the correct casing' do
post :update, id: group.to_param.upcase, group: { path: 'new_path' }
expect(response).not_to have_http_status(301)
expect(response).not_to have_gitlab_http_status(301)
end
end
......@@ -443,7 +443,7 @@ describe GroupsController do
it 'returns not found' do
post :update, id: redirect_route.path, group: { path: 'new_path' }
expect(response).to have_http_status(404)
expect(response).to have_gitlab_http_status(404)
end
end
end
......@@ -453,13 +453,13 @@ describe GroupsController do
it 'does not 404' do
delete :destroy, id: group.to_param.upcase
expect(response).not_to have_http_status(404)
expect(response).not_to have_gitlab_http_status(404)
end
it 'does not redirect to the correct casing' do
delete :destroy, id: group.to_param.upcase
expect(response).not_to have_http_status(301)
expect(response).not_to have_gitlab_http_status(301)
end
end
......@@ -469,7 +469,7 @@ describe GroupsController do
it 'returns not found' do
delete :destroy, id: redirect_route.path
expect(response).to have_http_status(404)
expect(response).to have_gitlab_http_status(404)
end
end
end
......
spec/controllers/health_check_controller_spec.rb
View file @ 6652f967
......@@ -100,7 +100,7 @@ describe HealthCheckController do
it 'supports failure plaintext response' do
get :index
expect(response).to have_http_status(500)
expect(response).to have_gitlab_http_status(500)
expect(response.content_type).to eq 'text/plain'
expect(response.body).to include('The server is on fire')
end
......@@ -108,7 +108,7 @@ describe HealthCheckController do
it 'supports failure json response' do
get :index, format: :json
expect(response).to have_http_status(500)
expect(response).to have_gitlab_http_status(500)
expect(response.content_type).to eq 'application/json'
expect(json_response['healthy']).to be false
expect(json_response['message']).to include('The server is on fire')
......@@ -117,7 +117,7 @@ describe HealthCheckController do
it 'supports failure xml response' do
get :index, format: :xml
expect(response).to have_http_status(500)
expect(response).to have_gitlab_http_status(500)
expect(response.content_type).to eq 'application/xml'
expect(xml_response['healthy']).to be false
expect(xml_response['message']).to include('The server is on fire')
......@@ -126,7 +126,7 @@ describe HealthCheckController do
it 'supports failure responses for specific checks' do
get :index, checks: 'email', format: :json
expect(response).to have_http_status(500)
expect(response).to have_gitlab_http_status(500)
expect(response.content_type).to eq 'application/json'
expect(json_response['healthy']).to be false
expect(json_response['message']).to include('Email is on fire')
......
spec/controllers/help_controller_spec.rb
View file @ 6652f967
......@@ -100,7 +100,7 @@ describe HelpController do
context 'for UI Development Kit' do
it 'renders found' do
get :ui
expect(response).to have_http_status(200)
expect(response).to have_gitlab_http_status(200)
end
end
end
......
spec/controllers/invites_controller_spec.rb
View file @ 6652f967
......@@ -15,7 +15,7 @@ describe InvitesController do
get :accept, id: token
member.reload
expect(response).to have_http_status(302)
expect(response).to have_gitlab_http_status(302)
expect(member.user).to eq(user)
expect(flash[:notice]).to include 'You have been granted'
end
......@@ -26,7 +26,7 @@ describe InvitesController do
get :decline, id: token
expect {member.reload}.to raise_error ActiveRecord::RecordNotFound
expect(response).to have_http_status(302)
expect(response).to have_gitlab_http_status(302)
expect(flash[:notice]).to include 'You have declined the invitation to join'
end
end
......
spec/controllers/notification_settings_controller_spec.rb
View file @ 6652f967
......@@ -110,7 +110,7 @@ describe NotificationSettingsController do
project_id: private_project.id,
notification_setting: { level: :participating }
expect(response).to have_http_status(404)
expect(response).to have_gitlab_http_status(404)
end
end
end
......@@ -172,7 +172,7 @@ describe NotificationSettingsController do
id: notification_setting,
notification_setting: { level: :participating }
expect(response).to have_http_status(404)
expect(response).to have_gitlab_http_status(404)
end
end
end
......
spec/controllers/oauth/applications_controller_spec.rb
View file @ 6652f967
......@@ -12,7 +12,7 @@ describe Oauth::ApplicationsController do
it 'shows list of applications' do
get :index
expect(response).to have_http_status(200)
expect(response).to have_gitlab_http_status(200)
end
it 'redirects back to profile page if OAuth applications are disabled' do
......@@ -21,7 +21,7 @@ describe Oauth::ApplicationsController do
get :index
expect(response).to have_http_status(302)
expect(response).to have_gitlab_http_status(302)
expect(response).to redirect_to(profile_path)
end
end
......
spec/controllers/oauth/authorizations_controller_spec.rb
View file @ 6652f967
......@@ -28,7 +28,7 @@ describe Oauth::AuthorizationsController do
it 'returns 200 code and renders error view' do
get :new
expect(response).to have_http_status(200)
expect(response).to have_gitlab_http_status(200)
expect(response).to render_template('doorkeeper/authorizations/error')
end
end
......@@ -37,7 +37,7 @@ describe Oauth::AuthorizationsController do
it 'returns 200 code and renders view' do
get :new, params
expect(response).to have_http_status(200)
expect(response).to have_gitlab_http_status(200)
expect(response).to render_template('doorkeeper/authorizations/new')
end
......@@ -48,7 +48,7 @@ describe Oauth::AuthorizationsController do
get :new, params
expect(request.session['user_return_to']).to be_nil
expect(response).to have_http_status(302)
expect(response).to have_gitlab_http_status(302)
end
end
end
......
spec/controllers/passwords_controller_spec.rb
View file @ 6652f967
......@@ -12,7 +12,7 @@ describe PasswordsController do
post :create
expect(response).to have_http_status(302)
expect(response).to have_gitlab_http_status(302)
end
end
......
spec/controllers/profiles/accounts_controller_spec.rb
View file @ 6652f967
......@@ -11,7 +11,7 @@ describe Profiles::AccountsController do
it 'renders 404 if someone tries to unlink a non existent provider' do
delete :unlink, provider: 'github'
expect(response).to have_http_status(404)
expect(response).to have_gitlab_http_status(404)
end
[:saml, :cas3].each do |provider|
......@@ -23,7 +23,7 @@ describe Profiles::AccountsController do
delete :unlink, provider: provider.to_s
expect(response).to have_http_status(302)
expect(response).to have_gitlab_http_status(302)
expect(user.reload.identities).to include(identity)
end
end
......@@ -38,7 +38,7 @@ describe Profiles::AccountsController do
delete :unlink, provider: provider.to_s
expect(response).to have_http_status(302)
expect(response).to have_gitlab_http_status(302)
expect(user.reload.identities).not_to include(identity)
end
end
......
spec/controllers/profiles/billings_controller_spec.rb
View file @ 6652f967
......@@ -15,7 +15,7 @@ describe Profiles::BillingsController do
get :index
expect(response).to have_http_status(200)
expect(response).to have_gitlab_http_status(200)
expect(response).to render_template(:index)
end
......
spec/controllers/projects/approver_groups_controller_spec.rb
View file @ 6652f967
......@@ -29,7 +29,7 @@ describe Projects::ApproverGroupsController do
it 'returns a 404' do
destroy_merge_request_approver_group
expect(response).to have_http_status(404)
expect(response).to have_gitlab_http_status(404)
end
it 'does not destroy any approver groups' do
......@@ -47,7 +47,7 @@ describe Projects::ApproverGroupsController do
it 'returns a 404' do
destroy_merge_request_approver_group
expect(response).to have_http_status(404)
expect(response).to have_gitlab_http_status(404)
end
it 'does not destroy any approver groups' do
......@@ -82,7 +82,7 @@ describe Projects::ApproverGroupsController do
it 'returns a 404' do
destroy_project_approver_group
expect(response).to have_http_status(404)
expect(response).to have_gitlab_http_status(404)
end
it 'does not destroy any approver groups' do
......
spec/controllers/projects/approvers_controller_spec.rb
View file @ 6652f967
......@@ -29,7 +29,7 @@ describe Projects::ApproversController do
it 'returns a 404' do
destroy_merge_request_approver
expect(response).to have_http_status(404)
expect(response).to have_gitlab_http_status(404)
end
it 'does not destroy any approvers' do
......@@ -47,7 +47,7 @@ describe Projects::ApproversController do
it 'returns a 404' do
destroy_merge_request_approver
expect(response).to have_http_status(404)
expect(response).to have_gitlab_http_status(404)
end
it 'does not destroy any approvers' do
......@@ -82,7 +82,7 @@ describe Projects::ApproversController do
it 'returns a 404' do
destroy_project_approver
expect(response).to have_http_status(404)
expect(response).to have_gitlab_http_status(404)
end
it 'does not destroy any approvers' do
......
spec/controllers/projects/artifacts_controller_spec.rb
View file @ 6652f967
......@@ -60,7 +60,7 @@ describe Projects::ArtifactsController do
it 'renders the file view' do
get :file, namespace_id: project.namespace, project_id: project, job_id: job, path: 'ci_artifacts.txt'
expect(response).to have_http_status(302)
expect(response).to have_gitlab_http_status(302)
end
end
......@@ -78,7 +78,7 @@ describe Projects::ArtifactsController do
it 'renders the file view' do
get :file, namespace_id: project.namespace, project_id: project, job_id: job, path: 'ci_artifacts.txt'
expect(response).to have_http_status(:ok)
expect(response).to have_gitlab_http_status(:ok)
expect(response).to render_template('projects/artifacts/file')
end
end
......@@ -106,7 +106,7 @@ describe Projects::ArtifactsController do
it 'does not redirect the request' do
get :file, namespace_id: private_project.namespace, project_id: private_project, job_id: job, path: 'ci_artifacts.txt'
expect(response).to have_http_status(:ok)
expect(response).to have_gitlab_http_status(:ok)
expect(response).to render_template('projects/artifacts/file')
end
end
......@@ -176,7 +176,7 @@ describe Projects::ArtifactsController do
context 'cannot find the job' do
shared_examples 'not found' do
it { expect(response).to have_http_status(:not_found) }
it { expect(response).to have_gitlab_http_status(:not_found) }
end
context 'has no such ref' do
......
spec/controllers/projects/badges_controller_spec.rb
View file @ 6652f967
......@@ -13,13 +13,13 @@ describe Projects::BadgesController do
it 'requests the pipeline badge successfully' do
get_badge(:pipeline)
expect(response).to have_http_status(:ok)
expect(response).to have_gitlab_http_status(:ok)
end
it 'requests the coverage badge successfully' do
get_badge(:coverage)
expect(response).to have_http_status(:ok)
expect(response).to have_gitlab_http_status(:ok)
end
def get_badge(badge)
......
spec/controllers/projects/blame_controller_spec.rb
View file @ 6652f967
......@@ -28,7 +28,7 @@ describe Projects::BlameController do
context "invalid file" do
let(:id) { 'master/files/ruby/missing_file.rb'}
it { expect(response).to have_http_status(404) }
it { expect(response).to have_gitlab_http_status(404) }
end
end
end
spec/controllers/projects/blob_controller_spec.rb
View file @ 6652f967
......@@ -153,7 +153,7 @@ describe Projects::BlobController do
end
it 'redirects to blob show' do
expect(response).to have_http_status(200)
expect(response).to have_gitlab_http_status(200)
end
end
......@@ -167,7 +167,7 @@ describe Projects::BlobController do
end
it 'redirects to blob show' do
expect(response).to have_http_status(200)
expect(response).to have_gitlab_http_status(200)
end
end
end
......
spec/controllers/projects/boards_controller_spec.rb
View file @ 6652f967
......@@ -31,7 +31,7 @@ describe Projects::BoardsController do
it 'returns a not found 404 response' do
list_boards
expect(response).to have_http_status(404)
expect(response).to have_gitlab_http_status(404)
expect(response.content_type).to eq 'text/html'
end
end
......@@ -59,7 +59,7 @@ describe Projects::BoardsController do
it 'returns a not found 404 response' do
list_boards format: :json
expect(response).to have_http_status(404)
expect(response).to have_gitlab_http_status(404)
expect(response.content_type).to eq 'application/json'
end
end
......@@ -92,7 +92,7 @@ describe Projects::BoardsController do
it 'returns a not found 404 response' do
read_board board: board
expect(response).to have_http_status(404)
expect(response).to have_gitlab_http_status(404)
expect(response.content_type).to eq 'text/html'
end
end
......@@ -114,7 +114,7 @@ describe Projects::BoardsController do
it 'returns a not found 404 response' do
read_board board: board, format: :json
expect(response).to have_http_status(404)
expect(response).to have_gitlab_http_status(404)
expect(response.content_type).to eq 'application/json'
end
end
......@@ -126,7 +126,7 @@ describe Projects::BoardsController do
read_board board: another_board
expect(response).to have_http_status(404)
expect(response).to have_gitlab_http_status(404)
end
end
......
spec/controllers/projects/branches_controller_spec.rb
View file @ 6652f967
......@@ -128,7 +128,7 @@ describe Projects::BranchesController do
issue_iid: issue.iid
expect(response.location).to include(project_new_blob_path(project, branch))
expect(response).to have_http_status(302)
expect(response).to have_gitlab_http_status(302)
end
end
......@@ -161,7 +161,7 @@ describe Projects::BranchesController do
it 'returns a successful 200 response' do
create_branch name: 'my-branch', ref: 'master'
expect(response).to have_http_status(200)
expect(response).to have_gitlab_http_status(200)
end
it 'returns the created branch' do
......@@ -175,7 +175,7 @@ describe Projects::BranchesController do
it 'returns an unprocessable entity 422 response' do
create_branch name: "<script>alert('merge');</script>", ref: "<script>alert('ref');</script>"
expect(response).to have_http_status(422)
expect(response).to have_gitlab_http_status(422)
end
end
......@@ -202,7 +202,7 @@ describe Projects::BranchesController do
namespace_id: project.namespace,
project_id: project
expect(response).to have_http_status(303)
expect(response).to have_gitlab_http_status(303)
end
end
......@@ -226,28 +226,28 @@ describe Projects::BranchesController do
context "valid branch name, valid source" do
let(:branch) { "feature" }
it { expect(response).to have_http_status(200) }
it { expect(response).to have_gitlab_http_status(200) }
it { expect(response.body).to be_blank }
end
context "valid branch name with unencoded slashes" do
let(:branch) { "improve/awesome" }
it { expect(response).to have_http_status(200) }
it { expect(response).to have_gitlab_http_status(200) }
it { expect(response.body).to be_blank }
end
context "valid branch name with encoded slashes" do
let(:branch) { "improve%2Fawesome" }
it { expect(response).to have_http_status(200) }
it { expect(response).to have_gitlab_http_status(200) }
it { expect(response.body).to be_blank }
end
context "invalid branch name, valid ref" do
let(:branch) { "no-branch" }
it { expect(response).to have_http_status(404) }
it { expect(response).to have_gitlab_http_status(404) }
it { expect(response.body).to be_blank }
end
end
......@@ -263,7 +263,7 @@ describe Projects::BranchesController do
expect(json_response).to eql("message" => 'Branch was removed')
end
it { expect(response).to have_http_status(200) }
it { expect(response).to have_gitlab_http_status(200) }
end
context 'valid branch name with unencoded slashes' do
......@@ -273,7 +273,7 @@ describe Projects::BranchesController do
expect(json_response).to eql('message' => 'Branch was removed')
end
it { expect(response).to have_http_status(200) }
it { expect(response).to have_gitlab_http_status(200) }
end
context "valid branch name with encoded slashes" do
......@@ -283,7 +283,7 @@ describe Projects::BranchesController do
expect(json_response).to eql('message' => 'Branch was removed')
end
it { expect(response).to have_http_status(200) }
it { expect(response).to have_gitlab_http_status(200) }
end
context 'invalid branch name, valid ref' do
......@@ -293,7 +293,7 @@ describe Projects::BranchesController do
expect(json_response).to eql('message' => 'No such branch')
end
it { expect(response).to have_http_status(404) }
it { expect(response).to have_gitlab_http_status(404) }
end
end
......@@ -341,7 +341,7 @@ describe Projects::BranchesController do
it 'responds with status 404' do
destroy_all_merged
expect(response).to have_http_status(404)
expect(response).to have_gitlab_http_status(404)
end
end
end
......@@ -379,7 +379,7 @@ describe Projects::BranchesController do
project_id: project,
format: :html
expect(response).to have_http_status(200)
expect(response).to have_gitlab_http_status(200)
end
end
end
......
spec/controllers/projects/clusters_controller_spec.rb
View file @ 6652f967
......@@ -169,7 +169,7 @@ describe Projects::ClustersController do
it "responds with matching schema" do
subject
expect(response).to have_http_status(:ok)
expect(response).to have_gitlab_http_status(:ok)
expect(response).to match_response_schema('cluster_status')
end
end
......@@ -189,14 +189,14 @@ describe Projects::ClustersController do
it "allows to update cluster" do
subject
expect(response).to have_http_status(:ok)
expect(response).to have_gitlab_http_status(:ok)
expect(response.body).to include("Save")
end
it "allows remove integration" do
subject
expect(response).to have_http_status(:ok)
expect(response).to have_gitlab_http_status(:ok)
expect(response.body).to include("Remove integration")
end
end
......@@ -207,7 +207,7 @@ describe Projects::ClustersController do
it "does not allow to access page" do
subject
expect(response).to have_http_status(:not_found)
expect(response).to have_gitlab_http_status(:not_found)
end
end
end
......@@ -251,7 +251,7 @@ describe Projects::ClustersController do
it "rejects changes" do
subject
expect(response).to have_http_status(:ok)
expect(response).to have_gitlab_http_status(:ok)
expect(response).to render_template(:show)
end
end
......@@ -263,7 +263,7 @@ describe Projects::ClustersController do
it "does not allow to update cluster" do
subject
expect(response).to have_http_status(:not_found)
expect(response).to have_gitlab_http_status(:not_found)
end
end
end
......@@ -292,7 +292,7 @@ describe Projects::ClustersController do
it "does not allow to destroy cluster" do
subject
expect(response).to have_http_status(:not_found)
expect(response).to have_gitlab_http_status(:not_found)
end
end
end
......
spec/controllers/projects/commit_controller_spec.rb
View file @ 6652f967
......@@ -157,7 +157,7 @@ describe Projects::CommitController do
id: commit.id)
expect(response).not_to be_success
expect(response).to have_http_status(404)
expect(response).to have_gitlab_http_status(404)
end
end
......@@ -206,7 +206,7 @@ describe Projects::CommitController do
id: master_pickable_commit.id)
expect(response).not_to be_success
expect(response).to have_http_status(404)
expect(response).to have_gitlab_http_status(404)
end
end
......@@ -286,7 +286,7 @@ describe Projects::CommitController do
end
it 'returns a 404' do
expect(response).to have_http_status(404)
expect(response).to have_gitlab_http_status(404)
end
end
end
......@@ -298,7 +298,7 @@ describe Projects::CommitController do
end
it 'returns a 404' do
expect(response).to have_http_status(404)
expect(response).to have_gitlab_http_status(404)
end
end
end
......@@ -309,7 +309,7 @@ describe Projects::CommitController do
end
it 'returns a 404' do
expect(response).to have_http_status(404)
expect(response).to have_gitlab_http_status(404)
end
end
end
......@@ -356,7 +356,7 @@ describe Projects::CommitController do
end
it 'returns a 404' do
expect(response).to have_http_status(404)
expect(response).to have_gitlab_http_status(404)
end
end
end
......
spec/controllers/projects/compare_controller_spec.rb
View file @ 6652f967
......@@ -133,7 +133,7 @@ describe Projects::CompareController do
end
it 'returns a 404' do
expect(response).to have_http_status(404)
expect(response).to have_gitlab_http_status(404)
end
end
end
......@@ -145,7 +145,7 @@ describe Projects::CompareController do
end
it 'returns a 404' do
expect(response).to have_http_status(404)
expect(response).to have_gitlab_http_status(404)
end
end
end
......@@ -156,7 +156,7 @@ describe Projects::CompareController do
end
it 'returns a 404' do
expect(response).to have_http_status(404)
expect(response).to have_gitlab_http_status(404)
end
end
......@@ -166,7 +166,7 @@ describe Projects::CompareController do
end
it 'returns a 404' do
expect(response).to have_http_status(404)
expect(response).to have_gitlab_http_status(404)
end
end
end
......
spec/controllers/projects/deployments_controller_spec.rb
View file @ 6652f967
......@@ -67,7 +67,7 @@ describe Projects::DeploymentsController do
it 'returns a empty response 204 resposne' do
get :metrics, deployment_params(id: deployment.id)
expect(response).to have_http_status(204)
expect(response).to have_gitlab_http_status(204)
expect(response.body).to eq('')
end
end
......@@ -142,7 +142,7 @@ describe Projects::DeploymentsController do
it 'returns a empty response 204 response' do
get :additional_metrics, deployment_params(id: deployment.id, format: :json)
expect(response).to have_http_status(204)
expect(response).to have_gitlab_http_status(204)
expect(response.body).to eq('')
end
end
......
spec/controllers/projects/discussions_controller_spec.rb
View file @ 6652f967
......@@ -25,7 +25,7 @@ describe Projects::DiscussionsController do
it "returns status 404" do
post :resolve, request_params
expect(response).to have_http_status(404)
expect(response).to have_gitlab_http_status(404)
end
end
......@@ -42,7 +42,7 @@ describe Projects::DiscussionsController do
it "returns status 404" do
post :resolve, request_params
expect(response).to have_http_status(404)
expect(response).to have_gitlab_http_status(404)
end
end
......@@ -69,7 +69,7 @@ describe Projects::DiscussionsController do
it "returns status 200" do
post :resolve, request_params
expect(response).to have_http_status(200)
expect(response).to have_gitlab_http_status(200)
end
end
end
......@@ -86,7 +86,7 @@ describe Projects::DiscussionsController do
it "returns status 404" do
delete :unresolve, request_params
expect(response).to have_http_status(404)
expect(response).to have_gitlab_http_status(404)
end
end
......@@ -103,7 +103,7 @@ describe Projects::DiscussionsController do
it "returns status 404" do
delete :unresolve, request_params
expect(response).to have_http_status(404)
expect(response).to have_gitlab_http_status(404)
end
end
......@@ -117,7 +117,7 @@ describe Projects::DiscussionsController do
it "returns status 200" do
delete :unresolve, request_params
expect(response).to have_http_status(200)
expect(response).to have_gitlab_http_status(200)
end
end
end
......
spec/controllers/projects/environments_controller_spec.rb
View file @ 6652f967
......@@ -21,7 +21,7 @@ describe Projects::EnvironmentsController do
it 'responds with status code 200' do
get :index, environment_params
expect(response).to have_http_status(:ok)
expect(response).to have_gitlab_http_status(:ok)
end
it 'expires etag cache to force reload environments list' do
......@@ -79,7 +79,7 @@ describe Projects::EnvironmentsController do
end
it 'sets the polling interval header' do
expect(response).to have_http_status(:ok)
expect(response).to have_gitlab_http_status(:ok)
expect(response.headers['Poll-Interval']).to eq("3000")
end
end
......@@ -170,7 +170,7 @@ describe Projects::EnvironmentsController do
params[:id] = 12345
get :show, params
expect(response).to have_http_status(404)
expect(response).to have_gitlab_http_status(404)
end
end
end
......@@ -188,7 +188,7 @@ describe Projects::EnvironmentsController do
patch_params = environment_params.merge(environment: { external_url: 'https://git.gitlab.com' })
patch :update, patch_params
expect(response).to have_http_status(302)
expect(response).to have_gitlab_http_status(302)
end
end
......@@ -199,7 +199,7 @@ describe Projects::EnvironmentsController do
patch :stop, environment_params(format: :json)
expect(response).to have_http_status(404)
expect(response).to have_gitlab_http_status(404)
end
end
......@@ -212,7 +212,7 @@ describe Projects::EnvironmentsController do
patch :stop, environment_params(format: :json)
expect(response).to have_http_status(200)
expect(response).to have_gitlab_http_status(200)
expect(json_response).to eq(
{ 'redirect_url' =>
project_job_url(project, action) })
......@@ -226,7 +226,7 @@ describe Projects::EnvironmentsController do
patch :stop, environment_params(format: :json)
expect(response).to have_http_status(200)
expect(response).to have_gitlab_http_status(200)
expect(json_response).to eq(
{ 'redirect_url' =>
project_environment_url(project, environment) })
......@@ -239,7 +239,7 @@ describe Projects::EnvironmentsController do
it 'responds with a status code 200' do
get :terminal, environment_params
expect(response).to have_http_status(200)
expect(response).to have_gitlab_http_status(200)
end
it 'loads the terminals for the enviroment' do
......@@ -253,7 +253,7 @@ describe Projects::EnvironmentsController do
it 'responds with a status code 404' do
get :terminal, environment_params(id: 666)
expect(response).to have_http_status(404)
expect(response).to have_gitlab_http_status(404)
end
end
end
......@@ -277,7 +277,7 @@ describe Projects::EnvironmentsController do
get :terminal_websocket_authorize, environment_params
expect(response).to have_http_status(200)
expect(response).to have_gitlab_http_status(200)
expect(response.headers["Content-Type"]).to eq(Gitlab::Workhorse::INTERNAL_API_CONTENT_TYPE)
expect(response.body).to eq('{"workhorse":"response"}')
end
......@@ -287,7 +287,7 @@ describe Projects::EnvironmentsController do
it 'returns 404' do
get :terminal_websocket_authorize, environment_params(id: 666)
expect(response).to have_http_status(404)
expect(response).to have_gitlab_http_status(404)
end
end
end
......@@ -323,7 +323,7 @@ describe Projects::EnvironmentsController do
it 'returns a metrics JSON document' do
get :metrics, environment_params(format: :json)
expect(response).to have_http_status(204)
expect(response).to have_gitlab_http_status(204)
expect(json_response).to eq({})
end
end
......@@ -363,7 +363,7 @@ describe Projects::EnvironmentsController do
it 'returns a metrics JSON document' do
get :additional_metrics, environment_params(format: :json)
expect(response).to have_http_status(204)
expect(response).to have_gitlab_http_status(204)
expect(json_response).to eq({})
end
end
......
spec/controllers/projects/forks_controller_spec.rb
View file @ 6652f967
......@@ -89,7 +89,7 @@ describe Projects::ForksController do
get_new
expect(response).to have_http_status(200)
expect(response).to have_gitlab_http_status(200)
end
end
......@@ -118,7 +118,7 @@ describe Projects::ForksController do
post_create
expect(response).to have_http_status(302)
expect(response).to have_gitlab_http_status(302)
expect(response).to redirect_to(namespace_project_import_path(user.namespace, project))
end
end
......
spec/controllers/projects/issues_controller_spec.rb
View file @ 6652f967
......@@ -20,7 +20,7 @@ describe Projects::IssuesController do
get :index, namespace_id: project.namespace, project_id: project
expect(response).to have_http_status(404)
expect(response).to have_gitlab_http_status(404)
end
end
......@@ -28,7 +28,7 @@ describe Projects::IssuesController do
it 'renders the "index" template' do
get :index, namespace_id: project.namespace, project_id: project
expect(response).to have_http_status(200)
expect(response).to have_gitlab_http_status(200)
expect(response).to render_template(:index)
end
end
......@@ -45,7 +45,7 @@ describe Projects::IssuesController do
it "returns index" do
get :index, namespace_id: project.namespace, project_id: project
expect(response).to have_http_status(200)
expect(response).to have_gitlab_http_status(200)
end
it "returns 301 if request path doesn't match project path" do
......@@ -59,7 +59,7 @@ describe Projects::IssuesController do
project.save!
get :index, namespace_id: project.namespace, project_id: project
expect(response).to have_http_status(404)
expect(response).to have_gitlab_http_status(404)
end
end
......@@ -89,7 +89,7 @@ describe Projects::IssuesController do
page: last_page.to_param
expect(assigns(:issues).current_page).to eq(last_page)
expect(response).to have_http_status(200)
expect(response).to have_gitlab_http_status(200)
end
it 'does not redirect to external sites when provided a host field' do
......@@ -166,7 +166,7 @@ describe Projects::IssuesController do
get :new, namespace_id: project.namespace, project_id: project
expect(response).to have_http_status(404)
expect(response).to have_gitlab_http_status(404)
end
end
......@@ -174,7 +174,7 @@ describe Projects::IssuesController do
it 'renders the "new" template' do
get :new, namespace_id: project.namespace, project_id: project
expect(response).to have_http_status(200)
expect(response).to have_gitlab_http_status(200)
expect(response).to render_template(:new)
end
end
......@@ -224,7 +224,7 @@ describe Projects::IssuesController do
it 'moves issue to another project' do
move_issue
expect(response).to have_http_status :ok
expect(response).to have_gitlab_http_status :ok
expect(another_project.issues).not_to be_empty
end
end
......@@ -233,7 +233,7 @@ describe Projects::IssuesController do
it 'responds with 404' do
move_issue
expect(response).to have_http_status :not_found
expect(response).to have_gitlab_http_status :not_found
end
end
......@@ -329,14 +329,14 @@ describe Projects::IssuesController do
sign_out(:user)
go(id: unescaped_parameter_value.to_param)
expect(response).to have_http_status :not_found
expect(response).to have_gitlab_http_status :not_found
end
it 'returns 404 for non project members' do
sign_in(non_member)
go(id: unescaped_parameter_value.to_param)
expect(response).to have_http_status :not_found
expect(response).to have_gitlab_http_status :not_found
end
it 'returns 404 for project members with guest role' do
......@@ -344,21 +344,21 @@ describe Projects::IssuesController do
project.team << [member, :guest]
go(id: unescaped_parameter_value.to_param)
expect(response).to have_http_status :not_found
expect(response).to have_gitlab_http_status :not_found
end
it "returns #{http_status[:success]} for author" do
sign_in(author)
go(id: unescaped_parameter_value.to_param)
expect(response).to have_http_status http_status[:success]
expect(response).to have_gitlab_http_status http_status[:success]
end
it "returns #{http_status[:success]} for assignee" do
sign_in(assignee)
go(id: request_forgery_timing_attack.to_param)
expect(response).to have_http_status http_status[:success]
expect(response).to have_gitlab_http_status http_status[:success]
end
it "returns #{http_status[:success]} for project members" do
......@@ -366,14 +366,14 @@ describe Projects::IssuesController do
project.team << [member, :developer]
go(id: unescaped_parameter_value.to_param)
expect(response).to have_http_status http_status[:success]
expect(response).to have_gitlab_http_status http_status[:success]
end
it "returns #{http_status[:success]} for admin" do
sign_in(admin)
go(id: unescaped_parameter_value.to_param)
expect(response).to have_http_status http_status[:success]
expect(response).to have_gitlab_http_status http_status[:success]
end
end
......@@ -475,7 +475,7 @@ describe Projects::IssuesController do
it 'returns 422 status' do
update_issue
expect(response).to have_http_status(422)
expect(response).to have_gitlab_http_status(422)
end
end
......@@ -495,7 +495,7 @@ describe Projects::IssuesController do
end
it 'returns 200 status' do
expect(response).to have_http_status(200)
expect(response).to have_gitlab_http_status(200)
end
it 'accepts an issue after recaptcha is verified' do
......@@ -553,7 +553,7 @@ describe Projects::IssuesController do
it 'returns 200' do
go(id: issue.iid)
expect(response).to have_http_status(200)
expect(response).to have_gitlab_http_status(200)
end
end
end
......@@ -778,7 +778,7 @@ describe Projects::IssuesController do
it "rejects a developer to destroy an issue" do
delete :destroy, namespace_id: project.namespace, project_id: project, id: issue.iid
expect(response).to have_http_status(404)
expect(response).to have_gitlab_http_status(404)
end
end
......@@ -794,7 +794,7 @@ describe Projects::IssuesController do
it "deletes the issue" do
delete :destroy, namespace_id: project.namespace, project_id: project, id: issue.iid
expect(response).to have_http_status(302)
expect(response).to have_gitlab_http_status(302)
expect(controller).to set_flash[:notice].to(/The issue was successfully deleted\./)
end
......@@ -818,7 +818,7 @@ describe Projects::IssuesController do
project_id: project, id: issue.iid, name: "thumbsup")
end.to change { issue.award_emoji.count }.by(1)
expect(response).to have_http_status(200)
expect(response).to have_gitlab_http_status(200)
end
end
......
spec/controllers/projects/jobs_controller_spec.rb
View file @ 6652f967
......@@ -20,7 +20,7 @@ describe Projects::JobsController do
end
it 'has only pending builds' do
expect(response).to have_http_status(:ok)
expect(response).to have_gitlab_http_status(:ok)
expect(assigns(:builds).first.status).to eq('pending')
end
end
......@@ -33,7 +33,7 @@ describe Projects::JobsController do
end
it 'has only running jobs' do
expect(response).to have_http_status(:ok)
expect(response).to have_gitlab_http_status(:ok)
expect(assigns(:builds).first.status).to eq('running')
end
end
......@@ -46,7 +46,7 @@ describe Projects::JobsController do
end
it 'has only finished jobs' do
expect(response).to have_http_status(:ok)
expect(response).to have_gitlab_http_status(:ok)
expect(assigns(:builds).first.status).to eq('success')
end
end
......@@ -62,7 +62,7 @@ describe Projects::JobsController do
end
it 'redirects to the page' do
expect(response).to have_http_status(:ok)
expect(response).to have_gitlab_http_status(:ok)
expect(assigns(:builds).current_page).to eq(last_page)
end
end
......@@ -107,7 +107,7 @@ describe Projects::JobsController do
end
it 'has a job' do
expect(response).to have_http_status(:ok)
expect(response).to have_gitlab_http_status(:ok)
expect(assigns(:build).id).to eq(job.id)
end
end
......@@ -118,7 +118,7 @@ describe Projects::JobsController do
end
it 'renders not_found' do
expect(response).to have_http_status(:not_found)
expect(response).to have_gitlab_http_status(:not_found)
end
end
end
......@@ -136,7 +136,7 @@ describe Projects::JobsController do
end
it 'exposes needed information' do
expect(response).to have_http_status(:ok)
expect(response).to have_gitlab_http_status(:ok)
expect(json_response['raw_path']).to match(/jobs\/\d+\/raw\z/)
expect(json_response.dig('merge_request', 'path')).to match(/merge_requests\/\d+\z/)
expect(json_response['new_issue_path'])
......@@ -163,7 +163,7 @@ describe Projects::JobsController do
let(:job) { create(:ci_build, :trace, pipeline: pipeline) }
it 'returns a trace' do
expect(response).to have_http_status(:ok)
expect(response).to have_gitlab_http_status(:ok)
expect(json_response['id']).to eq job.id
expect(json_response['status']).to eq job.status
expect(json_response['html']).to eq('BUILD TRACE')
......@@ -174,7 +174,7 @@ describe Projects::JobsController do
let(:job) { create(:ci_build, pipeline: pipeline) }
it 'returns no traces' do
expect(response).to have_http_status(:ok)
expect(response).to have_gitlab_http_status(:ok)
expect(json_response['id']).to eq job.id
expect(json_response['status']).to eq job.status
expect(json_response['html']).to be_nil
......@@ -185,7 +185,7 @@ describe Projects::JobsController do
let(:job) { create(:ci_build, :unicode_trace, pipeline: pipeline) }
it 'returns a trace with Unicode' do
expect(response).to have_http_status(:ok)
expect(response).to have_gitlab_http_status(:ok)
expect(json_response['id']).to eq job.id
expect(json_response['status']).to eq job.status
expect(json_response['html']).to include("ヾ(´༎ຶД༎ຶ`)ﾉ")
......@@ -212,7 +212,7 @@ describe Projects::JobsController do
end
it 'return a detailed job status in json' do
expect(response).to have_http_status(:ok)
expect(response).to have_gitlab_http_status(:ok)
expect(json_response['text']).to eq status.text
expect(json_response['label']).to eq status.label
expect(json_response['icon']).to eq status.icon
......@@ -232,7 +232,7 @@ describe Projects::JobsController do
let(:job) { create(:ci_build, :retryable, pipeline: pipeline) }
it 'redirects to the retried job page' do
expect(response).to have_http_status(:found)
expect(response).to have_gitlab_http_status(:found)
expect(response).to redirect_to(namespace_project_job_path(id: Ci::Build.last.id))
end
end
......@@ -241,7 +241,7 @@ describe Projects::JobsController do
let(:job) { create(:ci_build, pipeline: pipeline) }
it 'renders unprocessable_entity' do
expect(response).to have_http_status(:unprocessable_entity)
expect(response).to have_gitlab_http_status(:unprocessable_entity)
end
end
......@@ -268,7 +268,7 @@ describe Projects::JobsController do
let(:job) { create(:ci_build, :playable, pipeline: pipeline) }
it 'redirects to the played job page' do
expect(response).to have_http_status(:found)
expect(response).to have_gitlab_http_status(:found)
expect(response).to redirect_to(namespace_project_job_path(id: job.id))
end
......@@ -281,7 +281,7 @@ describe Projects::JobsController do
let(:job) { create(:ci_build, pipeline: pipeline) }
it 'renders unprocessable_entity' do
expect(response).to have_http_status(:unprocessable_entity)
expect(response).to have_gitlab_http_status(:unprocessable_entity)
end
end
......@@ -304,7 +304,7 @@ describe Projects::JobsController do
let(:job) { create(:ci_build, :cancelable, pipeline: pipeline) }
it 'redirects to the canceled job page' do
expect(response).to have_http_status(:found)
expect(response).to have_gitlab_http_status(:found)
expect(response).to redirect_to(namespace_project_job_path(id: job.id))
end
......@@ -317,7 +317,7 @@ describe Projects::JobsController do
let(:job) { create(:ci_build, :canceled, pipeline: pipeline) }
it 'returns unprocessable_entity' do
expect(response).to have_http_status(:unprocessable_entity)
expect(response).to have_gitlab_http_status(:unprocessable_entity)
end
end
......@@ -342,7 +342,7 @@ describe Projects::JobsController do
end
it 'redirects to a index page' do
expect(response).to have_http_status(:found)
expect(response).to have_gitlab_http_status(:found)
expect(response).to redirect_to(namespace_project_jobs_path)
end
......@@ -359,7 +359,7 @@ describe Projects::JobsController do
end
it 'redirects to a index page' do
expect(response).to have_http_status(:found)
expect(response).to have_gitlab_http_status(:found)
expect(response).to redirect_to(namespace_project_jobs_path)
end
end
......@@ -382,7 +382,7 @@ describe Projects::JobsController do
let(:job) { create(:ci_build, :erasable, :trace, pipeline: pipeline) }
it 'redirects to the erased job page' do
expect(response).to have_http_status(:found)
expect(response).to have_gitlab_http_status(:found)
expect(response).to redirect_to(namespace_project_job_path(id: job.id))
end
......@@ -400,7 +400,7 @@ describe Projects::JobsController do
let(:job) { create(:ci_build, :erased, pipeline: pipeline) }
it 'returns unprocessable_entity' do
expect(response).to have_http_status(:unprocessable_entity)
expect(response).to have_gitlab_http_status(:unprocessable_entity)
end
end
......@@ -420,7 +420,7 @@ describe Projects::JobsController do
let(:job) { create(:ci_build, :trace, pipeline: pipeline) }
it 'send a trace file' do
expect(response).to have_http_status(:ok)
expect(response).to have_gitlab_http_status(:ok)
expect(response.content_type).to eq 'text/plain; charset=utf-8'
expect(response.body).to eq 'BUILD TRACE'
end
......@@ -430,7 +430,7 @@ describe Projects::JobsController do
let(:job) { create(:ci_build, pipeline: pipeline) }
it 'returns not_found' do
expect(response).to have_http_status(:not_found)
expect(response).to have_gitlab_http_status(:not_found)
end
end
......
spec/controllers/projects/labels_controller_spec.rb
View file @ 6652f967
......@@ -78,7 +78,7 @@ describe Projects::LabelsController do
it 'creates labels' do
post :generate, namespace_id: personal_project.namespace.to_param, project_id: personal_project
expect(response).to have_http_status(302)
expect(response).to have_gitlab_http_status(302)
end
end
......@@ -86,7 +86,7 @@ describe Projects::LabelsController do
it 'creates labels' do
post :generate, namespace_id: project.namespace.to_param, project_id: project
expect(response).to have_http_status(302)
expect(response).to have_gitlab_http_status(302)
end
end
end
......@@ -97,7 +97,7 @@ describe Projects::LabelsController do
toggle_subscription(label)
expect(response).to have_http_status(200)
expect(response).to have_gitlab_http_status(200)
end
it 'allows user to toggle subscription on group labels' do
......@@ -105,7 +105,7 @@ describe Projects::LabelsController do
toggle_subscription(group_label)
expect(response).to have_http_status(200)
expect(response).to have_gitlab_http_status(200)
end
def toggle_subscription(label)
......@@ -121,7 +121,7 @@ describe Projects::LabelsController do
it 'denies access' do
post :promote, namespace_id: project.namespace.to_param, project_id: project, id: label_1.to_param
expect(response).to have_http_status(404)
expect(response).to have_gitlab_http_status(404)
end
end
......@@ -170,7 +170,7 @@ describe Projects::LabelsController do
it 'does not redirect' do
get :index, namespace_id: project.namespace, project_id: project.to_param
expect(response).not_to have_http_status(301)
expect(response).not_to have_gitlab_http_status(301)
end
end
......@@ -203,13 +203,13 @@ describe Projects::LabelsController do
it 'does not 404' do
post :generate, namespace_id: project.namespace, project_id: project
expect(response).not_to have_http_status(404)
expect(response).not_to have_gitlab_http_status(404)
end
it 'does not redirect to the correct casing' do
post :generate, namespace_id: project.namespace, project_id: project
expect(response).not_to have_http_status(301)
expect(response).not_to have_gitlab_http_status(301)
end
end
......@@ -219,7 +219,7 @@ describe Projects::LabelsController do
it 'returns not found' do
post :generate, namespace_id: project.namespace, project_id: project.to_param + 'old'
expect(response).to have_http_status(404)
expect(response).to have_gitlab_http_status(404)
end
end
end
......
spec/controllers/projects/mattermosts_controller_spec.rb
View file @ 6652f967
......@@ -20,7 +20,7 @@ describe Projects::MattermostsController do
namespace_id: project.namespace.to_param,
project_id: project)
expect(response).to have_http_status(200)
expect(response).to have_gitlab_http_status(200)
end
end
......
spec/controllers/projects/merge_requests/conflicts_controller_spec.rb
View file @ 6652f967
......@@ -28,7 +28,7 @@ describe Projects::MergeRequests::ConflictsController do
end
it 'returns a 200 status code' do
expect(response).to have_http_status(:ok)
expect(response).to have_gitlab_http_status(:ok)
end
it 'returns JSON with a message' do
......@@ -116,7 +116,7 @@ describe Projects::MergeRequests::ConflictsController do
end
it 'returns a 404 status code' do
expect(response).to have_http_status(:not_found)
expect(response).to have_gitlab_http_status(:not_found)
end
end
......@@ -126,7 +126,7 @@ describe Projects::MergeRequests::ConflictsController do
end
it 'returns a 404 status code' do
expect(response).to have_http_status(:not_found)
expect(response).to have_gitlab_http_status(:not_found)
end
end
......@@ -138,7 +138,7 @@ describe Projects::MergeRequests::ConflictsController do
end
it 'returns a 200 status code' do
expect(response).to have_http_status(:ok)
expect(response).to have_gitlab_http_status(:ok)
end
it 'returns the file in JSON format' do
......@@ -198,7 +198,7 @@ describe Projects::MergeRequests::ConflictsController do
end
it 'returns an OK response' do
expect(response).to have_http_status(:ok)
expect(response).to have_gitlab_http_status(:ok)
end
end
......@@ -224,7 +224,7 @@ describe Projects::MergeRequests::ConflictsController do
end
it 'returns a 400 error' do
expect(response).to have_http_status(:bad_request)
expect(response).to have_gitlab_http_status(:bad_request)
end
it 'has a message with the name of the first missing section' do
......@@ -254,7 +254,7 @@ describe Projects::MergeRequests::ConflictsController do
end
it 'returns a 400 error' do
expect(response).to have_http_status(:bad_request)
expect(response).to have_gitlab_http_status(:bad_request)
end
it 'has a message with the name of the missing file' do
......@@ -292,7 +292,7 @@ describe Projects::MergeRequests::ConflictsController do
end
it 'returns a 400 error' do
expect(response).to have_http_status(:bad_request)
expect(response).to have_gitlab_http_status(:bad_request)
end
it 'has a message with the path of the problem file' do
......
spec/controllers/projects/merge_requests/creations_controller_spec.rb
View file @ 6652f967
......@@ -112,7 +112,7 @@ describe Projects::MergeRequests::CreationsController do
end
it 'returns a 404' do
expect(response).to have_http_status(404)
expect(response).to have_gitlab_http_status(404)
end
end
end
......
spec/controllers/projects/merge_requests/diffs_controller_spec.rb
View file @ 6652f967
......@@ -119,7 +119,7 @@ describe Projects::MergeRequests::DiffsController do
end
it 'returns a 404' do
expect(response).to have_http_status(404)
expect(response).to have_gitlab_http_status(404)
end
end
end
......@@ -131,7 +131,7 @@ describe Projects::MergeRequests::DiffsController do
end
it 'returns a 404' do
expect(response).to have_http_status(404)
expect(response).to have_gitlab_http_status(404)
end
end
end
......@@ -142,7 +142,7 @@ describe Projects::MergeRequests::DiffsController do
end
it 'returns a 404' do
expect(response).to have_http_status(404)
expect(response).to have_gitlab_http_status(404)
end
end
......@@ -155,7 +155,7 @@ describe Projects::MergeRequests::DiffsController do
end
it 'returns a 404' do
expect(response).to have_http_status(404)
expect(response).to have_gitlab_http_status(404)
end
end
end
......
spec/controllers/projects/merge_requests_controller_spec.rb
View file @ 6652f967
......@@ -143,7 +143,7 @@ describe Projects::MergeRequestsController do
get_merge_requests(last_page)
expect(assigns(:merge_requests).current_page).to eq(last_page)
expect(response).to have_http_status(200)
expect(response).to have_gitlab_http_status(200)
end
it 'does not redirect to external sites when provided a host field' do
......@@ -279,7 +279,7 @@ describe Projects::MergeRequestsController do
end
it 'returns 404' do
expect(response).to have_http_status(404)
expect(response).to have_gitlab_http_status(404)
end
end
......@@ -435,7 +435,7 @@ describe Projects::MergeRequestsController do
it "denies access to users unless they're admin or project owner" do
delete :destroy, namespace_id: project.namespace, project_id: project, id: merge_request.iid
expect(response).to have_http_status(404)
expect(response).to have_gitlab_http_status(404)
end
context "when the user is owner" do
......@@ -450,7 +450,7 @@ describe Projects::MergeRequestsController do
it "deletes the merge request" do
delete :destroy, namespace_id: project.namespace, project_id: project, id: merge_request.iid
expect(response).to have_http_status(302)
expect(response).to have_gitlab_http_status(302)
expect(controller).to set_flash[:notice].to(/The merge request was successfully deleted\./)
end
......@@ -540,7 +540,7 @@ describe Projects::MergeRequestsController do
subject
end
it { is_expected.to have_http_status(:success) }
it { is_expected.to have_gitlab_http_status(:success) }
it 'renders MergeRequest as JSON' do
subject
......@@ -637,7 +637,7 @@ describe Projects::MergeRequestsController do
end
it 'return a detailed head_pipeline status in json' do
expect(response).to have_http_status(:ok)
expect(response).to have_gitlab_http_status(:ok)
expect(json_response['text']).to eq status.text
expect(json_response['label']).to eq status.label
expect(json_response['icon']).to eq status.icon
......@@ -651,7 +651,7 @@ describe Projects::MergeRequestsController do
end
it 'return empty' do
expect(response).to have_http_status(:ok)
expect(response).to have_gitlab_http_status(:ok)
expect(json_response).to be_empty
end
end
......
spec/controllers/projects/milestones_controller_spec.rb
View file @ 6652f967
......@@ -27,7 +27,7 @@ describe Projects::MilestonesController do
it 'shows milestone page' do
view_milestone
expect(response).to have_http_status(200)
expect(response).to have_gitlab_http_status(200)
end
end
......
spec/controllers/projects/mirrors_controller_spec.rb
View file @ 6652f967
......@@ -191,14 +191,14 @@ describe Projects::MirrorsController do
it 'processes a successful update' do
do_put(project, { import_url: 'https://updated.example.com' }, format: :json)
expect(response).to have_http_status(200)
expect(response).to have_gitlab_http_status(200)
expect(json_response['import_url']).to eq('https://updated.example.com')
end
it 'processes an unsuccessful update' do
do_put(project, { import_url: 'ftp://invalid.invalid' }, format: :json)
expect(response).to have_http_status(422)
expect(response).to have_gitlab_http_status(422)
expect(json_response['import_url'].first).to match /valid URL/
end
......@@ -207,14 +207,14 @@ describe Projects::MirrorsController do
do_put(project, { import_data_attributes: { password: 'update' } }, format: :json)
expect(response).to have_http_status(200)
expect(response).to have_gitlab_http_status(200)
expect(project.import_data(true).id).to eq(import_data_id)
end
it 'sets ssh_known_hosts_verified_at and verified_by when the update sets known hosts' do
do_put(project, { import_data_attributes: { ssh_known_hosts: 'update' } }, format: :json)
expect(response).to have_http_status(200)
expect(response).to have_gitlab_http_status(200)
import_data = project.import_data(true)
expect(import_data.ssh_known_hosts_verified_at).to be_within(1.minute).of(Time.now)
......@@ -226,7 +226,7 @@ describe Projects::MirrorsController do
do_put(project, { import_data_attributes: { ssh_known_hosts: '' } }, format: :json)
expect(response).to have_http_status(200)
expect(response).to have_gitlab_http_status(200)
import_data = project.import_data(true)
expect(import_data.ssh_known_hosts_verified_at).to be_nil
......@@ -241,7 +241,7 @@ describe Projects::MirrorsController do
do_put(project, { mirror_user_id: other_user.id }, format: :json)
expect(response).to have_http_status(200)
expect(response).to have_gitlab_http_status(200)
expect(project.mirror_user(true)).to eq(mirror_user)
end
end
......@@ -278,7 +278,7 @@ describe Projects::MirrorsController do
it 'returns an error with a 400 response' do
do_get(project, url)
expect(response).to have_http_status(400)
expect(response).to have_gitlab_http_status(400)
expect(json_response).to eq('message' => 'Invalid URL')
end
end
......@@ -290,7 +290,7 @@ describe Projects::MirrorsController do
do_get(project)
expect(response).to have_http_status(204)
expect(response).to have_gitlab_http_status(204)
end
end
......@@ -300,7 +300,7 @@ describe Projects::MirrorsController do
do_get(project)
expect(response).to have_http_status(400)
expect(response).to have_gitlab_http_status(400)
expect(json_response).to eq('message' => 'An error')
end
end
......@@ -314,7 +314,7 @@ describe Projects::MirrorsController do
do_get(project)
expect(response).to have_http_status(200)
expect(response).to have_gitlab_http_status(200)
expect(json_response).to eq('known_hosts' => ssh_key, 'fingerprints' => [ssh_fp.stringify_keys], 'changes_project_import_data' => true)
end
end
......
spec/controllers/projects/notes_controller_spec.rb
View file @ 6652f967
......@@ -180,13 +180,13 @@ describe Projects::NotesController do
it "returns status 302 for html" do
post :create, request_params
expect(response).to have_http_status(302)
expect(response).to have_gitlab_http_status(302)
end
it "returns status 200 for json" do
post :create, request_params.merge(format: :json)
expect(response).to have_http_status(200)
expect(response).to have_gitlab_http_status(200)
end
context 'when merge_request_diff_head_sha present' do
......@@ -205,7 +205,7 @@ describe Projects::NotesController do
it "returns status 302 for html" do
post :create, request_params
expect(response).to have_http_status(302)
expect(response).to have_gitlab_http_status(302)
end
end
......@@ -240,7 +240,7 @@ describe Projects::NotesController do
it 'returns a 404' do
post_create(note_project_id: Project.maximum(:id).succ)
expect(response).to have_http_status(404)
expect(response).to have_gitlab_http_status(404)
end
end
......@@ -248,7 +248,7 @@ describe Projects::NotesController do
it 'returns a 404' do
post_create
expect(response).to have_http_status(404)
expect(response).to have_gitlab_http_status(404)
end
end
......@@ -278,7 +278,7 @@ describe Projects::NotesController do
request_params[:note][:noteable_id] = 9999
post :create, request_params.merge(format: :json)
expect(response).to have_http_status(404)
expect(response).to have_gitlab_http_status(404)
end
end
......@@ -286,13 +286,13 @@ describe Projects::NotesController do
it 'returns 302 status for html' do
post :create, request_params
expect(response).to have_http_status(302)
expect(response).to have_gitlab_http_status(302)
end
it 'returns 200 status for json' do
post :create, request_params.merge(format: :json)
expect(response).to have_http_status(200)
expect(response).to have_gitlab_http_status(200)
end
it 'creates a new note' do
......@@ -308,7 +308,7 @@ describe Projects::NotesController do
it 'returns 404 status' do
post :create, request_params
expect(response).to have_http_status(404)
expect(response).to have_gitlab_http_status(404)
end
it 'does not create a new note' do
......@@ -337,7 +337,7 @@ describe Projects::NotesController do
it "returns status 200 for html" do
delete :destroy, request_params
expect(response).to have_http_status(200)
expect(response).to have_gitlab_http_status(200)
end
it "deletes the note" do
......@@ -354,7 +354,7 @@ describe Projects::NotesController do
it "returns status 404" do
delete :destroy, request_params
expect(response).to have_http_status(404)
expect(response).to have_gitlab_http_status(404)
end
end
end
......@@ -370,7 +370,7 @@ describe Projects::NotesController do
post(:toggle_award_emoji, request_params.merge(name: "thumbsup"))
end.to change { note.award_emoji.count }.by(1)
expect(response).to have_http_status(200)
expect(response).to have_gitlab_http_status(200)
end
it "removes the already awarded emoji" do
......@@ -380,7 +380,7 @@ describe Projects::NotesController do
post(:toggle_award_emoji, request_params.merge(name: "thumbsup"))
end.to change { AwardEmoji.count }.by(-1)
expect(response).to have_http_status(200)
expect(response).to have_gitlab_http_status(200)
end
end
......@@ -398,7 +398,7 @@ describe Projects::NotesController do
it "returns status 404" do
post :resolve, request_params
expect(response).to have_http_status(404)
expect(response).to have_gitlab_http_status(404)
end
end
......@@ -415,7 +415,7 @@ describe Projects::NotesController do
it "returns status 404" do
post :resolve, request_params
expect(response).to have_http_status(404)
expect(response).to have_gitlab_http_status(404)
end
end
......@@ -442,7 +442,7 @@ describe Projects::NotesController do
it "returns status 200" do
post :resolve, request_params
expect(response).to have_http_status(200)
expect(response).to have_gitlab_http_status(200)
end
end
end
......@@ -459,7 +459,7 @@ describe Projects::NotesController do
it "returns status 404" do
delete :unresolve, request_params
expect(response).to have_http_status(404)
expect(response).to have_gitlab_http_status(404)
end
end
......@@ -476,7 +476,7 @@ describe Projects::NotesController do
it "returns status 404" do
delete :unresolve, request_params
expect(response).to have_http_status(404)
expect(response).to have_gitlab_http_status(404)
end
end
......@@ -490,7 +490,7 @@ describe Projects::NotesController do
it "returns status 200" do
delete :unresolve, request_params
expect(response).to have_http_status(200)
expect(response).to have_gitlab_http_status(200)
end
end
end
......
spec/controllers/projects/pages_controller_spec.rb
View file @ 6652f967
......@@ -21,7 +21,7 @@ describe Projects::PagesController do
it 'returns 200 status' do
get :show, request_params
expect(response).to have_http_status(200)
expect(response).to have_gitlab_http_status(200)
end
context 'when the project is in a subgroup' do
......@@ -31,7 +31,7 @@ describe Projects::PagesController do
it 'returns a 404 status code' do
get :show, request_params
expect(response).to have_http_status(404)
expect(response).to have_gitlab_http_status(404)
end
end
end
......@@ -40,7 +40,7 @@ describe Projects::PagesController do
it 'returns 302 status' do
delete :destroy, request_params
expect(response).to have_http_status(302)
expect(response).to have_gitlab_http_status(302)
end
end
......@@ -53,7 +53,7 @@ describe Projects::PagesController do
it 'returns 404 status' do
get :show, request_params
expect(response).to have_http_status(404)
expect(response).to have_gitlab_http_status(404)
end
end
......@@ -61,7 +61,7 @@ describe Projects::PagesController do
it 'returns 404 status' do
delete :destroy, request_params
expect(response).to have_http_status(404)
expect(response).to have_gitlab_http_status(404)
end
end
end
......
spec/controllers/projects/pages_domains_controller_spec.rb
View file @ 6652f967
......@@ -26,7 +26,7 @@ describe Projects::PagesDomainsController do
it "displays the 'show' page" do
get(:show, request_params.merge(id: pages_domain.domain))
expect(response).to have_http_status(200)
expect(response).to have_gitlab_http_status(200)
expect(response).to render_template('show')
end
end
......@@ -35,7 +35,7 @@ describe Projects::PagesDomainsController do
it "displays the 'new' page" do
get(:new, request_params)
expect(response).to have_http_status(200)
expect(response).to have_gitlab_http_status(200)
expect(response).to render_template('new')
end
end
......@@ -69,7 +69,7 @@ describe Projects::PagesDomainsController do
it 'returns 404 status' do
get(:show, request_params.merge(id: pages_domain.domain))
expect(response).to have_http_status(404)
expect(response).to have_gitlab_http_status(404)
end
end
......@@ -77,7 +77,7 @@ describe Projects::PagesDomainsController do
it 'returns 404 status' do
get :new, request_params
expect(response).to have_http_status(404)
expect(response).to have_gitlab_http_status(404)
end
end
......@@ -85,7 +85,7 @@ describe Projects::PagesDomainsController do
it "returns 404 status" do
post(:create, request_params.merge(pages_domain: pages_domain_params))
expect(response).to have_http_status(404)
expect(response).to have_gitlab_http_status(404)
end
end
......@@ -93,7 +93,7 @@ describe Projects::PagesDomainsController do
it "deletes the pages domain" do
delete(:destroy, request_params.merge(id: pages_domain.domain))
expect(response).to have_http_status(404)
expect(response).to have_gitlab_http_status(404)
end
end
end
......
spec/controllers/projects/pipeline_schedules_controller_spec.rb
View file @ 6652f967
......@@ -15,7 +15,7 @@ describe Projects::PipelineSchedulesController do
it 'renders the index view' do
visit_pipelines_schedules
expect(response).to have_http_status(:ok)
expect(response).to have_gitlab_http_status(:ok)
expect(response).to render_template(:index)
end
......@@ -35,7 +35,7 @@ describe Projects::PipelineSchedulesController do
end
it 'only shows active pipeline schedules' do
expect(response).to have_http_status(:ok)
expect(response).to have_gitlab_http_status(:ok)
expect(assigns(:schedules)).to include(pipeline_schedule)
expect(assigns(:schedules)).not_to include(inactive_pipeline_schedule)
end
......@@ -57,7 +57,7 @@ describe Projects::PipelineSchedulesController do
it 'initializes a pipeline schedule model' do
get :new, namespace_id: project.namespace.to_param, project_id: project
expect(response).to have_http_status(:ok)
expect(response).to have_gitlab_http_status(:ok)
expect(assigns(:schedule)).to be_a_new(Ci::PipelineSchedule)
end
end
......@@ -87,7 +87,7 @@ describe Projects::PipelineSchedulesController do
.to change { Ci::PipelineSchedule.count }.by(1)
.and change { Ci::PipelineScheduleVariable.count }.by(1)
expect(response).to have_http_status(:found)
expect(response).to have_gitlab_http_status(:found)
Ci::PipelineScheduleVariable.last.tap do |v|
expect(v.key).to eq("AAA")
......@@ -158,7 +158,7 @@ describe Projects::PipelineSchedulesController do
expect { go }.to change { Ci::PipelineScheduleVariable.count }.by(1)
pipeline_schedule.reload
expect(response).to have_http_status(:found)
expect(response).to have_gitlab_http_status(:found)
expect(pipeline_schedule.variables.last.key).to eq('AAA')
expect(pipeline_schedule.variables.last.value).to eq('AAA123')
end
......@@ -324,7 +324,7 @@ describe Projects::PipelineSchedulesController do
it 'loads the pipeline schedule' do
get :edit, namespace_id: project.namespace.to_param, project_id: project, id: pipeline_schedule.id
expect(response).to have_http_status(:ok)
expect(response).to have_gitlab_http_status(:ok)
expect(assigns(:schedule)).to eq(pipeline_schedule)
end
end
......@@ -376,7 +376,7 @@ describe Projects::PipelineSchedulesController do
end
it 'does not delete the pipeline schedule' do
expect(response).to have_http_status(:not_found)
expect(response).to have_gitlab_http_status(:not_found)
end
end
......@@ -391,7 +391,7 @@ describe Projects::PipelineSchedulesController do
delete :destroy, namespace_id: project.namespace.to_param, project_id: project, id: pipeline_schedule.id
end.to change { project.pipeline_schedules.count }.by(-1)
expect(response).to have_http_status(302)
expect(response).to have_gitlab_http_status(302)
end
end
end
......
spec/controllers/projects/pipelines_controller_spec.rb
View file @ 6652f967
......@@ -33,7 +33,7 @@ describe Projects::PipelinesController do
it 'returns JSON with serialized pipelines' do
subject
expect(response).to have_http_status(:ok)
expect(response).to have_gitlab_http_status(:ok)
expect(response).to match_response_schema('pipeline')
expect(json_response).to include('pipelines')
......@@ -57,7 +57,7 @@ describe Projects::PipelinesController do
it 'returns the pipeline' do
get_pipeline_json
expect(response).to have_http_status(:ok)
expect(response).to have_gitlab_http_status(:ok)
expect(json_response).not_to be_an(Array)
expect(json_response['id']).to be(pipeline.id)
expect(json_response['details']).to have_key 'stages'
......@@ -111,7 +111,7 @@ describe Projects::PipelinesController do
end
it 'returns html source for stage dropdown' do
expect(response).to have_http_status(:ok)
expect(response).to have_gitlab_http_status(:ok)
expect(response).to render_template('projects/pipelines/_stage')
expect(json_response).to include('html')
end
......@@ -123,7 +123,7 @@ describe Projects::PipelinesController do
end
it 'responds with not found' do
expect(response).to have_http_status(:not_found)
expect(response).to have_gitlab_http_status(:not_found)
end
end
......@@ -148,7 +148,7 @@ describe Projects::PipelinesController do
end
it 'return a detailed pipeline status in json' do
expect(response).to have_http_status(:ok)
expect(response).to have_gitlab_http_status(:ok)
expect(json_response['text']).to eq status.text
expect(json_response['label']).to eq status.label
expect(json_response['icon']).to eq status.icon
......@@ -171,14 +171,14 @@ describe Projects::PipelinesController do
let(:feature) { ProjectFeature::ENABLED }
it 'retries a pipeline without returning any content' do
expect(response).to have_http_status(:no_content)
expect(response).to have_gitlab_http_status(:no_content)
expect(build.reload).to be_retried
end
end
context 'when builds are disabled' do
it 'fails to retry pipeline' do
expect(response).to have_http_status(:not_found)
expect(response).to have_gitlab_http_status(:not_found)
end
end
end
......@@ -198,14 +198,14 @@ describe Projects::PipelinesController do
let(:feature) { ProjectFeature::ENABLED }
it 'cancels a pipeline without returning any content' do
expect(response).to have_http_status(:no_content)
expect(response).to have_gitlab_http_status(:no_content)
expect(pipeline.reload).to be_canceled
end
end
context 'when builds are disabled' do
it 'fails to retry pipeline' do
expect(response).to have_http_status(:not_found)
expect(response).to have_gitlab_http_status(:not_found)
end
end
end
......
spec/controllers/projects/pipelines_settings_controller_spec.rb
View file @ 6652f967
......@@ -25,7 +25,7 @@ describe Projects::PipelinesSettingsController do
let(:params) { { enabled: '', domain: 'mepmep.md' } }
it 'redirects to the settings page' do
expect(response).to have_http_status(302)
expect(response).to have_gitlab_http_status(302)
expect(flash[:notice]).to eq("Pipelines settings for '#{project.name}' were successfully updated.")
end
......
spec/controllers/projects/project_members_controller_spec.rb
View file @ 6652f967
......@@ -8,7 +8,7 @@ describe Projects::ProjectMembersController do
it 'should have the project_members address with a 200 status code' do
get :index, namespace_id: project.namespace, project_id: project
expect(response).to have_http_status(200)
expect(response).to have_gitlab_http_status(200)
end
end
......@@ -30,7 +30,7 @@ describe Projects::ProjectMembersController do
user_ids: project_user.id,
access_level: Gitlab::Access::GUEST
expect(response).to have_http_status(404)
expect(response).to have_gitlab_http_status(404)
expect(project.users).not_to include project_user
end
end
......@@ -79,7 +79,7 @@ describe Projects::ProjectMembersController do
project_id: project,
id: 42
expect(response).to have_http_status(404)
expect(response).to have_gitlab_http_status(404)
end
end
......@@ -94,7 +94,7 @@ describe Projects::ProjectMembersController do
project_id: project,
id: member
expect(response).to have_http_status(404)
expect(response).to have_gitlab_http_status(404)
expect(project.members).to include member
end
end
......@@ -137,7 +137,7 @@ describe Projects::ProjectMembersController do
delete :leave, namespace_id: project.namespace,
project_id: project
expect(response).to have_http_status(404)
expect(response).to have_gitlab_http_status(404)
end
end
......@@ -168,7 +168,7 @@ describe Projects::ProjectMembersController do
delete :leave, namespace_id: project.namespace,
project_id: project
expect(response).to have_http_status(403)
expect(response).to have_gitlab_http_status(403)
end
end
......@@ -221,7 +221,7 @@ describe Projects::ProjectMembersController do
project_id: project,
id: 42
expect(response).to have_http_status(404)
expect(response).to have_gitlab_http_status(404)
end
end
......@@ -236,7 +236,7 @@ describe Projects::ProjectMembersController do
project_id: project,
id: member
expect(response).to have_http_status(404)
expect(response).to have_gitlab_http_status(404)
expect(project.members).not_to include member
end
end
......
spec/controllers/projects/prometheus_controller_spec.rb
View file @ 6652f967
......@@ -24,7 +24,7 @@ describe Projects::PrometheusController do
it 'returns no content response' do
get :active_metrics, project_params(format: :json)
expect(response).to have_http_status(204)
expect(response).to have_gitlab_http_status(204)
end
end
......@@ -38,7 +38,7 @@ describe Projects::PrometheusController do
it 'returns no content response' do
get :active_metrics, project_params(format: :json)
expect(response).to have_http_status(200)
expect(response).to have_gitlab_http_status(200)
expect(json_response).to eq(sample_response.deep_stringify_keys)
end
end
......@@ -47,7 +47,7 @@ describe Projects::PrometheusController do
it 'returns not found response' do
get :active_metrics, project_params
expect(response).to have_http_status(404)
expect(response).to have_gitlab_http_status(404)
end
end
end
......
spec/controllers/projects/push_rules_controller_spec.rb
View file @ 6652f967
......@@ -18,7 +18,7 @@ describe Projects::PushRulesController do
it 'updates the push rule' do
do_update
expect(response).to have_http_status(302)
expect(response).to have_gitlab_http_status(302)
expect(project.push_rule(true).prevent_secrets).to be_truthy
end
......@@ -30,7 +30,7 @@ describe Projects::PushRulesController do
it 'returns 404' do
do_update
expect(response).to have_http_status(404)
expect(response).to have_gitlab_http_status(404)
end
end
......
spec/controllers/projects/raw_controller_spec.rb
View file @ 6652f967
......@@ -10,7 +10,7 @@ describe Projects::RawController do
it 'delivers ASCII file' do
get_show(public_project, id)
expect(response).to have_http_status(200)
expect(response).to have_gitlab_http_status(200)
expect(response.header['Content-Type']).to eq('text/plain; charset=utf-8')
expect(response.header['Content-Disposition'])
.to eq('inline')
......@@ -24,7 +24,7 @@ describe Projects::RawController do
it 'sets image content type header' do
get_show(public_project, id)
expect(response).to have_http_status(200)
expect(response).to have_gitlab_http_status(200)
expect(response.header['Content-Type']).to eq('image/jpeg')
expect(response.header[Gitlab::Workhorse::SEND_DATA_HEADER]).to start_with('git-blob:')
end
......@@ -50,7 +50,7 @@ describe Projects::RawController do
expect(controller).to receive(:send_file).with("#{Gitlab.config.shared.path}/lfs-objects/91/ef/f75a492a3ed0dfcb544d7f31326bc4014c8551849c192fd1e48d4dd2c897", filename: 'lfs_object.iso', disposition: 'attachment')
get_show(public_project, id)
expect(response).to have_http_status(200)
expect(response).to have_gitlab_http_status(200)
end
context 'and lfs uses object storage' do
......@@ -83,7 +83,7 @@ describe Projects::RawController do
it 'does not serve the file' do
get_show(public_project, id)
expect(response).to have_http_status(404)
expect(response).to have_gitlab_http_status(404)
end
end
end
......@@ -96,7 +96,7 @@ describe Projects::RawController do
it 'delivers ASCII file' do
get_show(public_project, id)
expect(response).to have_http_status(200)
expect(response).to have_gitlab_http_status(200)
expect(response.header['Content-Type']).to eq('text/plain; charset=utf-8')
expect(response.header['Content-Disposition'])
.to eq('inline')
......
spec/controllers/projects/registry/repositories_controller_spec.rb
View file @ 6652f967
......@@ -35,7 +35,7 @@ describe Projects::Registry::RepositoriesController do
it 'successfully renders container repositories' do
go_to_index
expect(response).to have_http_status(:ok)
expect(response).to have_gitlab_http_status(:ok)
end
it 'creates a root container repository' do
......@@ -46,7 +46,7 @@ describe Projects::Registry::RepositoriesController do
it 'json has a list of projects' do
go_to_index(format: :json)
expect(response).to have_http_status(:ok)
expect(response).to have_gitlab_http_status(:ok)
expect(response).to match_response_schema('registry/repositories')
end
end
......@@ -59,7 +59,7 @@ describe Projects::Registry::RepositoriesController do
it 'successfully renders container repositories' do
go_to_index
expect(response).to have_http_status(:ok)
expect(response).to have_gitlab_http_status(:ok)
end
it 'does not ensure root container repository' do
......@@ -69,7 +69,7 @@ describe Projects::Registry::RepositoriesController do
it 'responds with json if asked' do
go_to_index(format: :json)
expect(response).to have_http_status(:ok)
expect(response).to have_gitlab_http_status(:ok)
expect(json_response).to be_kind_of(Array)
end
end
......@@ -89,7 +89,7 @@ describe Projects::Registry::RepositoriesController do
it 'deletes a repository' do
expect { delete_repository(repository) }.to change { ContainerRepository.all.count }.by(-1)
expect(response).to have_http_status(:no_content)
expect(response).to have_gitlab_http_status(:no_content)
end
end
end
......@@ -100,7 +100,7 @@ describe Projects::Registry::RepositoriesController do
it 'responds with 404' do
go_to_index
expect(response).to have_http_status(:not_found)
expect(response).to have_gitlab_http_status(:not_found)
end
it 'does not ensure root container repository' do
......
spec/controllers/projects/registry/tags_controller_spec.rb
View file @ 6652f967
......@@ -30,7 +30,7 @@ describe Projects::Registry::TagsController do
it 'receive a list of tags' do
get_tags
expect(response).to have_http_status(:ok)
expect(response).to have_gitlab_http_status(:ok)
expect(response).to match_response_schema('registry/tags')
expect(response).to include_pagination_headers
end
......@@ -44,7 +44,7 @@ describe Projects::Registry::TagsController do
it 'receive a list of tags' do
get_tags
expect(response).to have_http_status(:ok)
expect(response).to have_gitlab_http_status(:ok)
expect(response).to match_response_schema('registry/tags')
expect(response).to include_pagination_headers
end
......@@ -58,7 +58,7 @@ describe Projects::Registry::TagsController do
it 'does not receive a list of tags' do
get_tags
expect(response).to have_http_status(:not_found)
expect(response).to have_gitlab_http_status(:not_found)
end
end
......
spec/controllers/projects/repositories_controller_spec.rb
View file @ 6652f967
......@@ -35,7 +35,7 @@ describe Projects::RepositoriesController do
it "renders Not Found" do
get :archive, namespace_id: project.namespace, project_id: project, ref: "master", format: "zip"
expect(response).to have_http_status(404)
expect(response).to have_gitlab_http_status(404)
end
end
end
......
spec/controllers/projects/runners_controller_spec.rb
View file @ 6652f967
......@@ -29,7 +29,7 @@ describe Projects::RunnersController do
runner.reload
expect(response).to have_http_status(302)
expect(response).to have_gitlab_http_status(302)
expect(runner.description).to eq(new_desc)
end
end
......@@ -38,7 +38,7 @@ describe Projects::RunnersController do
it 'destroys the runner' do
delete :destroy, params
expect(response).to have_http_status(302)
expect(response).to have_gitlab_http_status(302)
expect(Ci::Runner.find_by(id: runner.id)).to be_nil
end
end
......@@ -53,7 +53,7 @@ describe Projects::RunnersController do
runner.reload
expect(response).to have_http_status(302)
expect(response).to have_gitlab_http_status(302)
expect(runner.active).to eq(true)
end
end
......@@ -68,7 +68,7 @@ describe Projects::RunnersController do
runner.reload
expect(response).to have_http_status(302)
expect(response).to have_gitlab_http_status(302)
expect(runner.active).to eq(false)
end
end
......
spec/controllers/projects/services_controller_spec.rb
View file @ 6652f967
......@@ -19,7 +19,7 @@ describe Projects::ServicesController do
put :test, namespace_id: project.namespace, project_id: project, id: service.to_param
expect(response).to have_http_status(404)
expect(response).to have_gitlab_http_status(404)
end
end
......
spec/controllers/projects/settings/ci_cd_controller_spec.rb
View file @ 6652f967
......@@ -13,7 +13,7 @@ describe Projects::Settings::CiCdController do
it 'renders show with 200 status code' do
get :show, namespace_id: project.namespace, project_id: project
expect(response).to have_http_status(200)
expect(response).to have_gitlab_http_status(200)
expect(response).to render_template(:show)
end
end
......
spec/controllers/projects/settings/integrations_controller_spec.rb
View file @ 6652f967
......@@ -13,7 +13,7 @@ describe Projects::Settings::IntegrationsController do
it 'renders show with 200 status code' do
get :show, namespace_id: project.namespace, project_id: project
expect(response).to have_http_status(200)
expect(response).to have_gitlab_http_status(200)
expect(response).to render_template(:show)
end
end
......
spec/controllers/projects/settings/repository_controller_spec.rb
View file @ 6652f967
......@@ -13,7 +13,7 @@ describe Projects::Settings::RepositoryController do
it 'renders show with 200 status code' do
get :show, namespace_id: project.namespace, project_id: project
expect(response).to have_http_status(200)
expect(response).to have_gitlab_http_status(200)
expect(response).to render_template(:show)
end
end
......
spec/controllers/projects/settings/slacks_controller_spec.rb
View file @ 6652f967
......@@ -29,7 +29,7 @@ describe Projects::Settings::SlacksController do
get :slack_auth, namespace_id: project.namespace, project_id: project
expect(response).to have_http_status(302)
expect(response).to have_gitlab_http_status(302)
expect(response).to redirect_to(redirect_url(project))
expect(flash[:alert]).to be_nil
end
......@@ -39,7 +39,7 @@ describe Projects::Settings::SlacksController do
get :slack_auth, namespace_id: project.namespace, project_id: project
expect(response).to have_http_status(302)
expect(response).to have_gitlab_http_status(302)
expect(response).to redirect_to(redirect_url(project))
expect(flash[:alert]).to eq('error')
end
......
spec/controllers/projects/snippets_controller_spec.rb
View file @ 6652f967
......@@ -29,7 +29,7 @@ describe Projects::SnippetsController do
project_id: project, page: last_page.to_param
expect(assigns(:snippets).current_page).to eq(last_page)
expect(response).to have_http_status(200)
expect(response).to have_gitlab_http_status(200)
end
end
......@@ -41,7 +41,7 @@ describe Projects::SnippetsController do
get :index, namespace_id: project.namespace, project_id: project
expect(assigns(:snippets)).not_to include(project_snippet)
expect(response).to have_http_status(200)
expect(response).to have_gitlab_http_status(200)
end
end
......@@ -54,7 +54,7 @@ describe Projects::SnippetsController do
get :index, namespace_id: project.namespace, project_id: project
expect(assigns(:snippets)).to include(project_snippet)
expect(response).to have_http_status(200)
expect(response).to have_gitlab_http_status(200)
end
end
......@@ -67,7 +67,7 @@ describe Projects::SnippetsController do
get :index, namespace_id: project.namespace, project_id: project
expect(assigns(:snippets)).to include(project_snippet)
expect(response).to have_http_status(200)
expect(response).to have_gitlab_http_status(200)
end
end
end
......@@ -316,7 +316,7 @@ describe Projects::SnippetsController do
it 'responds with status 404' do
get action, namespace_id: project.namespace, project_id: project, id: project_snippet.to_param
expect(response).to have_http_status(404)
expect(response).to have_gitlab_http_status(404)
end
end
......@@ -329,7 +329,7 @@ describe Projects::SnippetsController do
get action, namespace_id: project.namespace, project_id: project, id: project_snippet.to_param
expect(assigns(:snippet)).to eq(project_snippet)
expect(response).to have_http_status(200)
expect(response).to have_gitlab_http_status(200)
end
end
......@@ -342,7 +342,7 @@ describe Projects::SnippetsController do
get action, namespace_id: project.namespace, project_id: project, id: project_snippet.to_param
expect(assigns(:snippet)).to eq(project_snippet)
expect(response).to have_http_status(200)
expect(response).to have_gitlab_http_status(200)
end
end
end
......@@ -352,7 +352,7 @@ describe Projects::SnippetsController do
it 'responds with status 404' do
get action, namespace_id: project.namespace, project_id: project, id: 42
expect(response).to have_http_status(404)
expect(response).to have_gitlab_http_status(404)
end
end
......@@ -364,7 +364,7 @@ describe Projects::SnippetsController do
it 'responds with status 404' do
get action, namespace_id: project.namespace, project_id: project, id: 42
expect(response).to have_http_status(404)
expect(response).to have_gitlab_http_status(404)
end
end
end
......
spec/controllers/projects/todos_controller_spec.rb
View file @ 6652f967
......@@ -28,13 +28,13 @@ describe Projects::TodosController do
go
end.to change { user.todos.count }.by(1)
expect(response).to have_http_status(200)
expect(response).to have_gitlab_http_status(200)
end
it 'returns todo path and pending count' do
go
expect(response).to have_http_status(200)
expect(response).to have_gitlab_http_status(200)
expect(json_response['count']).to eq 1
expect(json_response['delete_path']).to match(/\/dashboard\/todos\/\d{1}/)
end
......@@ -47,7 +47,7 @@ describe Projects::TodosController do
go
end.to change { user.todos.count }.by(0)
expect(response).to have_http_status(404)
expect(response).to have_gitlab_http_status(404)
end
it 'does not create todo for issue when user not logged in' do
......@@ -55,7 +55,7 @@ describe Projects::TodosController do
go
end.to change { user.todos.count }.by(0)
expect(response).to have_http_status(302)
expect(response).to have_gitlab_http_status(302)
end
end
......@@ -68,7 +68,7 @@ describe Projects::TodosController do
it "doesn't create todo" do
expect { go }.not_to change { user.todos.count }
expect(response).to have_http_status(404)
expect(response).to have_gitlab_http_status(404)
end
end
end
......@@ -96,13 +96,13 @@ describe Projects::TodosController do
go
end.to change { user.todos.count }.by(1)
expect(response).to have_http_status(200)
expect(response).to have_gitlab_http_status(200)
end
it 'returns todo path and pending count' do
go
expect(response).to have_http_status(200)
expect(response).to have_gitlab_http_status(200)
expect(json_response['count']).to eq 1
expect(json_response['delete_path']).to match(/\/dashboard\/todos\/\d{1}/)
end
......@@ -115,7 +115,7 @@ describe Projects::TodosController do
go
end.to change { user.todos.count }.by(0)
expect(response).to have_http_status(404)
expect(response).to have_gitlab_http_status(404)
end
it 'does not create todo for merge request user has no access to' do
......@@ -123,7 +123,7 @@ describe Projects::TodosController do
go
end.to change { user.todos.count }.by(0)
expect(response).to have_http_status(302)
expect(response).to have_gitlab_http_status(302)
end
end
......@@ -136,7 +136,7 @@ describe Projects::TodosController do
it "doesn't create todo" do
expect { go }.not_to change { user.todos.count }
expect(response).to have_http_status(404)
expect(response).to have_gitlab_http_status(404)
end
end
end
......
spec/controllers/projects/tree_controller_spec.rb
View file @ 6652f967
......@@ -64,7 +64,7 @@ describe Projects::TreeController do
context "valid SHA commit ID with path" do
let(:id) { '6d39438/.gitignore' }
it { expect(response).to have_http_status(302) }
it { expect(response).to have_gitlab_http_status(302) }
end
end
......
spec/controllers/projects/uploads_controller_spec.rb
View file @ 6652f967
......@@ -18,7 +18,7 @@ describe Projects::UploadsController do
namespace_id: project.namespace.to_param,
project_id: project,
format: :json
expect(response).to have_http_status(422)
expect(response).to have_gitlab_http_status(422)
end
end
......@@ -90,7 +90,7 @@ describe Projects::UploadsController do
it "responds with status 200" do
go
expect(response).to have_http_status(200)
expect(response).to have_gitlab_http_status(200)
end
end
......@@ -98,7 +98,7 @@ describe Projects::UploadsController do
it "responds with status 404" do
go
expect(response).to have_http_status(404)
expect(response).to have_gitlab_http_status(404)
end
end
end
......@@ -117,7 +117,7 @@ describe Projects::UploadsController do
it "responds with status 200" do
go
expect(response).to have_http_status(200)
expect(response).to have_gitlab_http_status(200)
end
end
......@@ -125,7 +125,7 @@ describe Projects::UploadsController do
it "responds with status 404" do
go
expect(response).to have_http_status(404)
expect(response).to have_gitlab_http_status(404)
end
end
end
......@@ -151,7 +151,7 @@ describe Projects::UploadsController do
it "responds with status 200" do
go
expect(response).to have_http_status(200)
expect(response).to have_gitlab_http_status(200)
end
end
......@@ -192,7 +192,7 @@ describe Projects::UploadsController do
it "responds with status 200" do
go
expect(response).to have_http_status(200)
expect(response).to have_gitlab_http_status(200)
end
end
......@@ -200,7 +200,7 @@ describe Projects::UploadsController do
it "responds with status 404" do
go
expect(response).to have_http_status(404)
expect(response).to have_gitlab_http_status(404)
end
end
end
......@@ -220,7 +220,7 @@ describe Projects::UploadsController do
it "responds with status 200" do
go
expect(response).to have_http_status(200)
expect(response).to have_gitlab_http_status(200)
end
end
......@@ -228,7 +228,7 @@ describe Projects::UploadsController do
it "responds with status 404" do
go
expect(response).to have_http_status(404)
expect(response).to have_gitlab_http_status(404)
end
end
end
......@@ -237,7 +237,7 @@ describe Projects::UploadsController do
it "responds with status 404" do
go
expect(response).to have_http_status(404)
expect(response).to have_gitlab_http_status(404)
end
end
end
......
spec/controllers/projects/variables_controller_spec.rb
View file @ 6652f967
......@@ -50,7 +50,7 @@ describe Projects::VariablesController do
post :update, namespace_id: project.namespace.to_param, project_id: project,
id: variable.id, variable: { key: '?', value: variable.value }
expect(response).to have_http_status(200)
expect(response).to have_gitlab_http_status(200)
expect(response).to render_template :show
end
end
......
spec/controllers/projects_controller_spec.rb
View file @ 6652f967
......@@ -24,7 +24,7 @@ describe ProjectsController do
get :new, namespace_id: group.id
expect(response).to have_http_status(200)
expect(response).to have_gitlab_http_status(200)
expect(response).to render_template('new')
end
end
......@@ -33,7 +33,7 @@ describe ProjectsController do
it 'responds with status 404' do
get :new, namespace_id: group.id
expect(response).to have_http_status(404)
expect(response).to have_gitlab_http_status(404)
expect(response).not_to render_template('new')
end
end
......@@ -152,7 +152,7 @@ describe ProjectsController do
it 'renders a 503' do
get :show, namespace_id: project.namespace, id: project
expect(response).to have_http_status(503)
expect(response).to have_gitlab_http_status(503)
end
end
......@@ -272,7 +272,7 @@ describe ProjectsController do
get :show, namespace_id: project.namespace, id: project, format: :git
expect(response).to have_http_status(302)
expect(response).to have_gitlab_http_status(302)
expect(response).to redirect_to(namespace_project_path)
end
end
......@@ -295,7 +295,7 @@ describe ProjectsController do
expect(project.path).to include 'renamed_path'
expect(assigns(:repository).path).to include project.path
expect(response).to have_http_status(302)
expect(response).to have_gitlab_http_status(302)
end
end
......@@ -311,7 +311,7 @@ describe ProjectsController do
.not_to change { project.reload.path }
expect(controller).to set_flash[:alert].to(/container registry tags/)
expect(response).to have_http_status(200)
expect(response).to have_gitlab_http_status(200)
end
end
......@@ -327,7 +327,7 @@ describe ProjectsController do
id: project.id,
project: params
expect(response).to have_http_status(302)
expect(response).to have_gitlab_http_status(302)
params.each do |param, value|
expect(project.public_send(param)).to eq(value)
end
......@@ -360,7 +360,7 @@ describe ProjectsController do
project.reload
expect(project.namespace).to eq(new_namespace)
expect(response).to have_http_status(200)
expect(response).to have_gitlab_http_status(200)
end
context 'when new namespace is empty' do
......@@ -379,7 +379,7 @@ describe ProjectsController do
project.reload
expect(project.namespace).to eq(old_namespace)
expect(response).to have_http_status(200)
expect(response).to have_gitlab_http_status(200)
expect(flash[:alert]).to eq 'Please select a new namespace for your project.'
end
end
......@@ -396,7 +396,7 @@ describe ProjectsController do
delete :destroy, namespace_id: project.namespace, id: project
expect { Project.find(orig_id) }.to raise_error(ActiveRecord::RecordNotFound)
expect(response).to have_http_status(302)
expect(response).to have_gitlab_http_status(302)
expect(response).to redirect_to(dashboard_projects_path)
end
......@@ -435,7 +435,7 @@ describe ProjectsController do
end
it 'has http status 200' do
expect(response).to have_http_status(200)
expect(response).to have_gitlab_http_status(200)
end
it 'changes the user incoming email token' do
......@@ -511,7 +511,7 @@ describe ProjectsController do
delete(:remove_fork,
namespace_id: project.namespace,
id: project, format: :js)
expect(response).to have_http_status(401)
expect(response).to have_gitlab_http_status(401)
end
end
......@@ -545,7 +545,7 @@ describe ProjectsController do
namespace_id: project.namespace.path,
id: project.path
expect(response).to have_http_status(404)
expect(response).to have_gitlab_http_status(404)
end
it 'allows an admin user to access the page' do
......@@ -555,7 +555,7 @@ describe ProjectsController do
namespace_id: project.namespace.path,
id: project.path
expect(response).to have_http_status(200)
expect(response).to have_gitlab_http_status(200)
end
end
......@@ -581,7 +581,7 @@ describe ProjectsController do
get :show, namespace_id: public_project.namespace, id: public_project
expect(assigns(:project)).to eq(public_project)
expect(response).to have_http_status(200)
expect(response).to have_gitlab_http_status(200)
end
end
......@@ -620,13 +620,13 @@ describe ProjectsController do
it 'does not 404' do
post :toggle_star, namespace_id: public_project.namespace, id: public_project.path.upcase
expect(response).not_to have_http_status(404)
expect(response).not_to have_gitlab_http_status(404)
end
it 'does not redirect to the correct casing' do
post :toggle_star, namespace_id: public_project.namespace, id: public_project.path.upcase
expect(response).not_to have_http_status(301)
expect(response).not_to have_gitlab_http_status(301)
end
end
......@@ -636,7 +636,7 @@ describe ProjectsController do
it 'returns not found' do
post :toggle_star, namespace_id: 'foo', id: 'bar'
expect(response).to have_http_status(404)
expect(response).to have_gitlab_http_status(404)
end
end
end
......@@ -650,13 +650,13 @@ describe ProjectsController do
it 'does not 404' do
delete :destroy, namespace_id: project.namespace, id: project.path.upcase
expect(response).not_to have_http_status(404)
expect(response).not_to have_gitlab_http_status(404)
end
it 'does not redirect to the correct casing' do
delete :destroy, namespace_id: project.namespace, id: project.path.upcase
expect(response).not_to have_http_status(301)
expect(response).not_to have_gitlab_http_status(301)
end
end
......@@ -666,7 +666,7 @@ describe ProjectsController do
it 'returns not found' do
delete :destroy, namespace_id: 'foo', id: 'bar'
expect(response).to have_http_status(404)
expect(response).to have_gitlab_http_status(404)
end
end
end
......@@ -683,7 +683,7 @@ describe ProjectsController do
it 'returns 302' do
get :export, namespace_id: project.namespace, id: project
expect(response).to have_http_status(302)
expect(response).to have_gitlab_http_status(302)
end
end
......@@ -695,7 +695,7 @@ describe ProjectsController do
it 'returns 404' do
get :export, namespace_id: project.namespace, id: project
expect(response).to have_http_status(404)
expect(response).to have_gitlab_http_status(404)
end
end
end
......@@ -711,7 +711,7 @@ describe ProjectsController do
it 'returns 302' do
get :download_export, namespace_id: project.namespace, id: project
expect(response).to have_http_status(302)
expect(response).to have_gitlab_http_status(302)
end
end
......@@ -723,7 +723,7 @@ describe ProjectsController do
it 'returns 404' do
get :download_export, namespace_id: project.namespace, id: project
expect(response).to have_http_status(404)
expect(response).to have_gitlab_http_status(404)
end
end
end
......@@ -739,7 +739,7 @@ describe ProjectsController do
it 'returns 302' do
post :remove_export, namespace_id: project.namespace, id: project
expect(response).to have_http_status(302)
expect(response).to have_gitlab_http_status(302)
end
end
......@@ -751,7 +751,7 @@ describe ProjectsController do
it 'returns 404' do
post :remove_export, namespace_id: project.namespace, id: project
expect(response).to have_http_status(404)
expect(response).to have_gitlab_http_status(404)
end
end
end
......@@ -767,7 +767,7 @@ describe ProjectsController do
it 'returns 302' do
post :generate_new_export, namespace_id: project.namespace, id: project
expect(response).to have_http_status(302)
expect(response).to have_gitlab_http_status(302)
end
end
......@@ -779,7 +779,7 @@ describe ProjectsController do
it 'returns 404' do
post :generate_new_export, namespace_id: project.namespace, id: project
expect(response).to have_http_status(404)
expect(response).to have_gitlab_http_status(404)
end
end
end
......
spec/controllers/sent_notifications_controller_spec.rb
View file @ 6652f967
......@@ -69,7 +69,7 @@ describe SentNotificationsController do
end
it 'returns a 404' do
expect(response).to have_http_status(:not_found)
expect(response).to have_gitlab_http_status(:not_found)
end
end
......
spec/controllers/sessions_controller_spec.rb
View file @ 6652f967
......@@ -19,7 +19,7 @@ describe SessionsController do
it 'redirects to :omniauth_authorize_path' do
get(:new)
expect(response).to have_http_status(302)
expect(response).to have_gitlab_http_status(302)
expect(response).to redirect_to('/saml')
end
end
......@@ -28,7 +28,7 @@ describe SessionsController do
it 'responds with 200' do
get(:new, auto_sign_in: 'false')
expect(response).to have_http_status(200)
expect(response).to have_gitlab_http_status(200)
end
end
end
......
spec/controllers/snippets/notes_controller_spec.rb
View file @ 6652f967
......@@ -20,7 +20,7 @@ describe Snippets::NotesController do
end
it "returns status 200" do
expect(response).to have_http_status(200)
expect(response).to have_gitlab_http_status(200)
end
it "returns not empty array of notes" do
......@@ -37,7 +37,7 @@ describe Snippets::NotesController do
it "returns status 404" do
get :index, { snippet_id: internal_snippet }
expect(response).to have_http_status(404)
expect(response).to have_gitlab_http_status(404)
end
end
......@@ -49,7 +49,7 @@ describe Snippets::NotesController do
it "returns status 200" do
get :index, { snippet_id: internal_snippet }
expect(response).to have_http_status(200)
expect(response).to have_gitlab_http_status(200)
end
end
end
......@@ -63,7 +63,7 @@ describe Snippets::NotesController do
it "returns status 404" do
get :index, { snippet_id: private_snippet }
expect(response).to have_http_status(404)
expect(response).to have_gitlab_http_status(404)
end
end
......@@ -75,7 +75,7 @@ describe Snippets::NotesController do
it "returns status 404" do
get :index, { snippet_id: private_snippet }
expect(response).to have_http_status(404)
expect(response).to have_gitlab_http_status(404)
end
end
......@@ -89,7 +89,7 @@ describe Snippets::NotesController do
it "returns status 200" do
get :index, { snippet_id: private_snippet }
expect(response).to have_http_status(200)
expect(response).to have_gitlab_http_status(200)
end
it "returns 1 note" do
......@@ -134,7 +134,7 @@ describe Snippets::NotesController do
it "returns status 200" do
delete :destroy, request_params
expect(response).to have_http_status(200)
expect(response).to have_gitlab_http_status(200)
end
it "deletes the note" do
......@@ -162,7 +162,7 @@ describe Snippets::NotesController do
it "returns status 404" do
delete :destroy, request_params
expect(response).to have_http_status(404)
expect(response).to have_gitlab_http_status(404)
end
it "does not update the note" do
......@@ -182,7 +182,7 @@ describe Snippets::NotesController do
it "toggles the award emoji" do
expect { subject }.to change { note.award_emoji.count }.by(1)
expect(response).to have_http_status(200)
expect(response).to have_gitlab_http_status(200)
end
it "removes the already awarded emoji when it exists" do
......@@ -190,7 +190,7 @@ describe Snippets::NotesController do
expect { subject }.to change { AwardEmoji.count }.by(-1)
expect(response).to have_http_status(200)
expect(response).to have_gitlab_http_status(200)
end
end
end
spec/controllers/snippets_controller_spec.rb
View file @ 6652f967
......@@ -40,7 +40,7 @@ describe SnippetsController do
it 'responds with status 200' do
get :new
expect(response).to have_http_status(200)
expect(response).to have_gitlab_http_status(200)
end
end
......@@ -69,7 +69,7 @@ describe SnippetsController do
it 'responds with status 404' do
get :show, id: other_personal_snippet.to_param
expect(response).to have_http_status(404)
expect(response).to have_gitlab_http_status(404)
end
end
......@@ -78,7 +78,7 @@ describe SnippetsController do
get :show, id: personal_snippet.to_param
expect(assigns(:snippet)).to eq(personal_snippet)
expect(response).to have_http_status(200)
expect(response).to have_gitlab_http_status(200)
end
end
end
......@@ -104,7 +104,7 @@ describe SnippetsController do
get :show, id: personal_snippet.to_param
expect(assigns(:snippet)).to eq(personal_snippet)
expect(response).to have_http_status(200)
expect(response).to have_gitlab_http_status(200)
end
end
......@@ -129,7 +129,7 @@ describe SnippetsController do
get :show, id: personal_snippet.to_param
expect(assigns(:snippet)).to eq(personal_snippet)
expect(response).to have_http_status(200)
expect(response).to have_gitlab_http_status(200)
end
end
......@@ -138,7 +138,7 @@ describe SnippetsController do
get :show, id: personal_snippet.to_param
expect(assigns(:snippet)).to eq(personal_snippet)
expect(response).to have_http_status(200)
expect(response).to have_gitlab_http_status(200)
end
end
end
......@@ -152,7 +152,7 @@ describe SnippetsController do
it 'responds with status 404' do
get :show, id: 'doesntexist'
expect(response).to have_http_status(404)
expect(response).to have_gitlab_http_status(404)
end
end
......@@ -432,7 +432,7 @@ describe SnippetsController do
it 'responds with status 404' do
get :raw, id: other_personal_snippet.to_param
expect(response).to have_http_status(404)
expect(response).to have_gitlab_http_status(404)
end
end
......@@ -443,7 +443,7 @@ describe SnippetsController do
it 'responds with status 200' do
expect(assigns(:snippet)).to eq(personal_snippet)
expect(response).to have_http_status(200)
expect(response).to have_gitlab_http_status(200)
end
it 'has expected headers' do
......@@ -475,7 +475,7 @@ describe SnippetsController do
get :raw, id: personal_snippet.to_param
expect(assigns(:snippet)).to eq(personal_snippet)
expect(response).to have_http_status(200)
expect(response).to have_gitlab_http_status(200)
end
end
......@@ -500,7 +500,7 @@ describe SnippetsController do
get :raw, id: personal_snippet.to_param
expect(assigns(:snippet)).to eq(personal_snippet)
expect(response).to have_http_status(200)
expect(response).to have_gitlab_http_status(200)
end
context 'CRLF line ending' do
......@@ -527,7 +527,7 @@ describe SnippetsController do
get :raw, id: personal_snippet.to_param
expect(assigns(:snippet)).to eq(personal_snippet)
expect(response).to have_http_status(200)
expect(response).to have_gitlab_http_status(200)
end
end
end
......@@ -541,7 +541,7 @@ describe SnippetsController do
it 'responds with status 404' do
get :raw, id: 'doesntexist'
expect(response).to have_http_status(404)
expect(response).to have_gitlab_http_status(404)
end
end
......
spec/controllers/uploads_controller_spec.rb
View file @ 6652f967
......@@ -18,7 +18,7 @@ describe UploadsController do
it "returns 401 when the user is not logged in" do
post :create, model: model, id: snippet.id, format: :json
expect(response).to have_http_status(401)
expect(response).to have_gitlab_http_status(401)
end
it "returns 404 when user can't comment on a snippet" do
......@@ -27,7 +27,7 @@ describe UploadsController do
sign_in(user)
post :create, model: model, id: private_snippet.id, format: :json
expect(response).to have_http_status(404)
expect(response).to have_gitlab_http_status(404)
end
end
......@@ -39,7 +39,7 @@ describe UploadsController do
it "returns an error without file" do
post :create, model: model, id: snippet.id, format: :json
expect(response).to have_http_status(422)
expect(response).to have_gitlab_http_status(422)
end
it "returns an error with invalid model" do
......@@ -50,7 +50,7 @@ describe UploadsController do
it "returns 404 status when object not found" do
post :create, model: model, id: 9999, format: :json
expect(response).to have_http_status(404)
expect(response).to have_gitlab_http_status(404)
end
context 'with valid image' do
......@@ -174,7 +174,7 @@ describe UploadsController do
it "responds with status 200" do
get :show, model: "user", mounted_as: "avatar", id: user.id, filename: "image.png"
expect(response).to have_http_status(200)
expect(response).to have_gitlab_http_status(200)
end
it_behaves_like 'content not cached without revalidation' do
......@@ -190,7 +190,7 @@ describe UploadsController do
it "responds with status 200" do
get :show, model: "user", mounted_as: "avatar", id: user.id, filename: "image.png"
expect(response).to have_http_status(200)
expect(response).to have_gitlab_http_status(200)
end
it_behaves_like 'content not cached without revalidation' do
......@@ -214,7 +214,7 @@ describe UploadsController do
it "responds with status 200" do
get :show, model: "project", mounted_as: "avatar", id: project.id, filename: "image.png"
expect(response).to have_http_status(200)
expect(response).to have_gitlab_http_status(200)
end
it_behaves_like 'content not cached without revalidation' do
......@@ -233,7 +233,7 @@ describe UploadsController do
it "responds with status 200" do
get :show, model: "project", mounted_as: "avatar", id: project.id, filename: "image.png"
expect(response).to have_http_status(200)
expect(response).to have_gitlab_http_status(200)
end
it_behaves_like 'content not cached without revalidation' do
......@@ -285,7 +285,7 @@ describe UploadsController do
it "responds with status 200" do
get :show, model: "project", mounted_as: "avatar", id: project.id, filename: "image.png"
expect(response).to have_http_status(200)
expect(response).to have_gitlab_http_status(200)
end
it_behaves_like 'content not cached without revalidation' do
......@@ -301,7 +301,7 @@ describe UploadsController do
it "responds with status 404" do
get :show, model: "project", mounted_as: "avatar", id: project.id, filename: "image.png"
expect(response).to have_http_status(404)
expect(response).to have_gitlab_http_status(404)
end
end
end
......@@ -316,7 +316,7 @@ describe UploadsController do
it "responds with status 200" do
get :show, model: "group", mounted_as: "avatar", id: group.id, filename: "image.png"
expect(response).to have_http_status(200)
expect(response).to have_gitlab_http_status(200)
end
it_behaves_like 'content not cached without revalidation' do
......@@ -335,7 +335,7 @@ describe UploadsController do
it "responds with status 200" do
get :show, model: "group", mounted_as: "avatar", id: group.id, filename: "image.png"
expect(response).to have_http_status(200)
expect(response).to have_gitlab_http_status(200)
end
it_behaves_like 'content not cached without revalidation' do
......@@ -378,7 +378,7 @@ describe UploadsController do
it "responds with status 200" do
get :show, model: "group", mounted_as: "avatar", id: group.id, filename: "image.png"
expect(response).to have_http_status(200)
expect(response).to have_gitlab_http_status(200)
end
it_behaves_like 'content not cached without revalidation' do
......@@ -394,7 +394,7 @@ describe UploadsController do
it "responds with status 404" do
get :show, model: "group", mounted_as: "avatar", id: group.id, filename: "image.png"
expect(response).to have_http_status(404)
expect(response).to have_gitlab_http_status(404)
end
end
end
......@@ -414,7 +414,7 @@ describe UploadsController do
it "responds with status 200" do
get :show, model: "note", mounted_as: "attachment", id: note.id, filename: "image.png"
expect(response).to have_http_status(200)
expect(response).to have_gitlab_http_status(200)
end
it_behaves_like 'content not cached without revalidation' do
......@@ -433,7 +433,7 @@ describe UploadsController do
it "responds with status 200" do
get :show, model: "note", mounted_as: "attachment", id: note.id, filename: "image.png"
expect(response).to have_http_status(200)
expect(response).to have_gitlab_http_status(200)
end
it_behaves_like 'content not cached without revalidation' do
......@@ -485,7 +485,7 @@ describe UploadsController do
it "responds with status 200" do
get :show, model: "note", mounted_as: "attachment", id: note.id, filename: "image.png"
expect(response).to have_http_status(200)
expect(response).to have_gitlab_http_status(200)
end
it_behaves_like 'content not cached without revalidation' do
......@@ -501,7 +501,7 @@ describe UploadsController do
it "responds with status 404" do
get :show, model: "note", mounted_as: "attachment", id: note.id, filename: "image.png"
expect(response).to have_http_status(404)
expect(response).to have_gitlab_http_status(404)
end
end
end
......@@ -516,7 +516,7 @@ describe UploadsController do
it 'responds with status 200' do
get :show, model: 'appearance', mounted_as: 'header_logo', id: appearance.id, filename: 'dk.png'
expect(response).to have_http_status(200)
expect(response).to have_gitlab_http_status(200)
end
it_behaves_like 'content not cached without revalidation' do
......@@ -535,7 +535,7 @@ describe UploadsController do
it 'responds with status 200' do
get :show, model: 'appearance', mounted_as: 'logo', id: appearance.id, filename: 'dk.png'
expect(response).to have_http_status(200)
expect(response).to have_gitlab_http_status(200)
end
it_behaves_like 'content not cached without revalidation' do
......
spec/controllers/users_controller_spec.rb
View file @ 6652f967
......@@ -24,7 +24,7 @@ describe UsersController do
it 'renders the show template' do
get :show, username: user.username
expect(response).to have_http_status(200)
expect(response).to have_gitlab_http_status(200)
expect(response).to render_template('show')
end
end
......@@ -49,7 +49,7 @@ describe UsersController do
it 'renders show' do
get :show, username: user.username
expect(response).to have_http_status(200)
expect(response).to have_gitlab_http_status(200)
expect(response).to render_template('show')
end
end
......@@ -70,7 +70,7 @@ describe UsersController do
it 'renders 404' do
get :show, username: 'nonexistent'
expect(response).to have_http_status(404)
expect(response).to have_gitlab_http_status(404)
end
end
end
......@@ -82,7 +82,7 @@ describe UsersController do
get :calendar, username: user.username, format: :json
expect(response).to have_http_status(200)
expect(response).to have_gitlab_http_status(200)
end
context 'forked project' do
......@@ -139,7 +139,7 @@ describe UsersController do
context 'format html' do
it 'renders snippets page' do
get :snippets, username: user.username
expect(response).to have_http_status(200)
expect(response).to have_gitlab_http_status(200)
expect(response).to render_template('show')
end
end
......@@ -147,7 +147,7 @@ describe UsersController do
context 'format json' do
it 'response with snippets json data' do
get :snippets, username: user.username, format: :json
expect(response).to have_http_status(200)
expect(response).to have_gitlab_http_status(200)
expect(JSON.parse(response.body)).to have_key('html')
end
end
......
spec/ee/spec/controllers/boards/issues_controller_spec.rb
View file @ 6652f967
......@@ -26,7 +26,7 @@ describe Boards::IssuesController do
it 'returns a not found 404 response' do
list_issues user: user, board: 999, list: list2
expect(response).to have_http_status(404)
expect(response).to have_gitlab_http_status(404)
end
end
......@@ -53,7 +53,7 @@ describe Boards::IssuesController do
it 'returns a not found 404 response' do
list_issues user: user, board: board, list: 999
expect(response).to have_http_status(404)
expect(response).to have_gitlab_http_status(404)
end
end
end
......@@ -83,7 +83,7 @@ describe Boards::IssuesController do
it 'returns a forbidden 403 response' do
list_issues user: user, board: board, list: list2
expect(response).to have_http_status(403)
expect(response).to have_gitlab_http_status(403)
end
end
......@@ -104,7 +104,7 @@ describe Boards::IssuesController do
it 'returns a successful 200 response' do
create_issue user: user, board: board, list: list1, title: 'New issue'
expect(response).to have_http_status(200)
expect(response).to have_gitlab_http_status(200)
end
it 'returns the created issue' do
......@@ -119,7 +119,7 @@ describe Boards::IssuesController do
it 'returns an unprocessable entity 422 response' do
create_issue user: user, board: board, list: list1, title: nil
expect(response).to have_http_status(422)
expect(response).to have_gitlab_http_status(422)
end
end
......@@ -129,7 +129,7 @@ describe Boards::IssuesController do
create_issue user: user, board: board, list: list, title: 'New issue'
expect(response).to have_http_status(404)
expect(response).to have_gitlab_http_status(404)
end
end
......@@ -137,7 +137,7 @@ describe Boards::IssuesController do
it 'returns a not found 404 response' do
create_issue user: user, board: 999, list: list1, title: 'New issue'
expect(response).to have_http_status(404)
expect(response).to have_gitlab_http_status(404)
end
end
......@@ -145,7 +145,7 @@ describe Boards::IssuesController do
it 'returns a not found 404 response' do
create_issue user: user, board: board, list: 999, title: 'New issue'
expect(response).to have_http_status(404)
expect(response).to have_gitlab_http_status(404)
end
end
end
......@@ -154,7 +154,7 @@ describe Boards::IssuesController do
it 'returns a forbidden 403 response' do
create_issue user: guest, board: board, list: list1, title: 'New issue'
expect(response).to have_http_status(403)
expect(response).to have_gitlab_http_status(403)
end
end
......@@ -175,7 +175,7 @@ describe Boards::IssuesController do
it 'returns a successful 200 response' do
move user: user, board: board, issue: issue, from_list_id: list1.id, to_list_id: list2.id
expect(response).to have_http_status(200)
expect(response).to have_gitlab_http_status(200)
end
it 'moves issue to the desired list' do
......@@ -189,19 +189,19 @@ describe Boards::IssuesController do
it 'returns a unprocessable entity 422 response for invalid lists' do
move user: user, board: board, issue: issue, from_list_id: nil, to_list_id: nil
expect(response).to have_http_status(422)
expect(response).to have_gitlab_http_status(422)
end
it 'returns a not found 404 response for invalid board id' do
move user: user, board: 999, issue: issue, from_list_id: list1.id, to_list_id: list2.id
expect(response).to have_http_status(404)
expect(response).to have_gitlab_http_status(404)
end
it 'returns a not found 404 response for invalid issue id' do
move user: user, board: board, issue: double(id: 999), from_list_id: list1.id, to_list_id: list2.id
expect(response).to have_http_status(404)
expect(response).to have_gitlab_http_status(404)
end
end
......@@ -215,7 +215,7 @@ describe Boards::IssuesController do
it 'returns a forbidden 403 response' do
move user: guest, board: board, issue: issue, from_list_id: list1.id, to_list_id: list2.id
expect(response).to have_http_status(403)
expect(response).to have_gitlab_http_status(403)
end
end
......
spec/ee/spec/controllers/boards/lists_controller_spec.rb
View file @ 6652f967
......@@ -15,7 +15,7 @@ describe Boards::ListsController do
it 'returns a successful 200 response' do
read_board_list user: user, board: board
expect(response).to have_http_status(200)
expect(response).to have_gitlab_http_status(200)
expect(response.content_type).to eq 'application/json'
end
......@@ -38,7 +38,7 @@ describe Boards::ListsController do
it 'returns a forbidden 403 response' do
read_board_list user: user, board: board
expect(response).to have_http_status(403)
expect(response).to have_gitlab_http_status(403)
end
end
......@@ -56,7 +56,7 @@ describe Boards::ListsController do
it 'returns a successful 200 response' do
create_board_list user: user, board: board, label_id: label.id
expect(response).to have_http_status(200)
expect(response).to have_gitlab_http_status(200)
end
it 'returns the created list' do
......@@ -71,7 +71,7 @@ describe Boards::ListsController do
it 'returns a not found 404 response' do
create_board_list user: user, board: board, label_id: nil
expect(response).to have_http_status(404)
expect(response).to have_gitlab_http_status(404)
end
end
......@@ -81,7 +81,7 @@ describe Boards::ListsController do
create_board_list user: user, board: board, label_id: label.id
expect(response).to have_http_status(404)
expect(response).to have_gitlab_http_status(404)
end
end
end
......@@ -92,7 +92,7 @@ describe Boards::ListsController do
create_board_list user: guest, board: board, label_id: label.id
expect(response).to have_http_status(403)
expect(response).to have_gitlab_http_status(403)
end
end
......@@ -113,7 +113,7 @@ describe Boards::ListsController do
it 'returns a successful 200 response' do
move user: user, board: board, list: planning, position: 1
expect(response).to have_http_status(200)
expect(response).to have_gitlab_http_status(200)
end
it 'moves the list to the desired position' do
......@@ -127,7 +127,7 @@ describe Boards::ListsController do
it 'returns an unprocessable entity 422 response' do
move user: user, board: board, list: planning, position: 6
expect(response).to have_http_status(422)
expect(response).to have_gitlab_http_status(422)
end
end
......@@ -135,7 +135,7 @@ describe Boards::ListsController do
it 'returns a not found 404 response' do
move user: user, board: board, list: 999, position: 1
expect(response).to have_http_status(404)
expect(response).to have_gitlab_http_status(404)
end
end
......@@ -143,7 +143,7 @@ describe Boards::ListsController do
it 'returns a forbidden 403 response' do
move user: guest, board: board, list: planning, position: 6
expect(response).to have_http_status(403)
expect(response).to have_gitlab_http_status(403)
end
end
......@@ -164,7 +164,7 @@ describe Boards::ListsController do
it 'returns a successful 200 response' do
remove_board_list user: user, board: board, list: planning
expect(response).to have_http_status(200)
expect(response).to have_gitlab_http_status(200)
end
it 'removes list from board' do
......@@ -176,7 +176,7 @@ describe Boards::ListsController do
it 'returns a not found 404 response' do
remove_board_list user: user, board: board, list: 999
expect(response).to have_http_status(404)
expect(response).to have_gitlab_http_status(404)
end
end
......@@ -184,7 +184,7 @@ describe Boards::ListsController do
it 'returns a forbidden 403 response' do
remove_board_list user: guest, board: board, list: planning
expect(response).to have_http_status(403)
expect(response).to have_gitlab_http_status(403)
end
end
......
spec/ee/spec/controllers/ee/projects_controller_spec.rb
View file @ 6652f967
......@@ -67,7 +67,7 @@ describe ProjectsController do
id: project.id,
project: params
expect(response).to have_http_status(302)
expect(response).to have_gitlab_http_status(302)
params.except(:repository_size_limit).each do |param, value|
expect(project.public_send(param)).to eq(value)
end
......@@ -87,7 +87,7 @@ describe ProjectsController do
id: project.id,
project: params
expect(response).to have_http_status(302)
expect(response).to have_gitlab_http_status(302)
expect(project.approver_groups.pluck(:group_id)).to contain_exactly(params[:approver_group_ids])
expect(project.approvers.pluck(:user_id)).to contain_exactly(params[:approver_ids])
end
......@@ -103,7 +103,7 @@ describe ProjectsController do
id: project.id,
project: params
expect(response).to have_http_status(302)
expect(response).to have_gitlab_http_status(302)
params.each do |param, value|
expect(project.public_send(param)).to eq(value)
end
......@@ -122,7 +122,7 @@ describe ProjectsController do
id: project.id,
project: params
expect(response).to have_http_status(302)
expect(response).to have_gitlab_http_status(302)
expect(project.service_desk_enabled).to eq(true)
end
......
spec/ee/spec/controllers/groups/boards_controller_spec.rb
View file @ 6652f967
......@@ -31,7 +31,7 @@ describe Groups::BoardsController do
it 'returns a not found 404 response' do
list_boards
expect(response).to have_http_status(404)
expect(response).to have_gitlab_http_status(404)
expect(response.content_type).to eq 'text/html'
end
end
......@@ -58,7 +58,7 @@ describe Groups::BoardsController do
it 'returns a not found 404 response' do
list_boards format: :json
expect(response).to have_http_status(404)
expect(response).to have_gitlab_http_status(404)
expect(response.content_type).to eq 'application/json'
end
end
......@@ -88,7 +88,7 @@ describe Groups::BoardsController do
it 'returns a not found 404 response' do
read_board board: board
expect(response).to have_http_status(404)
expect(response).to have_gitlab_http_status(404)
expect(response.content_type).to eq 'text/html'
end
end
......@@ -109,7 +109,7 @@ describe Groups::BoardsController do
it 'returns a not found 404 response' do
read_board board: board, format: :json
expect(response).to have_http_status(404)
expect(response).to have_gitlab_http_status(404)
expect(response.content_type).to eq 'application/json'
end
end
......@@ -121,7 +121,7 @@ describe Groups::BoardsController do
read_board board: another_board
expect(response).to have_http_status(404)
expect(response).to have_gitlab_http_status(404)
end
end
......
spec/ee/spec/controllers/projects/boards_controller_spec.rb
View file @ 6652f967
......@@ -39,7 +39,7 @@ describe Projects::BoardsController do
it 'returns a successful 200 response' do
create_board name: 'Backend'
expect(response).to have_http_status(200)
expect(response).to have_gitlab_http_status(200)
end
it 'returns the created board' do
......@@ -53,7 +53,7 @@ describe Projects::BoardsController do
it 'returns an unprocessable entity 422 response' do
create_board name: nil
expect(response).to have_http_status(422)
expect(response).to have_gitlab_http_status(422)
end
end
......@@ -67,7 +67,7 @@ describe Projects::BoardsController do
create_board name: 'Backend'
expect(response.content_type).to eq 'application/json'
expect(response).to have_http_status(404)
expect(response).to have_gitlab_http_status(404)
end
end
end
......@@ -77,7 +77,7 @@ describe Projects::BoardsController do
create_board name: 'Backend'
expect(response).to have_http_status(404)
expect(response).to have_gitlab_http_status(404)
end
def create_board(name:)
......@@ -95,7 +95,7 @@ describe Projects::BoardsController do
it 'returns a successful 200 response' do
update_board board: board, name: 'Frontend'
expect(response).to have_http_status(200)
expect(response).to have_gitlab_http_status(200)
end
it 'returns the updated board' do
......@@ -109,7 +109,7 @@ describe Projects::BoardsController do
it 'returns an unprocessable entity 422 response' do
update_board board: board, name: nil
expect(response).to have_http_status(422)
expect(response).to have_gitlab_http_status(422)
end
end
......@@ -117,7 +117,7 @@ describe Projects::BoardsController do
it 'returns a not found 404 response' do
update_board board: 999, name: 'Frontend'
expect(response).to have_http_status(404)
expect(response).to have_gitlab_http_status(404)
end
end
......@@ -131,7 +131,7 @@ describe Projects::BoardsController do
update_board board: board, name: 'Backend'
expect(response.content_type).to eq 'application/json'
expect(response).to have_http_status(404)
expect(response).to have_gitlab_http_status(404)
end
end
......@@ -164,7 +164,7 @@ describe Projects::BoardsController do
it 'returns a not found 404 response' do
remove_board board: 999
expect(response).to have_http_status(404)
expect(response).to have_gitlab_http_status(404)
end
end
......@@ -177,7 +177,7 @@ describe Projects::BoardsController do
it 'returns a not found 404 response' do
remove_board board: board
expect(response).to have_http_status(404)
expect(response).to have_gitlab_http_status(404)
end
end
......
spec/ee/spec/controllers/projects/issues_controller_spec.rb
View file @ 6652f967
......@@ -105,7 +105,7 @@ describe Projects::IssuesController do
perform :get, :index, sort: 'weight'
expect(response).to have_http_status(200)
expect(response).to have_gitlab_http_status(200)
expect(assigns(:issues)).to eq(expected)
end
......@@ -115,7 +115,7 @@ describe Projects::IssuesController do
perform :get, :index, weight: 1
expect(response).to have_http_status(200)
expect(response).to have_gitlab_http_status(200)
expect(assigns(:issues)).to eq([issue2])
end
end
......@@ -124,7 +124,7 @@ describe Projects::IssuesController do
it 'sets issue weight' do
perform :put, :update, id: issue.to_param, issue: { weight: 6 }, format: :json
expect(response).to have_http_status(200)
expect(response).to have_gitlab_http_status(200)
expect(issue.reload.weight).to eq(6)
end
end
......@@ -133,7 +133,7 @@ describe Projects::IssuesController do
it 'sets issue weight' do
perform :post, :create, issue: new_issue.attributes
expect(response).to have_http_status(302)
expect(response).to have_gitlab_http_status(302)
expect(Issue.count).to eq(1)
issue = Issue.first
......@@ -153,7 +153,7 @@ describe Projects::IssuesController do
perform :get, :index, weight: 1
expect(response).to have_http_status(200)
expect(response).to have_gitlab_http_status(200)
expect(assigns(:issues)).to match_array(expected)
end
end
......@@ -162,7 +162,7 @@ describe Projects::IssuesController do
it 'does not set issue weight' do
perform :put, :update, id: issue.to_param, issue: { weight: 6 }, format: :json
expect(response).to have_http_status(200)
expect(response).to have_gitlab_http_status(200)
expect(issue.reload.weight).to be_nil
expect(issue.reload.read_attribute(:weight)).to eq(5) # pre-existing data is not overwritten
end
......@@ -172,7 +172,7 @@ describe Projects::IssuesController do
it 'does not set issue weight' do
perform :post, :create, issue: new_issue.attributes
expect(response).to have_http_status(302)
expect(response).to have_gitlab_http_status(302)
expect(Issue.count).to eq(1)
issue = Issue.first
......@@ -231,7 +231,7 @@ describe Projects::IssuesController do
it 'returns a 404' do
get_service_desk
expect(response).to have_http_status(404)
expect(response).to have_gitlab_http_status(404)
end
end
end
......
spec/ee/spec/requests/api/issues_spec.rb
View file @ 6652f967
......@@ -33,7 +33,7 @@ describe API::Issues, :mailer do
it 'matches V4 response schema' do
get api('/issues', user)
expect(response).to have_http_status(200)
expect(response).to have_gitlab_http_status(200)
expect(response).to match_response_schema('public_api/v4/issues', dir: 'ee')
end
end
......@@ -45,7 +45,7 @@ describe API::Issues, :mailer do
title: 'new issue', labels: 'label, label2', weight: 3,
assignee_ids: [user2.id]
expect(response).to have_http_status(201)
expect(response).to have_gitlab_http_status(201)
expect(json_response['title']).to eq('new issue')
expect(json_response['description']).to be_nil
expect(json_response['labels']).to eq(%w(label label2))
......@@ -60,7 +60,7 @@ describe API::Issues, :mailer do
it 'updates an issue with no weight' do
put api("/projects/#{project.id}/issues/#{issue.iid}", user), weight: 5
expect(response).to have_http_status(200)
expect(response).to have_gitlab_http_status(200)
expect(json_response['weight']).to eq(5)
end
......@@ -69,21 +69,21 @@ describe API::Issues, :mailer do
put api("/projects/#{project.id}/issues/#{weighted_issue.iid}", user), weight: nil
expect(response).to have_http_status(200)
expect(response).to have_gitlab_http_status(200)
expect(json_response['weight']).to be_nil
end
it 'returns 400 if weight is less than minimum weight' do
put api("/projects/#{project.id}/issues/#{issue.iid}", user), weight: -1
expect(response).to have_http_status(400)
expect(response).to have_gitlab_http_status(400)
expect(json_response['error']).to eq('weight does not have a valid value')
end
it 'returns 400 if weight is more than maximum weight' do
put api("/projects/#{project.id}/issues/#{issue.iid}", user), weight: 10
expect(response).to have_http_status(400)
expect(response).to have_gitlab_http_status(400)
expect(json_response['error']).to eq('weight does not have a valid value')
end
......@@ -95,7 +95,7 @@ describe API::Issues, :mailer do
it 'ignores the update' do
put api("/projects/#{project.id}/issues/#{issue.iid}", user), weight: 5
expect(response).to have_http_status(200)
expect(response).to have_gitlab_http_status(200)
expect(json_response['weight']).to be_nil
expect(issue.reload.read_attribute(:weight)).to be_nil
end
......@@ -103,7 +103,7 @@ describe API::Issues, :mailer do
end
def expect_paginated_array_response(size: nil)
expect(response).to have_http_status(200)
expect(response).to have_gitlab_http_status(200)
expect(response).to include_pagination_headers
expect(json_response).to be_an Array
expect(json_response.length).to eq(size) if size
......
spec/ee/spec/requests/api/settings_spec.rb
View file @ 6652f967
......@@ -14,7 +14,7 @@ describe API::Settings, 'EE Settings' do
it 'sets EE specific settings' do
put api("/application/settings", admin), help_text: 'Help text'
expect(response).to have_http_status(200)
expect(response).to have_gitlab_http_status(200)
expect(json_response['help_text']).to eq('Help text')
end
end
......@@ -28,7 +28,7 @@ describe API::Settings, 'EE Settings' do
it 'hides repository mirror attributes when the feature is available' do
get api("/application/settings", admin)
expect(response).to have_http_status(200)
expect(response).to have_gitlab_http_status(200)
expect(json_response.keys).not_to include('mirror_max_capacity')
end
......@@ -46,7 +46,7 @@ describe API::Settings, 'EE Settings' do
it 'has repository mirror attributes when the feature is available' do
get api("/application/settings", admin)
expect(response).to have_http_status(200)
expect(response).to have_gitlab_http_status(200)
expect(json_response.keys).to include('mirror_max_capacity')
end
......
spec/ee/spec/requests/api/variables_spec.rb
View file @ 6652f967
......@@ -17,7 +17,7 @@ describe API::Variables do
post api("/projects/#{project.id}/variables", user), key: 'TEST_VARIABLE_2', value: 'VALUE_2', environment_scope: 'review/*'
end.to change { project.variables(true).count }.by(1)
expect(response).to have_http_status(201)
expect(response).to have_gitlab_http_status(201)
expect(json_response['key']).to eq('TEST_VARIABLE_2')
expect(json_response['value']).to eq('VALUE_2')
expect(json_response['environment_scope']).to eq('review/*')
......@@ -30,7 +30,7 @@ describe API::Variables do
post api("/projects/#{project.id}/variables", user), key: variable.key, value: 'VALUE_2', environment_scope: 'review/*'
end.to change { project.variables(true).count }.by(1)
expect(response).to have_http_status(201)
expect(response).to have_gitlab_http_status(201)
expect(json_response['key']).to eq(variable.key)
expect(json_response['value']).to eq('VALUE_2')
expect(json_response['environment_scope']).to eq('review/*')
......
spec/features/profiles/chat_names_spec.rb
View file @ 6652f967
......@@ -33,7 +33,7 @@ feature 'Profile > Chat' do
scenario 'second use of link is denied' do
visit authorize_path
expect(page).to have_http_status(:not_found)
expect(page).to have_gitlab_http_status(:not_found)
end
end
......@@ -51,7 +51,7 @@ feature 'Profile > Chat' do
scenario 'second use of link is denied' do
visit authorize_path
expect(page).to have_http_status(:not_found)
expect(page).to have_gitlab_http_status(:not_found)
end
end
end
......
spec/features/profiles/password_spec.rb
View file @ 6652f967
This diff is collapsed.
spec/features/projects/jobs_spec.rb
View file @ 6652f967
This diff is collapsed.
spec/requests/api/access_requests_spec.rb
View file @ 6652f967
This diff is collapsed.
spec/requests/api/award_emoji_spec.rb
View file @ 6652f967
This diff is collapsed.
spec/requests/api/boards_spec.rb
View file @ 6652f967
This diff is collapsed.
spec/requests/api/circuit_breakers_spec.rb
View file @ 6652f967
This diff is collapsed.
spec/requests/api/commit_statuses_spec.rb
View file @ 6652f967
This diff is collapsed.
spec/requests/api/commits_spec.rb
View file @ 6652f967
This diff is collapsed.
spec/requests/api/deploy_keys_spec.rb
View file @ 6652f967
This diff is collapsed.
spec/requests/api/deployments_spec.rb
View file @ 6652f967
This diff is collapsed.
spec/requests/api/doorkeeper_access_spec.rb
View file @ 6652f967
This diff is collapsed.
spec/requests/api/environments_spec.rb
View file @ 6652f967
This diff is collapsed.
spec/requests/api/events_spec.rb
View file @ 6652f967
This diff is collapsed.
spec/requests/api/features_spec.rb
View file @ 6652f967
This diff is collapsed.
spec/requests/api/files_spec.rb
View file @ 6652f967
This diff is collapsed.
spec/requests/api/geo_spec.rb
View file @ 6652f967
This diff is collapsed.
spec/requests/api/group_variables_spec.rb
View file @ 6652f967
This diff is collapsed.
spec/requests/api/groups_spec.rb
View file @ 6652f967
This diff is collapsed.
spec/requests/api/internal_spec.rb
View file @ 6652f967
This diff is collapsed.
spec/requests/api/issue_links_spec.rb
View file @ 6652f967
This diff is collapsed.
spec/requests/api/issues_spec.rb
View file @ 6652f967
This diff is collapsed.
spec/requests/api/jobs_spec.rb
View file @ 6652f967
This diff is collapsed.
spec/requests/api/keys_spec.rb
View file @ 6652f967
This diff is collapsed.
spec/requests/api/labels_spec.rb
View file @ 6652f967
This diff is collapsed.
spec/requests/api/lint_spec.rb
View file @ 6652f967
This diff is collapsed.
spec/requests/api/members_spec.rb
View file @ 6652f967
This diff is collapsed.
spec/requests/api/merge_requests_spec.rb
View file @ 6652f967
This diff is collapsed.
spec/requests/api/namespaces_spec.rb
View file @ 6652f967
This diff is collapsed.
spec/requests/api/notes_spec.rb
View file @ 6652f967
This diff is collapsed.
spec/requests/api/oauth_tokens_spec.rb
View file @ 6652f967
This diff is collapsed.
spec/requests/api/pipelines_spec.rb
View file @ 6652f967
This diff is collapsed.
spec/requests/api/project_hooks_spec.rb
View file @ 6652f967
This diff is collapsed.
spec/requests/api/project_push_rule_spec.rb
View file @ 6652f967
This diff is collapsed.
spec/requests/api/project_snippets_spec.rb
View file @ 6652f967
This diff is collapsed.
spec/requests/api/projects_spec.rb
View file @ 6652f967
This diff is collapsed.
spec/requests/api/repositories_spec.rb
View file @ 6652f967
This diff is collapsed.
spec/requests/api/runner_spec.rb
View file @ 6652f967
This diff is collapsed.
spec/requests/api/runners_spec.rb
View file @ 6652f967
This diff is collapsed.
spec/requests/api/services_spec.rb
View file @ 6652f967
This diff is collapsed.
spec/requests/api/session_spec.rb
View file @ 6652f967
This diff is collapsed.
spec/requests/api/settings_spec.rb
View file @ 6652f967
This diff is collapsed.
spec/requests/api/sidekiq_metrics_spec.rb
View file @ 6652f967
This diff is collapsed.
spec/requests/api/snippets_spec.rb
View file @ 6652f967
This diff is collapsed.
spec/requests/api/system_hooks_spec.rb
View file @ 6652f967
This diff is collapsed.
spec/requests/api/templates_spec.rb
View file @ 6652f967
This diff is collapsed.
spec/requests/api/todos_spec.rb
View file @ 6652f967
This diff is collapsed.
spec/requests/api/triggers_spec.rb
View file @ 6652f967
This diff is collapsed.
spec/requests/api/users_spec.rb
View file @ 6652f967
This diff is collapsed.
spec/requests/api/v3/award_emoji_spec.rb
View file @ 6652f967
This diff is collapsed.
spec/requests/api/v3/boards_spec.rb
View file @ 6652f967
This diff is collapsed.
spec/requests/api/v3/branches_spec.rb
View file @ 6652f967
This diff is collapsed.
spec/requests/api/v3/builds_spec.rb
View file @ 6652f967
This diff is collapsed.
spec/requests/api/v3/commits_spec.rb
View file @ 6652f967
This diff is collapsed.
spec/requests/api/v3/deploy_keys_spec.rb
View file @ 6652f967
This diff is collapsed.
spec/requests/api/v3/deployments_spec.rb
View file @ 6652f967
This diff is collapsed.
spec/requests/api/v3/environments_spec.rb
View file @ 6652f967
This diff is collapsed.
spec/requests/api/v3/files_spec.rb
View file @ 6652f967
This diff is collapsed.
spec/requests/api/v3/github_spec.rb
View file @ 6652f967
This diff is collapsed.
spec/requests/api/v3/groups_spec.rb
View file @ 6652f967
This diff is collapsed.
spec/requests/api/v3/issues_spec.rb
View file @ 6652f967
This diff is collapsed.
spec/requests/api/v3/labels_spec.rb
View file @ 6652f967
This diff is collapsed.
spec/requests/api/v3/members_spec.rb
View file @ 6652f967
This diff is collapsed.
spec/requests/api/v3/merge_requests_spec.rb
View file @ 6652f967
This diff is collapsed.
spec/requests/api/v3/milestones_spec.rb
View file @ 6652f967
This diff is collapsed.
spec/requests/api/v3/notes_spec.rb
View file @ 6652f967
This diff is collapsed.
spec/requests/api/v3/pipelines_spec.rb
View file @ 6652f967
This diff is collapsed.
spec/requests/api/v3/project_hooks_spec.rb
View file @ 6652f967
This diff is collapsed.
spec/requests/api/v3/projects_spec.rb
View file @ 6652f967
This diff is collapsed.
spec/requests/api/v3/repositories_spec.rb
View file @ 6652f967
This diff is collapsed.
spec/requests/api/v3/runners_spec.rb
View file @ 6652f967
This diff is collapsed.
spec/requests/api/v3/services_spec.rb
View file @ 6652f967
This diff is collapsed.
spec/requests/api/v3/settings_spec.rb
View file @ 6652f967
This diff is collapsed.
spec/requests/api/v3/snippets_spec.rb
View file @ 6652f967
This diff is collapsed.
spec/requests/api/v3/system_hooks_spec.rb
View file @ 6652f967
This diff is collapsed.
spec/requests/api/v3/tags_spec.rb
View file @ 6652f967
This diff is collapsed.
spec/requests/api/v3/templates_spec.rb
View file @ 6652f967
This diff is collapsed.
spec/requests/api/v3/triggers_spec.rb
View file @ 6652f967
This diff is collapsed.
spec/requests/api/v3/users_spec.rb
View file @ 6652f967
This diff is collapsed.
spec/requests/api/variables_spec.rb
View file @ 6652f967
This diff is collapsed.
spec/requests/api/wikis_spec.rb
View file @ 6652f967
This diff is collapsed.
spec/requests/git_http_spec.rb
View file @ 6652f967
This diff is collapsed.
spec/requests/jwt_controller_spec.rb
View file @ 6652f967
This diff is collapsed.
spec/requests/openid_connect_spec.rb
View file @ 6652f967
This diff is collapsed.
spec/support/api/members_shared_examples.rb
View file @ 6652f967
This diff is collapsed.
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
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7