From 17ab40ca089e1aef61a83f77ab6df62a72f6ce06 Mon Sep 17 00:00:00 2001
From: GitLab Bot <gitlab-bot@gitlab.com>
Date: Wed, 26 Feb 2020 15:08:56 +0000
Subject: Add latest changes from gitlab-org/gitlab@master

---
 spec/requests/api/markdown_spec.rb              |  14 +-
 spec/requests/api/members_spec.rb               |  60 +++---
 spec/requests/api/merge_request_diffs_spec.rb   |  10 +-
 spec/requests/api/merge_requests_spec.rb        | 266 ++++++++++++------------
 spec/requests/api/namespaces_spec.rb            |  22 +-
 spec/requests/api/notes_spec.rb                 |  18 +-
 spec/requests/api/notification_settings_spec.rb |  16 +-
 spec/requests/api/oauth_tokens_spec.rb          |   6 +-
 spec/requests/api/runner_spec.rb                |  15 ++
 9 files changed, 221 insertions(+), 206 deletions(-)

(limited to 'spec/requests/api')

diff --git a/spec/requests/api/markdown_spec.rb b/spec/requests/api/markdown_spec.rb
index 8a1e1b05c9a..9b787e76740 100644
--- a/spec/requests/api/markdown_spec.rb
+++ b/spec/requests/api/markdown_spec.rb
@@ -16,7 +16,7 @@ describe API::Markdown do
 
     shared_examples "rendered markdown text without GFM" do
       it "renders markdown text" do
-        expect(response).to have_http_status(201)
+        expect(response).to have_gitlab_http_status(:created)
         expect(response.headers["Content-Type"]).to eq("application/json")
         expect(json_response).to be_a(Hash)
         expect(json_response["html"]).to eq("<p>#{text}</p>")
@@ -25,7 +25,7 @@ describe API::Markdown do
 
     shared_examples "404 Project Not Found" do
       it "responses with 404 Not Found" do
-        expect(response).to have_http_status(404)
+        expect(response).to have_gitlab_http_status(:not_found)
         expect(response.headers["Content-Type"]).to eq("application/json")
         expect(json_response).to be_a(Hash)
         expect(json_response["message"]).to eq("404 Project Not Found")
@@ -37,7 +37,7 @@ describe API::Markdown do
         let(:params) { {} }
 
         it "responses with 400 Bad Request" do
-          expect(response).to have_http_status(400)
+          expect(response).to have_gitlab_http_status(:bad_request)
           expect(response.headers["Content-Type"]).to eq("application/json")
           expect(json_response).to be_a(Hash)
           expect(json_response["error"]).to eq("text is missing")
@@ -83,7 +83,7 @@ describe API::Markdown do
           let(:params) { { text: text, gfm: true } }
 
           it "renders markdown text" do
-            expect(response).to have_http_status(201)
+            expect(response).to have_gitlab_http_status(:created)
             expect(response.headers["Content-Type"]).to eq("application/json")
             expect(json_response).to be_a(Hash)
             expect(json_response["html"]).to include("Hello world!")
@@ -100,7 +100,7 @@ describe API::Markdown do
           let(:user) { project.owner }
 
           it "renders markdown text" do
-            expect(response).to have_http_status(201)
+            expect(response).to have_gitlab_http_status(:created)
             expect(response.headers["Content-Type"]).to eq("application/json")
             expect(json_response).to be_a(Hash)
             expect(json_response["html"]).to include("Hello world!")
@@ -120,7 +120,7 @@ describe API::Markdown do
 
           shared_examples 'user without proper access' do
             it 'does not render the title or link' do
-              expect(response).to have_http_status(201)
+              expect(response).to have_gitlab_http_status(:created)
               expect(json_response["html"]).not_to include('Confidential title')
               expect(json_response["html"]).not_to include('<a href=')
               expect(json_response["html"]).to include('Hello world!')
@@ -146,7 +146,7 @@ describe API::Markdown do
             let(:user) { confidential_issue.author }
 
             it 'renders the title or link' do
-              expect(response).to have_http_status(201)
+              expect(response).to have_gitlab_http_status(:created)
               expect(json_response["html"]).to include('Confidential title')
               expect(json_response["html"]).to include('Hello world!')
                                           .and include('data-name="tada"')
diff --git a/spec/requests/api/members_spec.rb b/spec/requests/api/members_spec.rb
index f2942020e16..0b504df1f51 100644
--- a/spec/requests/api/members_spec.rb
+++ b/spec/requests/api/members_spec.rb
@@ -43,7 +43,7 @@ describe API::Members do
 
             get api(members_url, user)
 
-            expect(response).to have_gitlab_http_status(200)
+            expect(response).to have_gitlab_http_status(:ok)
             expect(response).to include_pagination_headers
             expect(json_response).to be_an Array
             expect(json_response.size).to eq(2)
@@ -72,7 +72,7 @@ describe API::Members do
 
         get api(members_url, developer)
 
-        expect(response).to have_gitlab_http_status(200)
+        expect(response).to have_gitlab_http_status(:ok)
         expect(response).to include_pagination_headers
         expect(json_response).to be_an Array
         expect(json_response.size).to eq(2)
@@ -82,7 +82,7 @@ describe API::Members do
       it 'finds members with query string' do
         get api(members_url, developer), params: { query: maintainer.username }
 
-        expect(response).to have_gitlab_http_status(200)
+        expect(response).to have_gitlab_http_status(:ok)
         expect(response).to include_pagination_headers
         expect(json_response).to be_an Array
         expect(json_response.count).to eq(1)
@@ -92,7 +92,7 @@ describe API::Members do
       it 'finds members with the given user_ids' do
         get api(members_url, developer), params: { user_ids: [maintainer.id, developer.id, stranger.id] }
 
-        expect(response).to have_gitlab_http_status(200)
+        expect(response).to have_gitlab_http_status(:ok)
         expect(response).to include_pagination_headers
         expect(json_response).to be_an Array
         expect(json_response.map { |u| u['id'] }).to contain_exactly(maintainer.id, developer.id)
@@ -101,7 +101,7 @@ describe API::Members do
       it 'finds all members with no query specified' do
         get api(members_url, developer), params: { query: '' }
 
-        expect(response).to have_gitlab_http_status(200)
+        expect(response).to have_gitlab_http_status(:ok)
         expect(response).to include_pagination_headers
         expect(json_response).to be_an Array
         expect(json_response.count).to eq(2)
@@ -137,7 +137,7 @@ describe API::Members do
     it 'finds all project members including inherited members' do
       get api("/projects/#{project.id}/members/all", developer)
 
-      expect(response).to have_gitlab_http_status(200)
+      expect(response).to have_gitlab_http_status(:ok)
       expect(response).to include_pagination_headers
       expect(json_response).to be_an Array
       expect(json_response.map { |u| u['id'] }).to match_array [maintainer.id, developer.id, nested_user.id, project_user.id, linked_group_user.id]
@@ -148,7 +148,7 @@ describe API::Members do
 
       get api("/projects/#{project.id}/members/all", developer)
 
-      expect(response).to have_gitlab_http_status(200)
+      expect(response).to have_gitlab_http_status(:ok)
       expect(response).to include_pagination_headers
       expect(json_response).to be_an Array
 
@@ -165,7 +165,7 @@ describe API::Members do
     it 'finds all group members including inherited members' do
       get api("/groups/#{nested_group.id}/members/all", developer)
 
-      expect(response).to have_gitlab_http_status(200)
+      expect(response).to have_gitlab_http_status(:ok)
       expect(response).to include_pagination_headers
       expect(json_response).to be_an Array
       expect(json_response.map { |u| u['id'] }).to match_array [maintainer.id, developer.id, nested_user.id]
@@ -185,7 +185,7 @@ describe API::Members do
               user = public_send(type)
               get api("/#{source_type.pluralize}/#{source.id}/members/#{all ? 'all/' : ''}#{developer.id}", user)
 
-              expect(response).to have_gitlab_http_status(200)
+              expect(response).to have_gitlab_http_status(:ok)
               # User attributes
               expect(json_response['id']).to eq(developer.id)
               expect(json_response['name']).to eq(developer.name)
@@ -220,7 +220,7 @@ describe API::Members do
               post api("/#{source_type.pluralize}/#{source.id}/members", user),
                    params: { user_id: access_requester.id, access_level: Member::MAINTAINER }
 
-              expect(response).to have_gitlab_http_status(403)
+              expect(response).to have_gitlab_http_status(:forbidden)
             end
           end
         end
@@ -233,7 +233,7 @@ describe API::Members do
               post api("/#{source_type.pluralize}/#{source.id}/members", maintainer),
                    params: { user_id: access_requester.id, access_level: Member::MAINTAINER }
 
-              expect(response).to have_gitlab_http_status(201)
+              expect(response).to have_gitlab_http_status(:created)
             end.to change { source.members.count }.by(1)
             expect(source.requesters.count).to eq(0)
             expect(json_response['id']).to eq(access_requester.id)
@@ -246,7 +246,7 @@ describe API::Members do
             post api("/#{source_type.pluralize}/#{source.id}/members", maintainer),
                  params: { user_id: stranger.id, access_level: Member::DEVELOPER, expires_at: '2016-08-05' }
 
-            expect(response).to have_gitlab_http_status(201)
+            expect(response).to have_gitlab_http_status(:created)
           end.to change { source.members.count }.by(1)
           expect(json_response['id']).to eq(stranger.id)
           expect(json_response['access_level']).to eq(Member::DEVELOPER)
@@ -265,7 +265,7 @@ describe API::Members do
           post api("/#{source_type.pluralize}/#{source.id}/members", maintainer),
                params: { user_id: stranger.id, access_level: Member::REPORTER }
 
-          expect(response).to have_gitlab_http_status(400)
+          expect(response).to have_gitlab_http_status(:bad_request)
           expect(json_response['message']['access_level']).to eq(["should be greater than or equal to Developer inherited membership from group #{parent.name}"])
         end
 
@@ -279,7 +279,7 @@ describe API::Members do
           post api("/#{source_type.pluralize}/#{source.id}/members", maintainer),
                params: { user_id: stranger.id, access_level: Member::MAINTAINER }
 
-          expect(response).to have_gitlab_http_status(201)
+          expect(response).to have_gitlab_http_status(:created)
           expect(json_response['id']).to eq(stranger.id)
           expect(json_response['access_level']).to eq(Member::MAINTAINER)
         end
@@ -289,14 +289,14 @@ describe API::Members do
         post api("/#{source_type.pluralize}/#{source.id}/members", maintainer),
              params: { user_id: maintainer.id, access_level: Member::MAINTAINER }
 
-        expect(response).to have_gitlab_http_status(409)
+        expect(response).to have_gitlab_http_status(:conflict)
       end
 
       it 'returns 404 when the user_id is not valid' do
         post api("/#{source_type.pluralize}/#{source.id}/members", maintainer),
              params: { user_id: 0, access_level: Member::MAINTAINER }
 
-        expect(response).to have_gitlab_http_status(404)
+        expect(response).to have_gitlab_http_status(:not_found)
         expect(json_response['message']).to eq('404 User Not Found')
       end
 
@@ -304,21 +304,21 @@ describe API::Members do
         post api("/#{source_type.pluralize}/#{source.id}/members", maintainer),
              params: { access_level: Member::MAINTAINER }
 
-        expect(response).to have_gitlab_http_status(400)
+        expect(response).to have_gitlab_http_status(:bad_request)
       end
 
       it 'returns 400 when access_level is not given' do
         post api("/#{source_type.pluralize}/#{source.id}/members", maintainer),
              params: { user_id: stranger.id }
 
-        expect(response).to have_gitlab_http_status(400)
+        expect(response).to have_gitlab_http_status(:bad_request)
       end
 
       it 'returns 400  when access_level is not valid' do
         post api("/#{source_type.pluralize}/#{source.id}/members", maintainer),
              params: { user_id: stranger.id, access_level: 1234 }
 
-        expect(response).to have_gitlab_http_status(400)
+        expect(response).to have_gitlab_http_status(:bad_request)
       end
     end
   end
@@ -340,7 +340,7 @@ describe API::Members do
               put api("/#{source_type.pluralize}/#{source.id}/members/#{developer.id}", user),
                   params: { access_level: Member::MAINTAINER }
 
-              expect(response).to have_gitlab_http_status(403)
+              expect(response).to have_gitlab_http_status(:forbidden)
             end
           end
         end
@@ -351,7 +351,7 @@ describe API::Members do
           put api("/#{source_type.pluralize}/#{source.id}/members/#{developer.id}", maintainer),
               params: { access_level: Member::MAINTAINER, expires_at: '2016-08-05' }
 
-          expect(response).to have_gitlab_http_status(200)
+          expect(response).to have_gitlab_http_status(:ok)
           expect(json_response['id']).to eq(developer.id)
           expect(json_response['access_level']).to eq(Member::MAINTAINER)
           expect(json_response['expires_at']).to eq('2016-08-05')
@@ -362,20 +362,20 @@ describe API::Members do
         put api("/#{source_type.pluralize}/#{source.id}/members/123", maintainer),
             params: { access_level: Member::MAINTAINER }
 
-        expect(response).to have_gitlab_http_status(404)
+        expect(response).to have_gitlab_http_status(:not_found)
       end
 
       it 'returns 400 when access_level is not given' do
         put api("/#{source_type.pluralize}/#{source.id}/members/#{developer.id}", maintainer)
 
-        expect(response).to have_gitlab_http_status(400)
+        expect(response).to have_gitlab_http_status(:bad_request)
       end
 
       it 'returns 400  when access level is not valid' do
         put api("/#{source_type.pluralize}/#{source.id}/members/#{developer.id}", maintainer),
             params: { access_level: 1234 }
 
-        expect(response).to have_gitlab_http_status(400)
+        expect(response).to have_gitlab_http_status(:bad_request)
       end
     end
   end
@@ -393,7 +393,7 @@ describe API::Members do
               user = public_send(type)
               delete api("/#{source_type.pluralize}/#{source.id}/members/#{developer.id}", user)
 
-              expect(response).to have_gitlab_http_status(403)
+              expect(response).to have_gitlab_http_status(:forbidden)
             end
           end
         end
@@ -404,7 +404,7 @@ describe API::Members do
           expect do
             delete api("/#{source_type.pluralize}/#{source.id}/members/#{developer.id}", developer)
 
-            expect(response).to have_gitlab_http_status(204)
+            expect(response).to have_gitlab_http_status(:no_content)
           end.to change { source.members.count }.by(-1)
         end
       end
@@ -415,7 +415,7 @@ describe API::Members do
             expect do
               delete api("/#{source_type.pluralize}/#{source.id}/members/#{access_requester.id}", maintainer)
 
-              expect(response).to have_gitlab_http_status(404)
+              expect(response).to have_gitlab_http_status(:not_found)
             end.not_to change { source.requesters.count }
           end
         end
@@ -424,7 +424,7 @@ describe API::Members do
           expect do
             delete api("/#{source_type.pluralize}/#{source.id}/members/#{developer.id}", maintainer)
 
-            expect(response).to have_gitlab_http_status(204)
+            expect(response).to have_gitlab_http_status(:no_content)
           end.to change { source.members.count }.by(-1)
         end
 
@@ -436,7 +436,7 @@ describe API::Members do
       it 'returns 404 if member does not exist' do
         delete api("/#{source_type.pluralize}/#{source.id}/members/123", maintainer)
 
-        expect(response).to have_gitlab_http_status(404)
+        expect(response).to have_gitlab_http_status(:not_found)
       end
     end
   end
@@ -491,7 +491,7 @@ describe API::Members do
         post api("/projects/#{project.id}/members", maintainer),
              params: { user_id: stranger.id, access_level: Member::OWNER }
 
-        expect(response).to have_gitlab_http_status(400)
+        expect(response).to have_gitlab_http_status(:bad_request)
       end.to change { project.members.count }.by(0)
     end
   end
diff --git a/spec/requests/api/merge_request_diffs_spec.rb b/spec/requests/api/merge_request_diffs_spec.rb
index 9de76c2fe50..2e74022ae07 100644
--- a/spec/requests/api/merge_request_diffs_spec.rb
+++ b/spec/requests/api/merge_request_diffs_spec.rb
@@ -28,12 +28,12 @@ describe API::MergeRequestDiffs, 'MergeRequestDiffs' do
 
     it 'returns a 404 when merge_request id is used instead of the iid' do
       get api("/projects/#{project.id}/merge_requests/#{merge_request.id}/versions", user)
-      expect(response).to have_gitlab_http_status(404)
+      expect(response).to have_gitlab_http_status(:not_found)
     end
 
     it 'returns a 404 when merge_request_iid not found' do
       get api("/projects/#{project.id}/merge_requests/0/versions", user)
-      expect(response).to have_gitlab_http_status(404)
+      expect(response).to have_gitlab_http_status(:not_found)
     end
   end
 
@@ -51,17 +51,17 @@ describe API::MergeRequestDiffs, 'MergeRequestDiffs' do
 
     it 'returns a 404 when merge_request id is used instead of the iid' do
       get api("/projects/#{project.id}/merge_requests/#{merge_request.id}/versions/#{merge_request_diff.id}", user)
-      expect(response).to have_gitlab_http_status(404)
+      expect(response).to have_gitlab_http_status(:not_found)
     end
 
     it 'returns a 404 when merge_request version_id is not found' do
       get api("/projects/#{project.id}/merge_requests/#{merge_request.iid}/versions/0", user)
-      expect(response).to have_gitlab_http_status(404)
+      expect(response).to have_gitlab_http_status(:not_found)
     end
 
     it 'returns a 404 when merge_request_iid is not found' do
       get api("/projects/#{project.id}/merge_requests/12345/versions/#{merge_request_diff.id}", user)
-      expect(response).to have_gitlab_http_status(404)
+      expect(response).to have_gitlab_http_status(:not_found)
     end
   end
 end
diff --git a/spec/requests/api/merge_requests_spec.rb b/spec/requests/api/merge_requests_spec.rb
index 862afd11b86..f0ab2f26900 100644
--- a/spec/requests/api/merge_requests_spec.rb
+++ b/spec/requests/api/merge_requests_spec.rb
@@ -194,7 +194,7 @@ describe API::MergeRequests do
       it 'matches V4 response schema' do
         get api(endpoint_path, user)
 
-        expect(response).to have_gitlab_http_status(200)
+        expect(response).to have_gitlab_http_status(:ok)
         expect(response).to match_response_schema('public_api/v4/merge_requests')
       end
 
@@ -454,25 +454,25 @@ describe API::MergeRequests do
       it "returns authentication error without any scope" do
         get api("/merge_requests")
 
-        expect(response).to have_gitlab_http_status(401)
+        expect(response).to have_gitlab_http_status(:unauthorized)
       end
 
       it "returns authentication error  when scope is assigned-to-me" do
         get api("/merge_requests"), params: { scope: 'assigned-to-me' }
 
-        expect(response).to have_gitlab_http_status(401)
+        expect(response).to have_gitlab_http_status(:unauthorized)
       end
 
       it "returns authentication error when scope is assigned_to_me" do
         get api("/merge_requests"), params: { scope: 'assigned_to_me' }
 
-        expect(response).to have_gitlab_http_status(401)
+        expect(response).to have_gitlab_http_status(:unauthorized)
       end
 
       it "returns authentication error  when scope is created-by-me" do
         get api("/merge_requests"), params: { scope: 'created-by-me' }
 
-        expect(response).to have_gitlab_http_status(401)
+        expect(response).to have_gitlab_http_status(:unauthorized)
       end
     end
 
@@ -705,7 +705,7 @@ describe API::MergeRequests do
 
       get api("/projects/#{project.id}/merge_requests")
 
-      expect(response).to have_gitlab_http_status(404)
+      expect(response).to have_gitlab_http_status(:not_found)
     end
 
     it "returns an array of no merge_requests when wip=yes" do
@@ -818,7 +818,7 @@ describe API::MergeRequests do
       merge_request = create(:merge_request, :with_test_reports, milestone: milestone1, author: user, assignees: [user], source_project: project, target_project: project, title: "Test", created_at: base_time)
       get api("/projects/#{project.id}/merge_requests/#{merge_request.iid}", user)
 
-      expect(response).to have_gitlab_http_status(200)
+      expect(response).to have_gitlab_http_status(:ok)
       expect(response).to match_response_schema('public_api/v4/merge_request')
     end
 
@@ -828,7 +828,7 @@ describe API::MergeRequests do
 
       get api("/projects/#{project.id}/merge_requests/#{merge_request.iid}", user)
 
-      expect(response).to have_gitlab_http_status(200)
+      expect(response).to have_gitlab_http_status(:ok)
       expect(json_response['id']).to eq(merge_request.id)
       expect(json_response['iid']).to eq(merge_request.iid)
       expect(json_response['project_id']).to eq(merge_request.project.id)
@@ -866,7 +866,7 @@ describe API::MergeRequests do
     it 'exposes description and title html when render_html is true' do
       get api("/projects/#{project.id}/merge_requests/#{merge_request.iid}", user), params: { render_html: true }
 
-      expect(response).to have_gitlab_http_status(200)
+      expect(response).to have_gitlab_http_status(:ok)
 
       expect(json_response).to include('title_html', 'description_html')
     end
@@ -874,7 +874,7 @@ describe API::MergeRequests do
     it 'exposes rebase_in_progress when include_rebase_in_progress is true' do
       get api("/projects/#{project.id}/merge_requests/#{merge_request.iid}", user), params: { include_rebase_in_progress: true }
 
-      expect(response).to have_gitlab_http_status(200)
+      expect(response).to have_gitlab_http_status(:ok)
 
       expect(json_response).to include('rebase_in_progress')
     end
@@ -950,19 +950,19 @@ describe API::MergeRequests do
 
       get api("/projects/#{project.id}/merge_requests/#{merge_request.iid}", user), params: { include_diverged_commits_count: true }
 
-      expect(response).to have_gitlab_http_status(200)
+      expect(response).to have_gitlab_http_status(:ok)
       expect(json_response['diverged_commits_count']).to eq(1)
     end
 
     it "returns a 404 error if merge_request_iid not found" do
       get api("/projects/#{project.id}/merge_requests/0", user)
-      expect(response).to have_gitlab_http_status(404)
+      expect(response).to have_gitlab_http_status(:not_found)
     end
 
     it "returns a 404 error if merge_request `id` is used instead of iid" do
       get api("/projects/#{project.id}/merge_requests/#{merge_request.id}", user)
 
-      expect(response).to have_gitlab_http_status(404)
+      expect(response).to have_gitlab_http_status(:not_found)
     end
 
     context 'Work in Progress' do
@@ -971,7 +971,7 @@ describe API::MergeRequests do
       it "returns merge request" do
         get api("/projects/#{project.id}/merge_requests/#{merge_request_wip.iid}", user)
 
-        expect(response).to have_gitlab_http_status(200)
+        expect(response).to have_gitlab_http_status(:ok)
         expect(json_response['work_in_progress']).to eq(true)
       end
     end
@@ -990,7 +990,7 @@ describe API::MergeRequests do
 
         get api("/projects/#{project.id}/merge_requests/#{merge_request_overflow.iid}", user)
 
-        expect(response).to have_gitlab_http_status(200)
+        expect(response).to have_gitlab_http_status(:ok)
         expect(json_response['changes_count']).to eq('5+')
       end
     end
@@ -1059,13 +1059,13 @@ describe API::MergeRequests do
 
     it 'returns a 404 when merge_request_iid not found' do
       get api("/projects/#{project.id}/merge_requests/0/commits", user)
-      expect(response).to have_gitlab_http_status(404)
+      expect(response).to have_gitlab_http_status(:not_found)
     end
 
     it 'returns a 404 when merge_request id is used instead of iid' do
       get api("/projects/#{project.id}/merge_requests/#{merge_request.id}/commits", user)
 
-      expect(response).to have_gitlab_http_status(404)
+      expect(response).to have_gitlab_http_status(:not_found)
     end
   end
 
@@ -1083,7 +1083,7 @@ describe API::MergeRequests do
 
     it 'returns a 404 when merge_request_iid not found' do
       get api("/projects/#{project.id}/merge_requests/0/context_commits", user)
-      expect(response).to have_gitlab_http_status(404)
+      expect(response).to have_gitlab_http_status(:not_found)
     end
   end
 
@@ -1091,19 +1091,19 @@ describe API::MergeRequests do
     it 'returns the change information of the merge_request' do
       get api("/projects/#{project.id}/merge_requests/#{merge_request.iid}/changes", user)
 
-      expect(response).to have_gitlab_http_status(200)
+      expect(response).to have_gitlab_http_status(:ok)
       expect(json_response['changes'].size).to eq(merge_request.diffs.size)
     end
 
     it 'returns a 404 when merge_request_iid not found' do
       get api("/projects/#{project.id}/merge_requests/0/changes", user)
-      expect(response).to have_gitlab_http_status(404)
+      expect(response).to have_gitlab_http_status(:not_found)
     end
 
     it 'returns a 404 when merge_request id is used instead of iid' do
       get api("/projects/#{project.id}/merge_requests/#{merge_request.id}/changes", user)
 
-      expect(response).to have_gitlab_http_status(404)
+      expect(response).to have_gitlab_http_status(:not_found)
     end
   end
 
@@ -1123,14 +1123,14 @@ describe API::MergeRequests do
       it 'exposes basic attributes' do
         get api("/projects/#{project.id}/merge_requests/#{merge_request.iid}/pipelines")
 
-        expect(response).to have_gitlab_http_status(200)
+        expect(response).to have_gitlab_http_status(:ok)
         expect(response).to match_response_schema('public_api/v4/pipelines')
       end
 
       it 'returns 404 if MR does not exist' do
         get api("/projects/#{project.id}/merge_requests/777/pipelines")
 
-        expect(response).to have_gitlab_http_status(404)
+        expect(response).to have_gitlab_http_status(:not_found)
       end
     end
 
@@ -1143,7 +1143,7 @@ describe API::MergeRequests do
 
         get api("/projects/#{project.id}/merge_requests/#{merge_request.iid}/pipelines", guest)
 
-        expect(response).to have_gitlab_http_status(403)
+        expect(response).to have_gitlab_http_status(:forbidden)
       end
     end
   end
@@ -1186,7 +1186,7 @@ describe API::MergeRequests do
     context 'when authorized' do
       it 'creates and returns the new Pipeline' do
         expect { request }.to change(Ci::Pipeline, :count).by(1)
-        expect(response).to have_gitlab_http_status(200)
+        expect(response).to have_gitlab_http_status(:ok)
         expect(json_response).to be_a Hash
       end
     end
@@ -1196,7 +1196,7 @@ describe API::MergeRequests do
 
       it 'responds with a blank 404' do
         expect { request }.not_to change(Ci::Pipeline, :count)
-        expect(response).to have_gitlab_http_status(404)
+        expect(response).to have_gitlab_http_status(:not_found)
       end
     end
 
@@ -1205,7 +1205,7 @@ describe API::MergeRequests do
 
       it 'responds with a blank 404' do
         expect { request }.not_to change(Ci::Pipeline, :count)
-        expect(response).to have_gitlab_http_status(404)
+        expect(response).to have_gitlab_http_status(:not_found)
       end
     end
   end
@@ -1225,7 +1225,7 @@ describe API::MergeRequests do
       it 'creates a new merge request' do
         post api("/projects/#{project.id}/merge_requests", user), params: params
 
-        expect(response).to have_gitlab_http_status(201)
+        expect(response).to have_gitlab_http_status(:created)
         expect(json_response['title']).to eq('Test merge request')
         expect(json_response['assignee']['name']).to eq(user2.name)
         expect(json_response['assignees'].first['name']).to eq(user2.name)
@@ -1236,7 +1236,7 @@ describe API::MergeRequests do
 
         post api("/projects/#{project.id}/merge_requests", user), params: params
 
-        expect(response).to have_gitlab_http_status(201)
+        expect(response).to have_gitlab_http_status(:created)
         expect(json_response['title']).to eq('Test merge request')
         expect(json_response['assignee']).to be_nil
       end
@@ -1249,7 +1249,7 @@ describe API::MergeRequests do
 
         post api("/projects/#{private_project.id}/merge_requests", user), params: params
 
-        expect(response).to have_gitlab_http_status(201)
+        expect(response).to have_gitlab_http_status(:created)
         expect(json_response['assignee']).to be_nil
       end
     end
@@ -1268,7 +1268,7 @@ describe API::MergeRequests do
       it 'creates a new project merge request with no more than one assignee' do
         post api("/projects/#{project.id}/merge_requests", user), params: params
 
-        expect(response).to have_gitlab_http_status(201)
+        expect(response).to have_gitlab_http_status(:created)
         expect(json_response['title']).to eq('Test merge request')
         expect(json_response['assignees'].count).to eq(1)
         expect(json_response['assignees'].first['name']).to eq(user.name)
@@ -1294,7 +1294,7 @@ describe API::MergeRequests do
             params[:labels] = labels
             post api("/projects/#{project.id}/merge_requests", user), params: params
 
-            expect(response).to have_gitlab_http_status(201)
+            expect(response).to have_gitlab_http_status(:created)
             expect(json_response['title']).to eq('Test merge_request')
             expect(json_response['labels']).to eq(%w(label label2))
             expect(json_response['milestone']['id']).to eq(milestone.id)
@@ -1319,7 +1319,7 @@ describe API::MergeRequests do
           params[:labels] = 'label, label?, label&foo, ?, &'
           post api("/projects/#{project.id}/merge_requests", user), params: params
 
-          expect(response).to have_gitlab_http_status(201)
+          expect(response).to have_gitlab_http_status(:created)
           expect(json_response['labels']).to include 'label'
           expect(json_response['labels']).to include 'label?'
           expect(json_response['labels']).to include 'label&foo'
@@ -1331,7 +1331,7 @@ describe API::MergeRequests do
           params[:labels] = ['label', 'label?', 'label&foo, ?, &', '1, 2', 3, 4]
           post api("/projects/#{project.id}/merge_requests", user), params: params
 
-          expect(response).to have_gitlab_http_status(201)
+          expect(response).to have_gitlab_http_status(:created)
           expect(json_response['labels']).to include 'label'
           expect(json_response['labels']).to include 'label?'
           expect(json_response['labels']).to include 'label&foo'
@@ -1347,7 +1347,7 @@ describe API::MergeRequests do
           params[:labels] = ''
           post api("/projects/#{project.id}/merge_requests", user), params: params
 
-          expect(response).to have_gitlab_http_status(201)
+          expect(response).to have_gitlab_http_status(:created)
           expect(json_response['labels']).to eq([])
         end
 
@@ -1357,7 +1357,7 @@ describe API::MergeRequests do
             params: params.to_json,
             headers: { 'Content-Type': 'application/json' }
 
-          expect(response).to have_gitlab_http_status(201)
+          expect(response).to have_gitlab_http_status(:created)
           expect(json_response['labels']).to eq([])
         end
 
@@ -1365,7 +1365,7 @@ describe API::MergeRequests do
           params[:labels] = []
           post api("/projects/#{project.id}/merge_requests", user), params: params
 
-          expect(response).to have_gitlab_http_status(201)
+          expect(response).to have_gitlab_http_status(:created)
           expect(json_response['labels']).to eq([])
         end
 
@@ -1373,7 +1373,7 @@ describe API::MergeRequests do
           params[:labels] = ['']
           post api("/projects/#{project.id}/merge_requests", user), params: params
 
-          expect(response).to have_gitlab_http_status(201)
+          expect(response).to have_gitlab_http_status(:created)
           expect(json_response['labels']).to eq([])
         end
 
@@ -1381,7 +1381,7 @@ describe API::MergeRequests do
           params[:labels] = ['', '', '']
           post api("/projects/#{project.id}/merge_requests", user), params: params
 
-          expect(response).to have_gitlab_http_status(201)
+          expect(response).to have_gitlab_http_status(:created)
           expect(json_response['labels']).to eq([])
         end
       end
@@ -1389,25 +1389,25 @@ describe API::MergeRequests do
       it "returns 422 when source_branch equals target_branch" do
         post api("/projects/#{project.id}/merge_requests", user),
         params: { title: "Test merge_request", source_branch: "master", target_branch: "master", author: user }
-        expect(response).to have_gitlab_http_status(422)
+        expect(response).to have_gitlab_http_status(:unprocessable_entity)
       end
 
       it "returns 400 when source_branch is missing" do
         post api("/projects/#{project.id}/merge_requests", user),
         params: { title: "Test merge_request", target_branch: "master", author: user }
-        expect(response).to have_gitlab_http_status(400)
+        expect(response).to have_gitlab_http_status(:bad_request)
       end
 
       it "returns 400 when target_branch is missing" do
         post api("/projects/#{project.id}/merge_requests", user),
         params: { title: "Test merge_request", source_branch: "markdown", author: user }
-        expect(response).to have_gitlab_http_status(400)
+        expect(response).to have_gitlab_http_status(:bad_request)
       end
 
       it "returns 400 when title is missing" do
         post api("/projects/#{project.id}/merge_requests", user),
         params: { target_branch: 'master', source_branch: 'markdown' }
-        expect(response).to have_gitlab_http_status(400)
+        expect(response).to have_gitlab_http_status(:bad_request)
       end
 
       context 'with existing MR' do
@@ -1432,7 +1432,7 @@ describe API::MergeRequests do
                    author: user
                  }
           end.to change { MergeRequest.count }.by(0)
-          expect(response).to have_gitlab_http_status(409)
+          expect(response).to have_gitlab_http_status(:conflict)
         end
       end
 
@@ -1471,7 +1471,7 @@ describe API::MergeRequests do
       it "returns merge_request" do
         post api("/projects/#{forked_project.id}/merge_requests", user2),
           params: { title: 'Test merge_request', source_branch: "feature_conflict", target_branch: "master", author: user2, target_project_id: project.id, description: 'Test description for Test merge_request' }
-        expect(response).to have_gitlab_http_status(201)
+        expect(response).to have_gitlab_http_status(:created)
         expect(json_response['title']).to eq('Test merge_request')
         expect(json_response['description']).to eq('Test description for Test merge_request')
       end
@@ -1482,7 +1482,7 @@ describe API::MergeRequests do
         expect(forked_project.forked_from_project).to eq(project)
         post api("/projects/#{forked_project.id}/merge_requests", user2),
         params: { title: 'Test merge_request', source_branch: "master", target_branch: "master", author: user2, target_project_id: project.id }
-        expect(response).to have_gitlab_http_status(201)
+        expect(response).to have_gitlab_http_status(:created)
         expect(json_response['title']).to eq('Test merge_request')
       end
 
@@ -1498,31 +1498,31 @@ describe API::MergeRequests do
                target_project_id: project.id
              }
 
-        expect(response).to have_gitlab_http_status(403)
+        expect(response).to have_gitlab_http_status(:forbidden)
       end
 
       it "returns 400 when source_branch is missing" do
         post api("/projects/#{forked_project.id}/merge_requests", user2),
         params: { title: 'Test merge_request', target_branch: "master", author: user2, target_project_id: project.id }
-        expect(response).to have_gitlab_http_status(400)
+        expect(response).to have_gitlab_http_status(:bad_request)
       end
 
       it "returns 400 when target_branch is missing" do
         post api("/projects/#{forked_project.id}/merge_requests", user2),
         params: { title: 'Test merge_request', target_branch: "master", author: user2, target_project_id: project.id }
-        expect(response).to have_gitlab_http_status(400)
+        expect(response).to have_gitlab_http_status(:bad_request)
       end
 
       it "returns 400 when title is missing" do
         post api("/projects/#{forked_project.id}/merge_requests", user2),
         params: { target_branch: 'master', source_branch: 'markdown', author: user2, target_project_id: project.id }
-        expect(response).to have_gitlab_http_status(400)
+        expect(response).to have_gitlab_http_status(:bad_request)
       end
 
       it 'allows setting `allow_collaboration`', :sidekiq_might_not_need_inline do
         post api("/projects/#{forked_project.id}/merge_requests", user2),
              params: { title: 'Test merge_request', source_branch: "feature_conflict", target_branch: "master", author: user2, target_project_id: project.id, allow_collaboration: true }
-        expect(response).to have_gitlab_http_status(201)
+        expect(response).to have_gitlab_http_status(:created)
         expect(json_response['allow_collaboration']).to be_truthy
         expect(json_response['allow_maintainer_to_push']).to be_truthy
       end
@@ -1541,20 +1541,20 @@ describe API::MergeRequests do
 
           post api("/projects/#{forked_project.id}/merge_requests", user2), params: params
 
-          expect(response).to have_gitlab_http_status(422)
+          expect(response).to have_gitlab_http_status(:unprocessable_entity)
         end
 
         it 'returns 403 if targeting a different fork which user can not access' do
           post api("/projects/#{forked_project.id}/merge_requests", user2), params: params
 
-          expect(response).to have_gitlab_http_status(403)
+          expect(response).to have_gitlab_http_status(:forbidden)
         end
       end
 
       it "returns 201 when target_branch is specified and for the same project", :sidekiq_might_not_need_inline do
         post api("/projects/#{forked_project.id}/merge_requests", user2),
         params: { title: 'Test merge_request', target_branch: 'master', source_branch: 'markdown', author: user2, target_project_id: forked_project.id }
-        expect(response).to have_gitlab_http_status(201)
+        expect(response).to have_gitlab_http_status(:created)
       end
     end
   end
@@ -1585,7 +1585,7 @@ describe API::MergeRequests do
     describe 'when authenticated' do
       it 'creates and returns the new context commit' do
         post api("/projects/#{project.id}/merge_requests/#{merge_request_iid}/context_commits", authenticated_user), params: params
-        expect(response).to have_gitlab_http_status(201)
+        expect(response).to have_gitlab_http_status(:created)
         expect(json_response).to be_an Array
         expect(json_response.first['short_id']).to eq(commit.short_id)
         expect(json_response.first['title']).to eq(commit.title)
@@ -1602,46 +1602,46 @@ describe API::MergeRequests do
         end
         it 'returns 400 when the context commit is already created' do
           post api("/projects/#{project.id}/merge_requests/#{merge_request_iid}/context_commits", authenticated_user), params: params
-          expect(response).to have_gitlab_http_status(400)
+          expect(response).to have_gitlab_http_status(:bad_request)
           expect(json_response['message']).to eq("Context commits: [\"#{commit.id}\"] are already created")
         end
       end
 
       it 'returns 400 when one or more shas are invalid' do
         post api("/projects/#{project.id}/merge_requests/#{merge_request_iid}/context_commits", authenticated_user), params: params_invalid_shas
-        expect(response).to have_gitlab_http_status(400)
+        expect(response).to have_gitlab_http_status(:bad_request)
         expect(json_response['message']).to eq('One or more context commits\' sha is not valid.')
       end
 
       it 'returns 400 when the commits are empty' do
         post api("/projects/#{project.id}/merge_requests/#{merge_request_iid}/context_commits", authenticated_user), params: params_empty_commits
-        expect(response).to have_gitlab_http_status(400)
+        expect(response).to have_gitlab_http_status(:bad_request)
       end
 
       it 'returns 400 when params is empty' do
         post api("/projects/#{project.id}/merge_requests/#{merge_request_iid}/context_commits", authenticated_user)
-        expect(response).to have_gitlab_http_status(400)
+        expect(response).to have_gitlab_http_status(:bad_request)
       end
 
       it 'returns 403 when creating new context commit for guest role' do
         guest = create(:user)
         project.add_guest(guest)
         post api("/projects/#{project.id}/merge_requests/#{merge_request_iid}/context_commits", guest), params: params
-        expect(response).to have_gitlab_http_status(403)
+        expect(response).to have_gitlab_http_status(:forbidden)
       end
 
       it 'returns 403 when creating new context commit for reporter role' do
         reporter = create(:user)
         project.add_reporter(reporter)
         post api("/projects/#{project.id}/merge_requests/#{merge_request_iid}/context_commits", reporter), params: params
-        expect(response).to have_gitlab_http_status(403)
+        expect(response).to have_gitlab_http_status(:forbidden)
       end
     end
 
     context 'when unauthenticated' do
       it 'returns 401 if user tries to create context commits' do
         post api("/projects/#{project.id}/merge_requests/#{merge_request_iid}/context_commits"), params: params
-        expect(response).to have_gitlab_http_status(401)
+        expect(response).to have_gitlab_http_status(:unauthorized)
       end
     end
   end
@@ -1656,7 +1656,7 @@ describe API::MergeRequests do
 
       it "denies the deletion of the merge request" do
         delete api("/projects/#{project.id}/merge_requests/#{merge_request.iid}", developer)
-        expect(response).to have_gitlab_http_status(403)
+        expect(response).to have_gitlab_http_status(:forbidden)
       end
     end
 
@@ -1664,19 +1664,19 @@ describe API::MergeRequests do
       it "destroys the merge request owners can destroy" do
         delete api("/projects/#{project.id}/merge_requests/#{merge_request.iid}", user)
 
-        expect(response).to have_gitlab_http_status(204)
+        expect(response).to have_gitlab_http_status(:no_content)
       end
 
       it "returns 404 for an invalid merge request IID" do
         delete api("/projects/#{project.id}/merge_requests/12345", user)
 
-        expect(response).to have_gitlab_http_status(404)
+        expect(response).to have_gitlab_http_status(:not_found)
       end
 
       it "returns 404 if the merge request id is used instead of iid" do
         delete api("/projects/#{project.id}/merge_requests/#{merge_request.id}", user)
 
-        expect(response).to have_gitlab_http_status(404)
+        expect(response).to have_gitlab_http_status(:not_found)
       end
 
       it_behaves_like '412 response' do
@@ -1712,40 +1712,40 @@ describe API::MergeRequests do
       it "deletes context commit" do
         delete api("/projects/#{project.id}/merge_requests/#{merge_request.iid}/context_commits", authenticated_user), params: params
 
-        expect(response).to have_gitlab_http_status(204)
+        expect(response).to have_gitlab_http_status(:no_content)
       end
 
       it "returns 400 when invalid commit sha is passed" do
         delete api("/projects/#{project.id}/merge_requests/#{merge_request.iid}/context_commits", authenticated_user), params: params_invalid_shas
 
-        expect(response).to have_gitlab_http_status(400)
+        expect(response).to have_gitlab_http_status(:bad_request)
         expect(json_response["message"]).to eq('One or more context commits\' sha is not valid.')
       end
 
       it "returns 400 when commits is empty" do
         delete api("/projects/#{project.id}/merge_requests/#{merge_request.iid}/context_commits", authenticated_user), params: params_empty_commits
 
-        expect(response).to have_gitlab_http_status(400)
+        expect(response).to have_gitlab_http_status(:bad_request)
       end
 
       it "returns 400 when no params is passed" do
         delete api("/projects/#{project.id}/merge_requests/#{merge_request.iid}/context_commits", authenticated_user)
 
-        expect(response).to have_gitlab_http_status(400)
+        expect(response).to have_gitlab_http_status(:bad_request)
       end
 
       it 'returns 403 when deleting existing context commit for guest role' do
         guest = create(:user)
         project.add_guest(guest)
         delete api("/projects/#{project.id}/merge_requests/#{merge_request_iid}/context_commits", guest), params: params
-        expect(response).to have_gitlab_http_status(403)
+        expect(response).to have_gitlab_http_status(:forbidden)
       end
 
       it 'returns 403 when deleting existing context commit for reporter role' do
         reporter = create(:user)
         project.add_reporter(reporter)
         delete api("/projects/#{project.id}/merge_requests/#{merge_request_iid}/context_commits", reporter), params: params
-        expect(response).to have_gitlab_http_status(403)
+        expect(response).to have_gitlab_http_status(:forbidden)
       end
     end
 
@@ -1753,7 +1753,7 @@ describe API::MergeRequests do
       it "returns 401, unauthorised error" do
         delete api("/projects/#{project.id}/merge_requests/#{merge_request.iid}/context_commits")
 
-        expect(response).to have_gitlab_http_status(401)
+        expect(response).to have_gitlab_http_status(:unauthorized)
       end
     end
   end
@@ -1764,7 +1764,7 @@ describe API::MergeRequests do
     it "returns merge_request in case of success" do
       put api("/projects/#{project.id}/merge_requests/#{merge_request.iid}/merge", user)
 
-      expect(response).to have_gitlab_http_status(200)
+      expect(response).to have_gitlab_http_status(:ok)
     end
 
     it "returns 406 if branch can't be merged" do
@@ -1773,21 +1773,21 @@ describe API::MergeRequests do
 
       put api("/projects/#{project.id}/merge_requests/#{merge_request.iid}/merge", user)
 
-      expect(response).to have_gitlab_http_status(406)
+      expect(response).to have_gitlab_http_status(:not_acceptable)
       expect(json_response['message']).to eq('Branch cannot be merged')
     end
 
     it "returns 405 if merge_request is not open" do
       merge_request.close
       put api("/projects/#{project.id}/merge_requests/#{merge_request.iid}/merge", user)
-      expect(response).to have_gitlab_http_status(405)
+      expect(response).to have_gitlab_http_status(:method_not_allowed)
       expect(json_response['message']).to eq('405 Method Not Allowed')
     end
 
     it "returns 405 if merge_request is a work in progress" do
       merge_request.update_attribute(:title, "WIP: #{merge_request.title}")
       put api("/projects/#{project.id}/merge_requests/#{merge_request.iid}/merge", user)
-      expect(response).to have_gitlab_http_status(405)
+      expect(response).to have_gitlab_http_status(:method_not_allowed)
       expect(json_response['message']).to eq('405 Method Not Allowed')
     end
 
@@ -1801,7 +1801,7 @@ describe API::MergeRequests do
 
       put api("/projects/#{project.id}/merge_requests/#{merge_request.iid}/merge", user)
 
-      expect(response).to have_gitlab_http_status(405)
+      expect(response).to have_gitlab_http_status(:method_not_allowed)
       expect(json_response['message']).to eq('405 Method Not Allowed')
     end
 
@@ -1809,21 +1809,21 @@ describe API::MergeRequests do
       user2 = create(:user)
       project.add_reporter(user2)
       put api("/projects/#{project.id}/merge_requests/#{merge_request.iid}/merge", user2)
-      expect(response).to have_gitlab_http_status(401)
+      expect(response).to have_gitlab_http_status(:unauthorized)
       expect(json_response['message']).to eq('401 Unauthorized')
     end
 
     it "returns 409 if the SHA parameter doesn't match" do
       put api("/projects/#{project.id}/merge_requests/#{merge_request.iid}/merge", user), params: { sha: merge_request.diff_head_sha.reverse }
 
-      expect(response).to have_gitlab_http_status(409)
+      expect(response).to have_gitlab_http_status(:conflict)
       expect(json_response['message']).to start_with('SHA does not match HEAD of source branch')
     end
 
     it "succeeds if the SHA parameter matches" do
       put api("/projects/#{project.id}/merge_requests/#{merge_request.iid}/merge", user), params: { sha: merge_request.diff_head_sha }
 
-      expect(response).to have_gitlab_http_status(200)
+      expect(response).to have_gitlab_http_status(:ok)
     end
 
     it "updates the MR's squash attribute" do
@@ -1831,7 +1831,7 @@ describe API::MergeRequests do
         put api("/projects/#{project.id}/merge_requests/#{merge_request.iid}/merge", user), params: { squash: true }
       end.to change { merge_request.reload.squash }
 
-      expect(response).to have_gitlab_http_status(200)
+      expect(response).to have_gitlab_http_status(:ok)
     end
 
     it 'does not merge if merge_when_pipeline_succeeds is passed and the pipeline has failed' do
@@ -1842,7 +1842,7 @@ describe API::MergeRequests do
 
       put api("/projects/#{project.id}/merge_requests/#{merge_request.iid}/merge", user), params: { merge_when_pipeline_succeeds: true }
 
-      expect(response).to have_gitlab_http_status(405)
+      expect(response).to have_gitlab_http_status(:method_not_allowed)
       expect(merge_request.reload.state).to eq('opened')
     end
 
@@ -1851,7 +1851,7 @@ describe API::MergeRequests do
 
       put api("/projects/#{project.id}/merge_requests/#{merge_request.iid}/merge", user), params: { merge_when_pipeline_succeeds: true }
 
-      expect(response).to have_gitlab_http_status(200)
+      expect(response).to have_gitlab_http_status(:ok)
       expect(json_response['state']).to eq('merged')
     end
 
@@ -1861,7 +1861,7 @@ describe API::MergeRequests do
 
       put api("/projects/#{project.id}/merge_requests/#{merge_request.iid}/merge", user), params: { merge_when_pipeline_succeeds: true }
 
-      expect(response).to have_gitlab_http_status(200)
+      expect(response).to have_gitlab_http_status(:ok)
       expect(json_response['title']).to eq('Test')
       expect(json_response['merge_when_pipeline_succeeds']).to eq(true)
     end
@@ -1873,7 +1873,7 @@ describe API::MergeRequests do
 
       put api("/projects/#{project.id}/merge_requests/#{merge_request.iid}/merge", user), params: { merge_when_pipeline_succeeds: true }
 
-      expect(response).to have_gitlab_http_status(200)
+      expect(response).to have_gitlab_http_status(:ok)
       expect(json_response['title']).to eq('Test')
       expect(json_response['merge_when_pipeline_succeeds']).to eq(true)
     end
@@ -1881,13 +1881,13 @@ describe API::MergeRequests do
     it "returns 404 for an invalid merge request IID" do
       put api("/projects/#{project.id}/merge_requests/12345/merge", user)
 
-      expect(response).to have_gitlab_http_status(404)
+      expect(response).to have_gitlab_http_status(:not_found)
     end
 
     it "returns 404 if the merge request id is used instead of iid" do
       put api("/projects/#{project.id}/merge_requests/#{merge_request.id}/merge", user)
 
-      expect(response).to have_gitlab_http_status(404)
+      expect(response).to have_gitlab_http_status(:not_found)
     end
 
     describe "the squash_commit_message param" do
@@ -1923,7 +1923,7 @@ describe API::MergeRequests do
           params: { should_remove_source_branch: true }
         )
 
-        expect(response).to have_gitlab_http_status(200)
+        expect(response).to have_gitlab_http_status(:ok)
         expect(source_repository.branch_exists?(source_branch)).to be_falsy
       end
     end
@@ -1938,7 +1938,7 @@ describe API::MergeRequests do
       it "records the squash commit SHA and returns it in the response" do
         put api("/projects/#{project.id}/merge_requests/#{merge_request.iid}/merge", user)
 
-        expect(response).to have_gitlab_http_status(200)
+        expect(response).to have_gitlab_http_status(:ok)
         expect(json_response['squash_commit_sha'].length).to eq(40)
       end
     end
@@ -1958,7 +1958,7 @@ describe API::MergeRequests do
     it 'returns the generated ID from the merge service in case of success' do
       get api(url, user)
 
-      expect(response).to have_gitlab_http_status(200)
+      expect(response).to have_gitlab_http_status(:ok)
       expect(json_response['commit_id']).to eq(merge_request.merge_ref_head.sha)
     end
 
@@ -1970,7 +1970,7 @@ describe API::MergeRequests do
       it 'returns 200 if MR can be merged' do
         get api(url, user)
 
-        expect(response).to have_gitlab_http_status(200)
+        expect(response).to have_gitlab_http_status(:ok)
         expect(json_response['commit_id']).to eq(merge_request.merge_ref_head.sha)
       end
 
@@ -1981,7 +1981,7 @@ describe API::MergeRequests do
 
         get api(url, user)
 
-        expect(response).to have_gitlab_http_status(400)
+        expect(response).to have_gitlab_http_status(:bad_request)
         expect(json_response['message']).to eq('Merge request is not mergeable')
       end
     end
@@ -1995,7 +1995,7 @@ describe API::MergeRequests do
 
         get api(url, user)
 
-        expect(response).to have_gitlab_http_status(404)
+        expect(response).to have_gitlab_http_status(:not_found)
         expect(json_response['message']).to eq('404 Not found')
       end
     end
@@ -2006,7 +2006,7 @@ describe API::MergeRequests do
       it 'returns 404' do
         get api(url, user)
 
-        expect(response).to have_gitlab_http_status(404)
+        expect(response).to have_gitlab_http_status(:not_found)
       end
     end
 
@@ -2016,7 +2016,7 @@ describe API::MergeRequests do
       it 'returns 404' do
         get api(url, user)
 
-        expect(response).to have_gitlab_http_status(404)
+        expect(response).to have_gitlab_http_status(:not_found)
       end
     end
   end
@@ -2030,7 +2030,7 @@ describe API::MergeRequests do
 
         put api("/projects/#{project.id}/merge_requests/#{merge_request.iid}", user), params: { state_event: "close", remove_source_branch: false }
 
-        expect(response).to have_gitlab_http_status(200)
+        expect(response).to have_gitlab_http_status(:ok)
         expect(json_response['state']).to eq('closed')
         expect(json_response['force_remove_source_branch']).to be_falsey
       end
@@ -2042,7 +2042,7 @@ describe API::MergeRequests do
 
         put api("/projects/#{project.id}/merge_requests/#{merge_request.iid}", user), params: { state_event: "close", remove_source_branch: true }
 
-        expect(response).to have_gitlab_http_status(200)
+        expect(response).to have_gitlab_http_status(:ok)
         expect(json_response['state']).to eq('closed')
         expect(json_response['force_remove_source_branch']).to be_truthy
       end
@@ -2063,7 +2063,7 @@ describe API::MergeRequests do
         it 'is true for an authorized user' do
           put api("/projects/#{target_project.id}/merge_requests/#{merge_request.iid}", fork_owner), params: { state_event: 'close', remove_source_branch: true }
 
-          expect(response).to have_gitlab_http_status(200)
+          expect(response).to have_gitlab_http_status(:ok)
           expect(json_response['state']).to eq('closed')
           expect(json_response['force_remove_source_branch']).to be true
         end
@@ -2073,7 +2073,7 @@ describe API::MergeRequests do
             put api("/projects/#{target_project.id}/merge_requests/#{merge_request.iid}", target_project.owner), params: { state_event: 'close', remove_source_branch: true }
           end.not_to change { merge_request.reload.merge_params }
 
-          expect(response).to have_gitlab_http_status(200)
+          expect(response).to have_gitlab_http_status(:ok)
           expect(json_response['state']).to eq('closed')
           expect(json_response['force_remove_source_branch']).to be false
         end
@@ -2084,46 +2084,46 @@ describe API::MergeRequests do
       it "returns merge_request" do
         put api("/projects/#{project.id}/merge_requests/#{merge_request.iid}", user), params: { state_event: "close" }
 
-        expect(response).to have_gitlab_http_status(200)
+        expect(response).to have_gitlab_http_status(:ok)
         expect(json_response['state']).to eq('closed')
       end
     end
 
     it "updates title and returns merge_request" do
       put api("/projects/#{project.id}/merge_requests/#{merge_request.iid}", user), params: { title: "New title" }
-      expect(response).to have_gitlab_http_status(200)
+      expect(response).to have_gitlab_http_status(:ok)
       expect(json_response['title']).to eq('New title')
     end
 
     it "updates description and returns merge_request" do
       put api("/projects/#{project.id}/merge_requests/#{merge_request.iid}", user), params: { description: "New description" }
-      expect(response).to have_gitlab_http_status(200)
+      expect(response).to have_gitlab_http_status(:ok)
       expect(json_response['description']).to eq('New description')
     end
 
     it "updates milestone_id and returns merge_request" do
       put api("/projects/#{project.id}/merge_requests/#{merge_request.iid}", user), params: { milestone_id: milestone.id }
-      expect(response).to have_gitlab_http_status(200)
+      expect(response).to have_gitlab_http_status(:ok)
       expect(json_response['milestone']['id']).to eq(milestone.id)
     end
 
     it "updates squash and returns merge_request" do
       put api("/projects/#{project.id}/merge_requests/#{merge_request.iid}", user), params: { squash: true }
 
-      expect(response).to have_gitlab_http_status(200)
+      expect(response).to have_gitlab_http_status(:ok)
       expect(json_response['squash']).to be_truthy
     end
 
     it "returns merge_request with renamed target_branch" do
       put api("/projects/#{project.id}/merge_requests/#{merge_request.iid}", user), params: { target_branch: "wiki" }
-      expect(response).to have_gitlab_http_status(200)
+      expect(response).to have_gitlab_http_status(:ok)
       expect(json_response['target_branch']).to eq('wiki')
     end
 
     it "returns merge_request that removes the source branch" do
       put api("/projects/#{project.id}/merge_requests/#{merge_request.iid}", user), params: { remove_source_branch: true }
 
-      expect(response).to have_gitlab_http_status(200)
+      expect(response).to have_gitlab_http_status(:ok)
       expect(json_response['force_remove_source_branch']).to be_truthy
     end
 
@@ -2136,7 +2136,7 @@ describe API::MergeRequests do
 
       put api("/projects/#{private_project.id}/merge_requests/#{mr.iid}", user), params: params
 
-      expect(response).to have_gitlab_http_status(200)
+      expect(response).to have_gitlab_http_status(:ok)
       expect(json_response['assignee']).to be_nil
     end
 
@@ -2236,7 +2236,7 @@ describe API::MergeRequests do
       put api("/projects/#{project.id}/merge_requests/#{merge_request.iid}", user), params: { state_event: 'close', title: nil }
 
       merge_request.reload
-      expect(response).to have_gitlab_http_status(400)
+      expect(response).to have_gitlab_http_status(:bad_request)
       expect(merge_request.state).to eq('opened')
     end
 
@@ -2244,20 +2244,20 @@ describe API::MergeRequests do
       put api("/projects/#{project.id}/merge_requests/#{merge_request.iid}", user), params: { state_event: 'close', target_branch: nil }
 
       merge_request.reload
-      expect(response).to have_gitlab_http_status(400)
+      expect(response).to have_gitlab_http_status(:bad_request)
       expect(merge_request.state).to eq('opened')
     end
 
     it "returns 404 for an invalid merge request IID" do
       put api("/projects/#{project.id}/merge_requests/12345", user), params: { state_event: "close" }
 
-      expect(response).to have_gitlab_http_status(404)
+      expect(response).to have_gitlab_http_status(:not_found)
     end
 
     it "returns 404 if the merge request id is used instead of iid" do
       put api("/projects/#{project.id}/merge_requests/#{merge_request.id}", user), params: { state_event: "close" }
 
-      expect(response).to have_gitlab_http_status(404)
+      expect(response).to have_gitlab_http_status(:not_found)
     end
   end
 
@@ -2310,19 +2310,19 @@ describe API::MergeRequests do
 
       get api("/projects/#{project.id}/merge_requests/#{merge_request.iid}/closes_issues", guest)
 
-      expect(response).to have_gitlab_http_status(403)
+      expect(response).to have_gitlab_http_status(:forbidden)
     end
 
     it "returns 404 for an invalid merge request IID" do
       get api("/projects/#{project.id}/merge_requests/12345/closes_issues", user)
 
-      expect(response).to have_gitlab_http_status(404)
+      expect(response).to have_gitlab_http_status(:not_found)
     end
 
     it "returns 404 if the merge request id is used instead of iid" do
       get api("/projects/#{project.id}/merge_requests/#{merge_request.id}/closes_issues", user)
 
-      expect(response).to have_gitlab_http_status(404)
+      expect(response).to have_gitlab_http_status(:not_found)
     end
   end
 
@@ -2330,26 +2330,26 @@ describe API::MergeRequests do
     it 'subscribes to a merge request' do
       post api("/projects/#{project.id}/merge_requests/#{merge_request.iid}/subscribe", admin)
 
-      expect(response).to have_gitlab_http_status(201)
+      expect(response).to have_gitlab_http_status(:created)
       expect(json_response['subscribed']).to eq(true)
     end
 
     it 'returns 304 if already subscribed' do
       post api("/projects/#{project.id}/merge_requests/#{merge_request.iid}/subscribe", user)
 
-      expect(response).to have_gitlab_http_status(304)
+      expect(response).to have_gitlab_http_status(:not_modified)
     end
 
     it 'returns 404 if the merge request is not found' do
       post api("/projects/#{project.id}/merge_requests/123/subscribe", user)
 
-      expect(response).to have_gitlab_http_status(404)
+      expect(response).to have_gitlab_http_status(:not_found)
     end
 
     it 'returns 404 if the merge request id is used instead of iid' do
       post api("/projects/#{project.id}/merge_requests/#{merge_request.id}/subscribe", user)
 
-      expect(response).to have_gitlab_http_status(404)
+      expect(response).to have_gitlab_http_status(:not_found)
     end
 
     it 'returns 403 if user has no access to read code' do
@@ -2358,7 +2358,7 @@ describe API::MergeRequests do
 
       post api("/projects/#{project.id}/merge_requests/#{merge_request.iid}/subscribe", guest)
 
-      expect(response).to have_gitlab_http_status(403)
+      expect(response).to have_gitlab_http_status(:forbidden)
     end
   end
 
@@ -2366,26 +2366,26 @@ describe API::MergeRequests do
     it 'unsubscribes from a merge request' do
       post api("/projects/#{project.id}/merge_requests/#{merge_request.iid}/unsubscribe", user)
 
-      expect(response).to have_gitlab_http_status(201)
+      expect(response).to have_gitlab_http_status(:created)
       expect(json_response['subscribed']).to eq(false)
     end
 
     it 'returns 304 if not subscribed' do
       post api("/projects/#{project.id}/merge_requests/#{merge_request.iid}/unsubscribe", admin)
 
-      expect(response).to have_gitlab_http_status(304)
+      expect(response).to have_gitlab_http_status(:not_modified)
     end
 
     it 'returns 404 if the merge request is not found' do
       post api("/projects/#{project.id}/merge_requests/123/unsubscribe", user)
 
-      expect(response).to have_gitlab_http_status(404)
+      expect(response).to have_gitlab_http_status(:not_found)
     end
 
     it 'returns 404 if the merge request id is used instead of iid' do
       post api("/projects/#{project.id}/merge_requests/#{merge_request.id}/unsubscribe", user)
 
-      expect(response).to have_gitlab_http_status(404)
+      expect(response).to have_gitlab_http_status(:not_found)
     end
 
     it 'returns 403 if user has no access to read code' do
@@ -2394,7 +2394,7 @@ describe API::MergeRequests do
 
       post api("/projects/#{project.id}/merge_requests/#{merge_request.iid}/unsubscribe", guest)
 
-      expect(response).to have_gitlab_http_status(403)
+      expect(response).to have_gitlab_http_status(:forbidden)
     end
   end
 
@@ -2406,19 +2406,19 @@ describe API::MergeRequests do
     it 'removes the merge_when_pipeline_succeeds status' do
       post api("/projects/#{project.id}/merge_requests/#{merge_request.iid}/cancel_merge_when_pipeline_succeeds", user)
 
-      expect(response).to have_gitlab_http_status(201)
+      expect(response).to have_gitlab_http_status(:created)
     end
 
     it 'returns 404 if the merge request is not found' do
       post api("/projects/#{project.id}/merge_requests/123/cancel_merge_when_pipeline_succeeds", user)
 
-      expect(response).to have_gitlab_http_status(404)
+      expect(response).to have_gitlab_http_status(:not_found)
     end
 
     it 'returns 404 if the merge request id is used instead of iid' do
       post api("/projects/#{project.id}/merge_requests/#{merge_request.id}/cancel_merge_when_pipeline_succeeds", user)
 
-      expect(response).to have_gitlab_http_status(404)
+      expect(response).to have_gitlab_http_status(:not_found)
     end
   end
 
@@ -2431,7 +2431,7 @@ describe API::MergeRequests do
           end.to change { RebaseWorker.jobs.size }.by(1)
         end
 
-        expect(response).to have_gitlab_http_status(202)
+        expect(response).to have_gitlab_http_status(:accepted)
         expect(merge_request.reload).to be_rebase_in_progress
         expect(json_response['rebase_in_progress']).to be(true)
       end
@@ -2446,7 +2446,7 @@ describe API::MergeRequests do
             end.to change { RebaseWorker.jobs.size }.by(1)
           end
 
-          expect(response).to have_gitlab_http_status(202)
+          expect(response).to have_gitlab_http_status(:accepted)
           expect(merge_request.reload).to be_rebase_in_progress
           expect(json_response['rebase_in_progress']).to be(true)
         end
@@ -2459,7 +2459,7 @@ describe API::MergeRequests do
 
       put api("/projects/#{project.id}/merge_requests/#{merge_request.iid}/rebase", guest)
 
-      expect(response).to have_gitlab_http_status(403)
+      expect(response).to have_gitlab_http_status(:forbidden)
     end
 
     it 'returns 409 if a rebase is already in progress' do
@@ -2469,7 +2469,7 @@ describe API::MergeRequests do
         put api("/projects/#{project.id}/merge_requests/#{merge_request.iid}/rebase", user)
       end
 
-      expect(response).to have_gitlab_http_status(409)
+      expect(response).to have_gitlab_http_status(:conflict)
     end
 
     it "returns 409 if rebase can't lock the row" do
@@ -2478,7 +2478,7 @@ describe API::MergeRequests do
 
       put api("/projects/#{project.id}/merge_requests/#{merge_request.iid}/rebase", user)
 
-      expect(response).to have_gitlab_http_status(409)
+      expect(response).to have_gitlab_http_status(:conflict)
       expect(json_response['message']).to eq('Failed to enqueue the rebase operation, possibly due to a long-lived transaction. Try again later.')
     end
   end
diff --git a/spec/requests/api/namespaces_spec.rb b/spec/requests/api/namespaces_spec.rb
index e0bf1509be3..68fffc638df 100644
--- a/spec/requests/api/namespaces_spec.rb
+++ b/spec/requests/api/namespaces_spec.rb
@@ -12,7 +12,7 @@ describe API::Namespaces do
     context "when unauthenticated" do
       it "returns authentication error" do
         get api("/namespaces")
-        expect(response).to have_gitlab_http_status(401)
+        expect(response).to have_gitlab_http_status(:unauthorized)
       end
     end
 
@@ -23,7 +23,7 @@ describe API::Namespaces do
         group_kind_json_response = json_response.find { |resource| resource['kind'] == 'group' }
         user_kind_json_response = json_response.find { |resource| resource['kind'] == 'user' }
 
-        expect(response).to have_gitlab_http_status(200)
+        expect(response).to have_gitlab_http_status(:ok)
         expect(response).to include_pagination_headers
         expect(group_kind_json_response.keys).to include('id', 'kind', 'name', 'path', 'full_path',
                                                          'parent_id', 'members_count_with_descendants')
@@ -34,7 +34,7 @@ describe API::Namespaces do
       it "admin: returns an array of all namespaces" do
         get api("/namespaces", admin)
 
-        expect(response).to have_gitlab_http_status(200)
+        expect(response).to have_gitlab_http_status(:ok)
         expect(response).to include_pagination_headers
         expect(json_response).to be_an Array
         expect(json_response.length).to eq(Namespace.count)
@@ -43,7 +43,7 @@ describe API::Namespaces do
       it "admin: returns an array of matched namespaces" do
         get api("/namespaces?search=#{group2.name}", admin)
 
-        expect(response).to have_gitlab_http_status(200)
+        expect(response).to have_gitlab_http_status(:ok)
         expect(response).to include_pagination_headers
         expect(json_response).to be_an Array
         expect(json_response.length).to eq(1)
@@ -77,7 +77,7 @@ describe API::Namespaces do
       it "user: returns an array of namespaces" do
         get api("/namespaces", user)
 
-        expect(response).to have_gitlab_http_status(200)
+        expect(response).to have_gitlab_http_status(:ok)
         expect(response).to include_pagination_headers
         expect(json_response).to be_an Array
         expect(json_response.length).to eq(1)
@@ -86,7 +86,7 @@ describe API::Namespaces do
       it "admin: returns an array of matched namespaces" do
         get api("/namespaces?search=#{user.username}", user)
 
-        expect(response).to have_gitlab_http_status(200)
+        expect(response).to have_gitlab_http_status(:ok)
         expect(response).to include_pagination_headers
         expect(json_response).to be_an Array
         expect(json_response.length).to eq(1)
@@ -102,7 +102,7 @@ describe API::Namespaces do
       it 'returns namespace details' do
         get api("/namespaces/#{namespace_id}", request_actor)
 
-        expect(response).to have_gitlab_http_status(200)
+        expect(response).to have_gitlab_http_status(:ok)
 
         expect(json_response['id']).to eq(requested_namespace.id)
         expect(json_response['path']).to eq(requested_namespace.path)
@@ -153,7 +153,7 @@ describe API::Namespaces do
         it 'returns not-found' do
           get api('/namespaces/0', request_actor)
 
-          expect(response).to have_gitlab_http_status(404)
+          expect(response).to have_gitlab_http_status(:not_found)
         end
       end
     end
@@ -162,7 +162,7 @@ describe API::Namespaces do
       it 'returns authentication error' do
         get api("/namespaces/#{group1.id}")
 
-        expect(response).to have_gitlab_http_status(401)
+        expect(response).to have_gitlab_http_status(:unauthorized)
       end
     end
 
@@ -174,7 +174,7 @@ describe API::Namespaces do
           it 'returns not-found' do
             get api("/namespaces/#{group2.id}", request_actor)
 
-            expect(response).to have_gitlab_http_status(404)
+            expect(response).to have_gitlab_http_status(:not_found)
           end
         end
 
@@ -182,7 +182,7 @@ describe API::Namespaces do
           it 'returns not-found' do
             get api("/namespaces/#{user2.namespace.id}", request_actor)
 
-            expect(response).to have_gitlab_http_status(404)
+            expect(response).to have_gitlab_http_status(:not_found)
           end
         end
       end
diff --git a/spec/requests/api/notes_spec.rb b/spec/requests/api/notes_spec.rb
index b4416344ecf..6cf978e717e 100644
--- a/spec/requests/api/notes_spec.rb
+++ b/spec/requests/api/notes_spec.rb
@@ -72,7 +72,7 @@ describe API::Notes do
           it "returns an empty array" do
             get api("/projects/#{ext_proj.id}/issues/#{ext_issue.iid}/notes", user)
 
-            expect(response).to have_gitlab_http_status(200)
+            expect(response).to have_gitlab_http_status(:ok)
             expect(response).to include_pagination_headers
             expect(json_response).to be_an Array
             expect(json_response).to be_empty
@@ -86,7 +86,7 @@ describe API::Notes do
             it "returns 404" do
               get api("/projects/#{ext_proj.id}/issues/#{ext_issue.iid}/notes", user)
 
-              expect(response).to have_gitlab_http_status(404)
+              expect(response).to have_gitlab_http_status(:not_found)
             end
           end
         end
@@ -95,7 +95,7 @@ describe API::Notes do
           it "returns a non-empty array" do
             get api("/projects/#{ext_proj.id}/issues/#{ext_issue.iid}/notes", private_user)
 
-            expect(response).to have_gitlab_http_status(200)
+            expect(response).to have_gitlab_http_status(:ok)
             expect(response).to include_pagination_headers
             expect(json_response).to be_an Array
             expect(json_response.first['body']).to eq(cross_reference_note.note)
@@ -114,7 +114,7 @@ describe API::Notes do
 
           shared_examples 'a notes request' do
             it 'is a note array response' do
-              expect(response).to have_gitlab_http_status(200)
+              expect(response).to have_gitlab_http_status(:ok)
               expect(response).to include_pagination_headers
               expect(json_response).to be_an Array
             end
@@ -177,7 +177,7 @@ describe API::Notes do
           it "returns a 404 error" do
             get api("/projects/#{ext_proj.id}/issues/#{ext_issue.iid}/notes/#{cross_reference_note.id}", user)
 
-            expect(response).to have_gitlab_http_status(404)
+            expect(response).to have_gitlab_http_status(:not_found)
           end
 
           context "when issue is confidential" do
@@ -188,7 +188,7 @@ describe API::Notes do
             it "returns 404" do
               get api("/projects/#{project.id}/issues/#{issue.iid}/notes/#{issue_note.id}", private_user)
 
-              expect(response).to have_gitlab_http_status(404)
+              expect(response).to have_gitlab_http_status(:not_found)
             end
           end
         end
@@ -197,7 +197,7 @@ describe API::Notes do
           it "returns an issue note by id" do
             get api("/projects/#{ext_proj.id}/issues/#{ext_issue.iid}/notes/#{cross_reference_note.id}", private_user)
 
-            expect(response).to have_gitlab_http_status(200)
+            expect(response).to have_gitlab_http_status(:ok)
             expect(json_response['body']).to eq(cross_reference_note.note)
           end
         end
@@ -237,7 +237,7 @@ describe API::Notes do
         it 'returns 200 status' do
           subject
 
-          expect(response).to have_gitlab_http_status(201)
+          expect(response).to have_gitlab_http_status(:created)
         end
 
         it 'creates a new note' do
@@ -251,7 +251,7 @@ describe API::Notes do
         it 'returns 403 status' do
           subject
 
-          expect(response).to have_gitlab_http_status(403)
+          expect(response).to have_gitlab_http_status(:forbidden)
         end
 
         it 'does not create a new note' do
diff --git a/spec/requests/api/notification_settings_spec.rb b/spec/requests/api/notification_settings_spec.rb
index 09fc0197c58..cbdab2f53a6 100644
--- a/spec/requests/api/notification_settings_spec.rb
+++ b/spec/requests/api/notification_settings_spec.rb
@@ -11,7 +11,7 @@ describe API::NotificationSettings do
     it "returns global notification settings for the current user" do
       get api("/notification_settings", user)
 
-      expect(response).to have_gitlab_http_status(200)
+      expect(response).to have_gitlab_http_status(:ok)
       expect(json_response).to be_a Hash
       expect(json_response['notification_email']).to eq(user.notification_email)
       expect(json_response['level']).to eq(user.global_notification_setting.level)
@@ -24,7 +24,7 @@ describe API::NotificationSettings do
     it "updates global notification settings for the current user" do
       put api("/notification_settings", user), params: { level: 'watch', notification_email: email.email }
 
-      expect(response).to have_gitlab_http_status(200)
+      expect(response).to have_gitlab_http_status(:ok)
       expect(json_response['notification_email']).to eq(email.email)
       expect(user.reload.notification_email).to eq(email.email)
       expect(json_response['level']).to eq(user.reload.global_notification_setting.level)
@@ -35,7 +35,7 @@ describe API::NotificationSettings do
     it "fails on non-user email address" do
       put api("/notification_settings", user), params: { notification_email: 'invalid@example.com' }
 
-      expect(response).to have_gitlab_http_status(400)
+      expect(response).to have_gitlab_http_status(:bad_request)
     end
   end
 
@@ -43,7 +43,7 @@ describe API::NotificationSettings do
     it "returns group level notification settings for the current user" do
       get api("/groups/#{group.id}/notification_settings", user)
 
-      expect(response).to have_gitlab_http_status(200)
+      expect(response).to have_gitlab_http_status(:ok)
       expect(json_response).to be_a Hash
       expect(json_response['level']).to eq(user.notification_settings_for(group).level)
     end
@@ -53,7 +53,7 @@ describe API::NotificationSettings do
     it "updates group level notification settings for the current user" do
       put api("/groups/#{group.id}/notification_settings", user), params: { level: 'watch' }
 
-      expect(response).to have_gitlab_http_status(200)
+      expect(response).to have_gitlab_http_status(:ok)
       expect(json_response['level']).to eq(user.reload.notification_settings_for(group).level)
     end
   end
@@ -62,7 +62,7 @@ describe API::NotificationSettings do
     it "returns project level notification settings for the current user" do
       get api("/projects/#{project.id}/notification_settings", user)
 
-      expect(response).to have_gitlab_http_status(200)
+      expect(response).to have_gitlab_http_status(:ok)
       expect(json_response).to be_a Hash
       expect(json_response['level']).to eq(user.notification_settings_for(project).level)
     end
@@ -72,7 +72,7 @@ describe API::NotificationSettings do
     it "updates project level notification settings for the current user" do
       put api("/projects/#{project.id}/notification_settings", user), params: { level: 'custom', new_note: true }
 
-      expect(response).to have_gitlab_http_status(200)
+      expect(response).to have_gitlab_http_status(:ok)
       expect(json_response['level']).to eq(user.reload.notification_settings_for(project).level)
       expect(json_response['events']['new_note']).to be_truthy
       expect(json_response['events']['new_issue']).to be_falsey
@@ -83,7 +83,7 @@ describe API::NotificationSettings do
     it "fails on invalid level" do
       put api("/projects/#{project.id}/notification_settings", user), params: { level: 'invalid' }
 
-      expect(response).to have_gitlab_http_status(400)
+      expect(response).to have_gitlab_http_status(:bad_request)
     end
   end
 end
diff --git a/spec/requests/api/oauth_tokens_spec.rb b/spec/requests/api/oauth_tokens_spec.rb
index ce03756a19a..80eae97f41a 100644
--- a/spec/requests/api/oauth_tokens_spec.rb
+++ b/spec/requests/api/oauth_tokens_spec.rb
@@ -14,7 +14,7 @@ describe 'OAuth tokens' do
 
         request_oauth_token(user)
 
-        expect(response).to have_gitlab_http_status(401)
+        expect(response).to have_gitlab_http_status(:unauthorized)
         expect(json_response['error']).to eq('invalid_grant')
       end
     end
@@ -25,7 +25,7 @@ describe 'OAuth tokens' do
 
         request_oauth_token(user)
 
-        expect(response).to have_gitlab_http_status(200)
+        expect(response).to have_gitlab_http_status(:ok)
         expect(json_response['access_token']).not_to be_nil
       end
     end
@@ -33,7 +33,7 @@ describe 'OAuth tokens' do
     shared_examples 'does not create an access token' do
       let(:user) { create(:user) }
 
-      it { expect(response).to have_gitlab_http_status(401) }
+      it { expect(response).to have_gitlab_http_status(:unauthorized) }
     end
 
     context 'when user is blocked' do
diff --git a/spec/requests/api/runner_spec.rb b/spec/requests/api/runner_spec.rb
index 9d01a44916c..e9657c903e9 100644
--- a/spec/requests/api/runner_spec.rb
+++ b/spec/requests/api/runner_spec.rb
@@ -1979,6 +1979,21 @@ describe API::Runner, :clean_gitlab_redis_shared_state do
           end
         end
 
+        context 'when object storage throws errors' do
+          let(:params) { { artifact_type: :archive, artifact_format: :zip } }
+
+          it 'does not store artifacts' do
+            allow_next_instance_of(JobArtifactUploader) do |uploader|
+              allow(uploader).to receive(:store!).and_raise(Errno::EIO)
+            end
+
+            upload_artifacts(file_upload, headers_with_token, params)
+
+            expect(response).to have_gitlab_http_status(:service_unavailable)
+            expect(job.reload.job_artifacts_archive).to be_nil
+          end
+        end
+
         context 'when artifacts are being stored outside of tmp path' do
           let(:new_tmpdir) { Dir.mktmpdir }
 
-- 
cgit v1.2.1