Merge branch 'pl-rubocop-have-gitlab-http-status-spec-requests-api-7' into 'master'

Add http status cop to all remaining specs Closes #196163 See merge request gitlab-org/gitlab!25178

Merge branch 'pl-rubocop-have-gitlab-http-status-spec-requests-api-7' into 'master'
Add http status cop to all remaining specs Closes #196163 See merge request gitlab-org/gitlab!25178
dff852a9 · Heinrich Lee Yu · d0713e85 · 7589af48 · dff852a9 · dff852a9
Commit dff852a9 authored Mar 03, 2020 by Heinrich Lee Yu
19 changed files
--- a/.rubocop.yml
+++ b/.rubocop.yml
@@ -331,26 +331,13 @@ RSpec/MissingExampleGroupArgument:
 RSpec/UnspecifiedException:
  Enabled: false
-# Work in progress. See https://gitlab.com/gitlab-org/gitlab/issues/196163
 RSpec/HaveGitlabHttpStatus:
  Enabled: true
  Exclude:
    - 'spec/support/matchers/have_gitlab_http_status.rb'
  Include:
-    - 'spec/support/**/*'
+    - 'spec/**/*'
-    - 'ee/spec/support/**/*'
+    - 'ee/spec/**/*'
-    - 'spec/features/**/*'
-    - 'ee/spec/features/**/*'
-    - 'spec/controllers/**/*'
-    - 'ee/spec/controllers/**/*'
-    - 'spec/requests/*.rb'
-    - 'ee/spec/requests/*.rb'
-    - 'spec/requests/{groups,projects,repositories}/**/*'
-    - 'ee/spec/requests/{groups,projects,repositories}/**/*'
-    - 'spec/requests/api/*/**/*.rb'
-    - 'ee/spec/requests/api/*/**/*.rb'
-    - 'spec/requests/api/[a-s]*.rb'
-    - 'ee/spec/requests/api/[a-s]*.rb'
 Style/MultilineWhenThen:
  Enabled: false

--- a/ee/spec/requests/api/templates_spec.rb
+++ b/ee/spec/requests/api/templates_spec.rb
@@ -27,7 +27,7 @@ describe API::Templates do
        stub_licensed_features(custom_file_templates: true)
        get api("/templates/#{type}")
-        expect(response).to have_gitlab_http_status(200)
+        expect(response).to have_gitlab_http_status(:ok)
        expect(json_response).to satisfy_one { |template| template['name'] == 'custom' }
      end
@@ -35,7 +35,7 @@ describe API::Templates do
        stub_licensed_features(custom_file_templates: false)
        get api("/templates/#{type}")
-        expect(response).to have_gitlab_http_status(200)
+        expect(response).to have_gitlab_http_status(:ok)
        expect(json_response).to satisfy_none { |template| template['name'] == 'custom' }
      end
    end
@@ -45,7 +45,7 @@ describe API::Templates do
        stub_licensed_features(custom_file_templates: true)
        get api("/templates/#{type}/custom")
-        expect(response).to have_gitlab_http_status(200)
+        expect(response).to have_gitlab_http_status(:ok)
        expect(json_response['name']).to eq('custom')
        expect(json_response['content']).to eq("Custom #{type}")
      end
@@ -54,7 +54,7 @@ describe API::Templates do
        stub_licensed_features(custom_file_templates: false)
        get api("/templates/#{type}/custom")
-        expect(response).to have_gitlab_http_status(404)
+        expect(response).to have_gitlab_http_status(:not_found)
      end
    end
  end

--- a/ee/spec/requests/api/todos_spec.rb
+++ b/ee/spec/requests/api/todos_spec.rb
@@ -119,7 +119,7 @@ describe API::Todos do
      it 'returns 403 forbidden error' do
        subject
-        expect(response).to have_gitlab_http_status(403)
+        expect(response).to have_gitlab_http_status(:forbidden)
      end
    end
@@ -163,7 +163,7 @@ describe API::Todos do
        subject
-        expect(response).to have_gitlab_http_status(404)
+        expect(response).to have_gitlab_http_status(:not_found)
      end
    end
  end

--- a/ee/spec/requests/api/triggers_spec.rb
+++ b/ee/spec/requests/api/triggers_spec.rb
@@ -21,7 +21,7 @@ describe API::Triggers do
        it 'does not leak the presence of project when using valid token' do
          subject
-          expect(response).to have_http_status(404)
+          expect(response).to have_gitlab_http_status(:not_found)
        end
      end
@@ -31,7 +31,7 @@ describe API::Triggers do
        it 'does not leak the presence of project when using valid token' do
          subject
-          expect(response).to have_http_status(404)
+          expect(response).to have_gitlab_http_status(:not_found)
        end
      end
@@ -46,7 +46,7 @@ describe API::Triggers do
          it 'forbids to create a pipeline' do
            subject
-            expect(response).to have_http_status(400)
+            expect(response).to have_gitlab_http_status(:bad_request)
            expect(json_response['message']).to eq("base" => ["Insufficient permissions to create a new pipeline"])
          end
        end
@@ -59,7 +59,7 @@ describe API::Triggers do
          it 'creates a new pipeline' do
            expect { subject }.to change(Ci::Pipeline, :count)
-            expect(response).to have_http_status(201)
+            expect(response).to have_gitlab_http_status(:created)
            expect(Ci::Pipeline.last.source).to eq('pipeline')
            expect(Ci::Pipeline.last.triggered_by_pipeline).not_to be_nil
            expect(Ci::Sources::Pipeline.last).to have_attributes(
@@ -78,7 +78,7 @@ describe API::Triggers do
            it 'does not create a pipeline' do
              subject
-              expect(response).to have_http_status(400)
+              expect(response).to have_gitlab_http_status(:bad_request)
              expect(json_response['message']).to eq('400 Job has to be running')
            end
          end
@@ -93,7 +93,7 @@ describe API::Triggers do
              expect { subject }.to change(Ci::Pipeline, :count)
                                .and change(Ci::PipelineVariable, :count)
-              expect(response).to have_http_status(201)
+              expect(response).to have_gitlab_http_status(:created)
              expect(Ci::Pipeline.last.source).to eq('pipeline')
              expect(Ci::Pipeline.last.triggered_by_pipeline).not_to be_nil
              expect(Ci::Pipeline.last.variables.map { |v| { v.key => v.value } }.last).to eq(params[:variables])

--- a/ee/spec/requests/api/unleash_spec.rb
+++ b/ee/spec/requests/api/unleash_spec.rb
@@ -23,7 +23,7 @@ describe API::Unleash do
      it 'responds with OK' do
        subject
-        expect(response).to have_gitlab_http_status(200)
+        expect(response).to have_gitlab_http_status(:ok)
      end
      context 'when feature is not available' do
@@ -32,7 +32,7 @@ describe API::Unleash do
        it 'responds with forbidden' do
          subject
-          expect(response).to have_gitlab_http_status(403)
+          expect(response).to have_gitlab_http_status(:forbidden)
        end
      end
    end
@@ -44,7 +44,7 @@ describe API::Unleash do
      it 'responds with OK' do
        subject
-        expect(response).to have_gitlab_http_status(200)
+        expect(response).to have_gitlab_http_status(:ok)
      end
    end
@@ -54,7 +54,7 @@ describe API::Unleash do
      it 'responds with unauthorized' do
        subject
-        expect(response).to have_gitlab_http_status(401)
+        expect(response).to have_gitlab_http_status(:unauthorized)
      end
    end
@@ -65,7 +65,7 @@ describe API::Unleash do
      it 'responds with unauthorized' do
        subject
-        expect(response).to have_gitlab_http_status(401)
+        expect(response).to have_gitlab_http_status(:unauthorized)
      end
    end
  end
@@ -168,7 +168,7 @@ describe API::Unleash do
        it 'responds with a list of features' do
          subject
-          expect(response).to have_gitlab_http_status(200)
+          expect(response).to have_gitlab_http_status(:ok)
          expect(json_response['version']).to eq(1)
          expect(json_response['features']).not_to be_empty
          expect(json_response['features'].map { |f| f['name'] }.sort).to eq(%w[feature1 feature2])

--- a/ee/spec/requests/api/users_spec.rb
+++ b/ee/spec/requests/api/users_spec.rb
@@ -11,7 +11,7 @@ describe API::Users do
      it 'updates the user with new name' do
        put api("/users/#{user.id}", admin), params: { name: 'New Name' }
-        expect(response).to have_gitlab_http_status(200)
+        expect(response).to have_gitlab_http_status(:ok)
        expect(json_response['name']).to eq('New Name')
      end
    end
@@ -68,7 +68,7 @@ describe API::Users do
          end.to change { user.reload.shared_runners_minutes_limit }
                   .from(nil).to(133)
-          expect(response).to have_gitlab_http_status(200)
+          expect(response).to have_gitlab_http_status(:ok)
          expect(json_response['shared_runners_minutes_limit']).to eq(133)
        end
      end
@@ -79,7 +79,7 @@ describe API::Users do
            put api("/users/#{user.id}", user), params: { shared_runners_minutes_limit: 133 }
          end.not_to change { user.reload.shared_runners_minutes_limit }
-          expect(response).to have_gitlab_http_status(403)
+          expect(response).to have_gitlab_http_status(:forbidden)
        end
      end
    end
@@ -91,7 +91,7 @@ describe API::Users do
    it 'creates user with new identity' do
      post api("/users", admin), params: attributes_for(:user, provider: 'group_saml', extern_uid: '67890', group_id_for_saml: saml_provider.group.id)
-      expect(response).to have_gitlab_http_status(201)
+      expect(response).to have_gitlab_http_status(:created)
      expect(json_response['identities'].first['extern_uid']).to eq('67890')
      expect(json_response['identities'].first['provider']).to eq('group_saml')
      expect(json_response['identities'].first['saml_provider_id']).to eq(saml_provider.id)
@@ -100,7 +100,7 @@ describe API::Users do
    it 'creates user with new identity without sending reset password email' do
      post api("/users", admin), params: attributes_for(:user, reset_password: false, provider: 'group_saml', extern_uid: '67890', group_id_for_saml: saml_provider.group.id)
-      expect(response).to have_gitlab_http_status(201)
+      expect(response).to have_gitlab_http_status(:created)
      new_user = User.find(json_response['id'])
      expect(new_user.recently_sent_password_reset?).to eq(false)
@@ -109,7 +109,7 @@ describe API::Users do
    it 'updates user with new identity' do
      put api("/users/#{user.id}", admin), params: { provider: 'group_saml', extern_uid: '67890', group_id_for_saml: saml_provider.group.id }
-      expect(response).to have_gitlab_http_status(200)
+      expect(response).to have_gitlab_http_status(:ok)
      expect(json_response['identities'].first['extern_uid']).to eq('67890')
      expect(json_response['identities'].first['provider']).to eq('group_saml')
      expect(json_response['identities'].first['saml_provider_id']).to eq(saml_provider.id)
@@ -117,13 +117,13 @@ describe API::Users do
    it 'fails to update user with nonexistent identity' do
      put api("/users/#{user.id}", admin), params: { provider: 'group_saml', extern_uid: '67890', group_id_for_saml: 15 }
-      expect(response).to have_gitlab_http_status(400)
+      expect(response).to have_gitlab_http_status(:bad_request)
      expect(json_response['message']).to eq({ "identities.saml_provider_id" => ["can't be blank"] })
    end
    it 'fails to update user with nonexistent provider' do
      put api("/users/#{user.id}", admin), params: { provider: nil, extern_uid: '67890', group_id_for_saml: saml_provider.group.id }
-      expect(response).to have_gitlab_http_status(400)
+      expect(response).to have_gitlab_http_status(:bad_request)
      expect(json_response['message']).to eq({ "identities.provider" => ["can't be blank"] })
    end
  end
@@ -183,7 +183,7 @@ describe API::Users do
            put api("/users/#{user.id}", user), params: { note: 'new note' }
          end.not_to change { user.reload.note }
-          expect(response).to have_gitlab_http_status(403)
+          expect(response).to have_gitlab_http_status(:forbidden)
        end
      end
    end

--- a/ee/spec/requests/api/visual_review_discussions_spec.rb
+++ b/ee/spec/requests/api/visual_review_discussions_spec.rb
@@ -50,7 +50,7 @@ describe API::VisualReviewDiscussions do
      end
      it 'responds with a status 201 Created' do
-        expect(response).to have_gitlab_http_status(201)
+        expect(response).to have_gitlab_http_status(:created)
      end
      it 'returns the persisted note body' do
@@ -72,7 +72,7 @@ describe API::VisualReviewDiscussions do
      it 'returns a 400 bad request error if body not given' do
        expect { request }.not_to change(merge_request.notes, :count)
-        expect(response).to have_gitlab_http_status(400)
+        expect(response).to have_gitlab_http_status(:bad_request)
      end
    end
@@ -87,7 +87,7 @@ describe API::VisualReviewDiscussions do
        it 'responds with a status 404' do
          request
-          expect(response).to have_gitlab_http_status(404)
+          expect(response).to have_gitlab_http_status(:not_found)
        end
      end
    end
@@ -107,7 +107,7 @@ describe API::VisualReviewDiscussions do
        end
        it 'responds 403' do
-          expect(response).to have_gitlab_http_status(403)
+          expect(response).to have_gitlab_http_status(:forbidden)
        end
        it 'returns error messaging specifying that the feature is disabled' do
@@ -133,7 +133,7 @@ describe API::VisualReviewDiscussions do
        end
        it 'responds with a status 201 Created' do
-          expect(response).to have_gitlab_http_status(201)
+          expect(response).to have_gitlab_http_status(:created)
        end
        it 'returns the persisted note body' do

--- a/ee/spec/requests/api/vulnerabilities_spec.rb
+++ b/ee/spec/requests/api/vulnerabilities_spec.rb
@@ -25,7 +25,7 @@ describe API::Vulnerabilities do
      it 'returns all vulnerabilities of a project' do
        get_vulnerabilities
-        expect(response).to have_gitlab_http_status(200)
+        expect(response).to have_gitlab_http_status(:ok)
        expect(response).to include_pagination_headers
        expect(response).to match_response_schema('public_api/v4/vulnerabilities', dir: 'ee')
        expect(response.headers['X-Total']).to eq project.vulnerabilities.count.to_s
@@ -37,7 +37,7 @@ describe API::Vulnerabilities do
        it 'paginates the vulnerabilities according to the pagination params' do
          get_vulnerabilities
-          expect(response).to have_gitlab_http_status(200)
+          expect(response).to have_gitlab_http_status(:ok)
          expect(json_response.map { |v| v['id'] }).to contain_exactly(project.vulnerabilities.second.id)
        end
      end
@@ -74,7 +74,7 @@ describe API::Vulnerabilities do
      it 'returns the desired vulnerability' do
        get_vulnerability
-        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/vulnerability', dir: 'ee')
        expect(json_response['id']).to eq vulnerability_id
      end
@@ -82,7 +82,7 @@ describe API::Vulnerabilities do
      it 'returns the desired findings' do
        get_vulnerability
-        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/vulnerability', dir: 'ee')
        expect(json_response['finding']['id']).to eq finding.id
      end
@@ -131,7 +131,7 @@ describe API::Vulnerabilities do
            report_type: finding.report_type
          ))
-        expect(response).to have_gitlab_http_status(201)
+        expect(response).to have_gitlab_http_status(:created)
        expect(response).to match_response_schema('public_api/v4/vulnerability', dir: 'ee')
      end
@@ -141,7 +141,7 @@ describe API::Vulnerabilities do
        it 'responds with expected error' do
          subject
-          expect(response).to have_gitlab_http_status(400)
+          expect(response).to have_gitlab_http_status(:bad_request)
          expect(json_response['message']).to eq(expected_error_messages)
        end
      end
@@ -154,7 +154,7 @@ describe API::Vulnerabilities do
        it 'rejects creation of a new vulnerability from this finding' do
          subject
-          expect(response).to have_gitlab_http_status(400)
+          expect(response).to have_gitlab_http_status(:bad_request)
          expect(json_response['message']).to eq(expected_error_messages)
        end
      end
@@ -195,7 +195,7 @@ describe API::Vulnerabilities do
        Timecop.freeze do
          dismiss_vulnerability
-          expect(response).to have_gitlab_http_status(201)
+          expect(response).to have_gitlab_http_status(:created)
          expect(response).to match_response_schema('public_api/v4/vulnerability', dir: 'ee')
          expect(vulnerability.reload).to(
@@ -231,7 +231,7 @@ describe API::Vulnerabilities do
        it 'responds with error' do
          dismiss_vulnerability
-          expect(response).to have_gitlab_http_status(400)
+          expect(response).to have_gitlab_http_status(:bad_request)
          expect(json_response['message']).to eq('base' => ['something went wrong'])
        end
      end
@@ -242,7 +242,7 @@ describe API::Vulnerabilities do
        it 'responds with 304 Not Modified' do
          dismiss_vulnerability
-          expect(response).to have_gitlab_http_status(304)
+          expect(response).to have_gitlab_http_status(:not_modified)
        end
      end
@@ -282,7 +282,7 @@ describe API::Vulnerabilities do
        Timecop.freeze do
          resolve_vulnerability
-          expect(response).to have_gitlab_http_status(201)
+          expect(response).to have_gitlab_http_status(:created)
          expect(response).to match_response_schema('public_api/v4/vulnerability', dir: 'ee')
          expect(vulnerability.reload).to(
@@ -299,7 +299,7 @@ describe API::Vulnerabilities do
        it 'responds with 304 Not Modified response' do
          resolve_vulnerability
-          expect(response).to have_gitlab_http_status(304)
+          expect(response).to have_gitlab_http_status(:not_modified)
        end
      end
@@ -339,7 +339,7 @@ describe API::Vulnerabilities do
        Timecop.freeze do
          confirm_vulnerability
-          expect(response).to have_gitlab_http_status(201)
+          expect(response).to have_gitlab_http_status(:created)
          expect(response).to match_response_schema('public_api/v4/vulnerability', dir: 'ee')
          expect(vulnerability.reload).to(
@@ -356,7 +356,7 @@ describe API::Vulnerabilities do
        it 'responds with 304 Not Modified response' do
          confirm_vulnerability
-          expect(response).to have_gitlab_http_status(304)
+          expect(response).to have_gitlab_http_status(:not_modified)
        end
      end

--- a/ee/spec/requests/api/vulnerability_findings_spec.rb
+++ b/ee/spec/requests/api/vulnerability_findings_spec.rb
@@ -53,7 +53,7 @@ describe API::VulnerabilityFindings do
        get api(project_vulnerability_findings_path, user), params: pagination
-        expect(response).to have_gitlab_http_status(200)
+        expect(response).to have_gitlab_http_status(:ok)
        expect(response).to include_pagination_headers
        expect(response).to match_response_schema('vulnerabilities/occurrence_list', dir: 'ee')
@@ -78,7 +78,7 @@ describe API::VulnerabilityFindings do
          get api(project_vulnerability_findings_path, user), params: { report_type: 'sast' }
-          expect(response).to have_gitlab_http_status(200)
+          expect(response).to have_gitlab_http_status(:ok)
          expect(response.headers['X-Total']).to eq occurrence_count
@@ -94,7 +94,7 @@ describe API::VulnerabilityFindings do
          get api(project_vulnerability_findings_path, user), params: { report_type: 'dependency_scanning' }
-          expect(response).to have_gitlab_http_status(200)
+          expect(response).to have_gitlab_http_status(:ok)
          expect(response.headers['X-Total']).to eq occurrence_count
@@ -108,7 +108,7 @@ describe API::VulnerabilityFindings do
        it 'returns a "bad request" response for an unknown report type' do
          get api(project_vulnerability_findings_path, user), params: { report_type: 'blah' }
-          expect(response).to have_gitlab_http_status(400)
+          expect(response).to have_gitlab_http_status(:bad_request)
        end
        it 'returns dismissed vulnerabilities with `all` scope' do
@@ -116,7 +116,7 @@ describe API::VulnerabilityFindings do
          get api(project_vulnerability_findings_path, user), params: { scope: 'all' }.merge(pagination)
-          expect(response).to have_gitlab_http_status(200)
+          expect(response).to have_gitlab_http_status(:ok)
          expect(response.headers['X-Total']).to eq occurrence_count
        end
@@ -124,7 +124,7 @@ describe API::VulnerabilityFindings do
        it 'returns vulnerabilities with low severity' do
          get api(project_vulnerability_findings_path, user), params: { severity: 'low' }.merge(pagination)
-          expect(response).to have_gitlab_http_status(200)
+          expect(response).to have_gitlab_http_status(:ok)
          expect(json_response.map { |v| v['severity'] }.uniq).to eq %w[low]
        end
@@ -132,13 +132,13 @@ describe API::VulnerabilityFindings do
        it 'returns a "bad request" response for an unknown severity value' do
          get api(project_vulnerability_findings_path, user), params: { severity: 'foo' }
-          expect(response).to have_gitlab_http_status(400)
+          expect(response).to have_gitlab_http_status(:bad_request)
        end
        it 'returns vulnerabilities with high confidence' do
          get api(project_vulnerability_findings_path, user), params: { confidence: 'high' }.merge(pagination)
-          expect(response).to have_gitlab_http_status(200)
+          expect(response).to have_gitlab_http_status(:ok)
          expect(json_response.map { |v| v['confidence'] }.uniq).to eq %w[high]
        end
@@ -146,7 +146,7 @@ describe API::VulnerabilityFindings do
        it 'returns a "bad request" response for an unknown confidence value' do
          get api(project_vulnerability_findings_path, user), params: { confidence: 'qux' }
-          expect(response).to have_gitlab_http_status(400)
+          expect(response).to have_gitlab_http_status(:bad_request)
        end
        context 'when pipeline_id is supplied' do
@@ -155,7 +155,7 @@ describe API::VulnerabilityFindings do
            get api(project_vulnerability_findings_path, user), params: { pipeline_id: pipeline.id }.merge(pagination)
-            expect(response).to have_gitlab_http_status(200)
+            expect(response).to have_gitlab_http_status(:ok)
            expect(response.headers['X-Total']).to eq occurrence_count
          end
@@ -186,7 +186,7 @@ describe API::VulnerabilityFindings do
        it 'responds with 403 Forbidden' do
          get api(project_vulnerability_findings_path, user)
-          expect(response).to have_gitlab_http_status(403)
+          expect(response).to have_gitlab_http_status(:forbidden)
        end
      end
    end

--- a/ee/spec/requests/api/vulnerability_issue_links_spec.rb
+++ b/ee/spec/requests/api/vulnerability_issue_links_spec.rb
@@ -27,7 +27,7 @@ describe API::VulnerabilityIssueLinks do
      it 'gets the list of vulnerabilities' do
        get_issue_links
-        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/vulnerability_related_issues', dir: 'ee')
        expect(json_response.map { |link| link['id'] }).to match_array(vulnerability.related_issues.map(&:id))
        expect(json_response.map { |link| link['vulnerability_link_id'] }).to(
@@ -73,7 +73,7 @@ describe API::VulnerabilityIssueLinks do
        it 'creates a new vulnerability-issue link' do
          create_issue_link
-          expect(response).to have_gitlab_http_status(201)
+          expect(response).to have_gitlab_http_status(:created)
          expect(response).to match_response_schema('public_api/v4/vulnerability_issue_link', dir: 'ee')
          expect(json_response['issue']['id']).to eq issue.id
          expect(json_response['vulnerability']['id']).to eq vulnerability.id
@@ -86,7 +86,7 @@ describe API::VulnerabilityIssueLinks do
        it 'responds with "not found" and specific error message' do
          create_issue_link
-          expect(response).to have_gitlab_http_status(404)
+          expect(response).to have_gitlab_http_status(:not_found)
        end
      end
@@ -98,7 +98,7 @@ describe API::VulnerabilityIssueLinks do
        it 'responds with "conflict" status code and specific error message' do
          create_issue_link
-          expect(response).to have_gitlab_http_status(422)
+          expect(response).to have_gitlab_http_status(:unprocessable_entity)
          expect(json_response['message']).to eq 'Issue has already been linked to another vulnerability'
        end
      end
@@ -113,7 +113,7 @@ describe API::VulnerabilityIssueLinks do
        it 'responds with "conflict" status code and specific error message' do
          create_issue_link
-          expect(response).to have_gitlab_http_status(422)
+          expect(response).to have_gitlab_http_status(:unprocessable_entity)
          expect(json_response['message']).to eq 'Vulnerability already has a "created" issue link'
        end
      end
@@ -124,7 +124,7 @@ describe API::VulnerabilityIssueLinks do
        it 'creates a new vulnerability-issue link' do
          create_issue_link
-          expect(response).to have_gitlab_http_status(201)
+          expect(response).to have_gitlab_http_status(:created)
        end
      end
@@ -164,7 +164,7 @@ describe API::VulnerabilityIssueLinks do
        it 'deletes the specified vulnerability-issue link' do
          delete_issue_link
-          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/vulnerability_issue_link', dir: 'ee')
          expect(json_response['issue']['id']).to eq vulnerability_issue_link.issue.id
          expect(json_response['vulnerability']['id']).to eq vulnerability_id
@@ -177,7 +177,7 @@ describe API::VulnerabilityIssueLinks do
        it 'responds with "not found" and specific error message' do
          delete_issue_link
-          expect(response).to have_gitlab_http_status(404)
+          expect(response).to have_gitlab_http_status(:not_found)
        end
      end

--- a/spec/requests/api/tags_spec.rb
+++ b/spec/requests/api/tags_spec.rb
@@ -61,7 +61,7 @@ describe API::Tags do
      it 'only returns searched tags' do
        get api("#{route}", user), params: { search: 'v1.1.0' }
-        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(1)
@@ -73,7 +73,7 @@ describe API::Tags do
      it 'returns the repository tags' do
        get api(route, current_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/tags')
        expect(response).to include_pagination_headers
        expect(json_response.map { |r| r['name'] }).to include(tag_name)
@@ -133,7 +133,7 @@ describe API::Tags do
      it 'returns an array of project tags with release info' do
        get api(route, 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/tags')
        expect(response).to include_pagination_headers
@@ -151,7 +151,7 @@ describe API::Tags do
      it 'returns the repository branch' do
        get api(route, current_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/tag')
        expect(json_response['name']).to eq(tag_name)
      end
@@ -214,7 +214,7 @@ describe API::Tags do
      it 'creates a new tag' do
        post api(route, current_user), params: { tag_name: tag_name, ref: 'master' }
-        expect(response).to have_gitlab_http_status(201)
+        expect(response).to have_gitlab_http_status(:created)
        expect(response).to match_response_schema('public_api/v4/tag')
        expect(json_response['name']).to eq(tag_name)
      end
@@ -269,26 +269,26 @@ describe API::Tags do
      it 'returns 400 if tag name is invalid' do
        post api(route, current_user), params: { tag_name: 'new design', ref: 'master' }
-        expect(response).to have_gitlab_http_status(400)
+        expect(response).to have_gitlab_http_status(:bad_request)
        expect(json_response['message']).to eq('Tag name invalid')
      end
      it 'returns 400 if tag already exists' do
        post api(route, current_user), params: { tag_name: 'new_design1', ref: 'master' }
-        expect(response).to have_gitlab_http_status(201)
+        expect(response).to have_gitlab_http_status(:created)
        expect(response).to match_response_schema('public_api/v4/tag')
        post api(route, current_user), params: { tag_name: 'new_design1', ref: 'master' }
-        expect(response).to have_gitlab_http_status(400)
+        expect(response).to have_gitlab_http_status(:bad_request)
        expect(json_response['message']).to eq('Tag new_design1 already exists')
      end
      it 'returns 400 if ref name is invalid' do
        post api(route, current_user), params: { tag_name: 'new_design3', ref: 'foo' }
-        expect(response).to have_gitlab_http_status(400)
+        expect(response).to have_gitlab_http_status(:bad_request)
        expect(json_response['message']).to eq('Target foo is invalid')
      end
@@ -296,7 +296,7 @@ describe API::Tags do
        it 'creates a new tag' do
          post api(route, current_user), params: { tag_name: tag_name, ref: 'master', release_description: 'Wow' }
-          expect(response).to have_gitlab_http_status(201)
+          expect(response).to have_gitlab_http_status(:created)
          expect(response).to match_response_schema('public_api/v4/tag')
          expect(json_response['name']).to eq(tag_name)
          expect(json_response['release']['description']).to eq('Wow')
@@ -315,7 +315,7 @@ describe API::Tags do
          post api(route, current_user), params: { tag_name: 'v7.1.0', ref: 'master', message: 'Release 7.1.0' }
-          expect(response).to have_gitlab_http_status(201)
+          expect(response).to have_gitlab_http_status(:created)
          expect(response).to match_response_schema('public_api/v4/tag')
          expect(json_response['name']).to eq('v7.1.0')
          expect(json_response['message']).to eq('Release 7.1.0')
@@ -337,7 +337,7 @@ describe API::Tags do
      it 'deletes a tag' do
        delete api(route, current_user)
-        expect(response).to have_gitlab_http_status(204)
+        expect(response).to have_gitlab_http_status(:no_content)
      end
      it_behaves_like '412 response' do
@@ -383,7 +383,7 @@ describe API::Tags do
      it 'creates description for existing git tag' do
        post api(route, user), params: { description: description }
-        expect(response).to have_gitlab_http_status(201)
+        expect(response).to have_gitlab_http_status(:created)
        expect(response).to match_response_schema('public_api/v4/release/tag_release')
        expect(json_response['tag_name']).to eq(tag_name)
        expect(json_response['description']).to eq(description)
@@ -424,7 +424,7 @@ describe API::Tags do
        it 'returns 409 if there is already a release' do
          post api(route, user), params: { description: description }
-          expect(response).to have_gitlab_http_status(409)
+          expect(response).to have_gitlab_http_status(:conflict)
          expect(json_response['message']).to eq('Release already exists')
        end
      end
@@ -449,7 +449,7 @@ describe API::Tags do
        it 'updates the release description' do
          put api(route, current_user), params: { description: new_description }
-          expect(response).to have_gitlab_http_status(200)
+          expect(response).to have_gitlab_http_status(:ok)
          expect(json_response['tag_name']).to eq(tag_name)
          expect(json_response['description']).to eq(new_description)
        end

--- a/spec/requests/api/task_completion_status_spec.rb
+++ b/spec/requests/api/task_completion_status_spec.rb
@@ -57,7 +57,7 @@ describe 'task completion status response' do
          get api("#{path}?iids[]=#{taskable.iid}", user)
        end
-        it { expect(response).to have_gitlab_http_status(200) }
+        it { expect(response).to have_gitlab_http_status(:ok) }
        it 'returns the expected results' do
          expect(json_response).to be_an Array

--- a/spec/requests/api/templates_spec.rb
+++ b/spec/requests/api/templates_spec.rb
@@ -25,7 +25,7 @@ describe API::Templates do
    it 'returns a list of available gitignore templates' do
      get api('/templates/gitignores')
-      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 be > 15
@@ -36,7 +36,7 @@ describe API::Templates do
    it 'returns a list of available gitlab_ci_ymls' do
      get api('/templates/gitlab_ci_ymls')
-      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['name']).not_to be_nil
@@ -47,7 +47,7 @@ describe API::Templates do
    it 'adds a disclaimer on the top' do
      get api('/templates/gitlab_ci_ymls/Ruby')
-      expect(response).to have_gitlab_http_status(200)
+      expect(response).to have_gitlab_http_status(:ok)
      expect(json_response['content']).to start_with("# This file is a template,")
    end
  end
@@ -58,7 +58,7 @@ describe API::Templates do
    end
    it 'returns a license template' do
-      expect(response).to have_gitlab_http_status(200)
+      expect(response).to have_gitlab_http_status(:ok)
      expect(json_response['key']).to eq('mit')
      expect(json_response['name']).to eq('MIT License')
@@ -78,7 +78,7 @@ describe API::Templates do
    it 'returns a list of available license templates' do
      get api('/templates/licenses')
-      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(12)
@@ -90,7 +90,7 @@ describe API::Templates do
        it 'returns a list of available popular license templates' do
          get api('/templates/licenses?popular=1')
-          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(3)
@@ -173,7 +173,7 @@ describe API::Templates do
        let(:license_type) { 'muth-over9000' }
        it 'returns a 404' do
-          expect(response).to have_gitlab_http_status(404)
+          expect(response).to have_gitlab_http_status(:not_found)
        end
      end
    end
@@ -185,7 +185,7 @@ describe API::Templates do
        it 'replaces the copyright owner placeholder with the name of the current user' do
          get api('/templates/licenses/mit', user)
-          expect(response).to have_gitlab_http_status(200)
+          expect(response).to have_gitlab_http_status(:ok)
          expect(json_response['content']).to include("Copyright (c) #{Time.now.year} #{user.name}")
        end
      end

--- a/spec/requests/api/todos_spec.rb
+++ b/spec/requests/api/todos_spec.rb
@@ -166,7 +166,7 @@ describe API::Todos do
      it 'returns authentication error' do
        post api("/todos/#{pending_1.id}/mark_as_done")
-        expect(response).to have_gitlab_http_status(401)
+        expect(response).to have_gitlab_http_status(:unauthorized)
      end
    end
@@ -174,7 +174,7 @@ describe API::Todos do
      it 'marks a todo as done' do
        post api("/todos/#{pending_1.id}/mark_as_done", john_doe)
-        expect(response).to have_gitlab_http_status(201)
+        expect(response).to have_gitlab_http_status(:created)
        expect(json_response['id']).to eq(pending_1.id)
        expect(json_response['state']).to eq('done')
        expect(pending_1.reload).to be_done
@@ -199,7 +199,7 @@ describe API::Todos do
      it 'returns authentication error' do
        post api('/todos/mark_as_done')
-        expect(response).to have_gitlab_http_status(401)
+        expect(response).to have_gitlab_http_status(:unauthorized)
      end
    end
@@ -207,7 +207,7 @@ describe API::Todos do
      it 'marks all todos as done' do
        post api('/todos/mark_as_done', john_doe)
-        expect(response).to have_gitlab_http_status(204)
+        expect(response).to have_gitlab_http_status(:no_content)
        expect(pending_1.reload).to be_done
        expect(pending_2.reload).to be_done
        expect(pending_3.reload).to be_done
@@ -258,9 +258,9 @@ describe API::Todos do
      post api("/projects/#{project_1.id}/#{issuable_type}/#{issuable.iid}/todo", guest)
      if issuable_type == 'merge_requests'
-        expect(response).to have_gitlab_http_status(403)
+        expect(response).to have_gitlab_http_status(:forbidden)
      else
-        expect(response).to have_gitlab_http_status(404)
+        expect(response).to have_gitlab_http_status(:not_found)
      end
    end
  end

--- a/spec/requests/api/triggers_spec.rb
+++ b/spec/requests/api/triggers_spec.rb
@@ -31,13 +31,13 @@ describe API::Triggers do
      it 'returns bad request if token is missing' do
        post api("/projects/#{project.id}/trigger/pipeline"), params: { ref: 'master' }
-        expect(response).to have_gitlab_http_status(400)
+        expect(response).to have_gitlab_http_status(:bad_request)
      end
      it 'returns not found if project is not found' do
        post api('/projects/0/trigger/pipeline'), params: options.merge(ref: 'master')
-        expect(response).to have_gitlab_http_status(404)
+        expect(response).to have_gitlab_http_status(:not_found)
      end
    end
@@ -47,7 +47,7 @@ describe API::Triggers do
      it 'creates pipeline' do
        post api("/projects/#{project.id}/trigger/pipeline"), params: options.merge(ref: 'master')
-        expect(response).to have_gitlab_http_status(201)
+        expect(response).to have_gitlab_http_status(:created)
        expect(json_response).to include('id' => pipeline.id)
        pipeline.builds.reload
        expect(pipeline.builds.pending.size).to eq(2)
@@ -57,7 +57,7 @@ describe API::Triggers do
      it 'returns bad request with no pipeline created if there\'s no commit for that ref' do
        post api("/projects/#{project.id}/trigger/pipeline"), params: options.merge(ref: 'other-branch')
-        expect(response).to have_gitlab_http_status(400)
+        expect(response).to have_gitlab_http_status(:bad_request)
        expect(json_response['message']).to eq('base' => ["Reference not found"])
      end
@@ -69,21 +69,21 @@ describe API::Triggers do
        it 'validates variables to be a hash' do
          post api("/projects/#{project.id}/trigger/pipeline"), params: options.merge(variables: 'value', ref: 'master')
-          expect(response).to have_gitlab_http_status(400)
+          expect(response).to have_gitlab_http_status(:bad_request)
          expect(json_response['error']).to eq('variables is invalid')
        end
        it 'validates variables needs to be a map of key-valued strings' do
          post api("/projects/#{project.id}/trigger/pipeline"), params: options.merge(variables: { key: %w(1 2) }, ref: 'master')
-          expect(response).to have_gitlab_http_status(400)
+          expect(response).to have_gitlab_http_status(:bad_request)
          expect(json_response['message']).to eq('variables needs to be a map of key-valued strings')
        end
        it 'creates trigger request with variables' do
          post api("/projects/#{project.id}/trigger/pipeline"), params: options.merge(variables: variables, ref: 'master')
-          expect(response).to have_gitlab_http_status(201)
+          expect(response).to have_gitlab_http_status(:created)
          expect(pipeline.variables.map { |v| { v.key => v.value } }.last).to eq(variables)
        end
      end
@@ -93,7 +93,7 @@ describe API::Triggers do
      it 'does not leak the presence of project when token is for different project' do
        post api("/projects/#{project2.id}/ref/master/trigger/pipeline?token=#{trigger_token}"), params: { ref: 'refs/heads/other-branch' }
-        expect(response).to have_gitlab_http_status(404)
+        expect(response).to have_gitlab_http_status(:not_found)
      end
      it 'creates builds from the ref given in the URL, not in the body' do
@@ -101,7 +101,7 @@ describe API::Triggers do
          post api("/projects/#{project.id}/ref/master/trigger/pipeline?token=#{trigger_token}"), params: { ref: 'refs/heads/other-branch' }
        end.to change(project.builds, :count).by(5)
-        expect(response).to have_gitlab_http_status(201)
+        expect(response).to have_gitlab_http_status(:created)
      end
      context 'when ref contains a dot' do
@@ -112,7 +112,7 @@ describe API::Triggers do
            post api("/projects/#{project.id}/ref/v.1-branch/trigger/pipeline?token=#{trigger_token}"), params: { ref: 'refs/heads/other-branch' }
          end.to change(project.builds, :count).by(4)
-          expect(response).to have_gitlab_http_status(201)
+          expect(response).to have_gitlab_http_status(:created)
        end
      end
    end
@@ -123,7 +123,7 @@ describe API::Triggers do
      it 'returns a list of triggers with tokens exposed correctly' do
        get api("/projects/#{project.id}/triggers", 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_a(Array)
@@ -137,7 +137,7 @@ describe API::Triggers do
      it 'does not return triggers list' do
        get api("/projects/#{project.id}/triggers", user2)
-        expect(response).to have_gitlab_http_status(403)
+        expect(response).to have_gitlab_http_status(:forbidden)
      end
    end
@@ -145,7 +145,7 @@ describe API::Triggers do
      it 'does not return triggers list' do
        get api("/projects/#{project.id}/triggers")
-        expect(response).to have_gitlab_http_status(401)
+        expect(response).to have_gitlab_http_status(:unauthorized)
      end
    end
  end
@@ -155,14 +155,14 @@ describe API::Triggers do
      it 'returns trigger details' do
        get api("/projects/#{project.id}/triggers/#{trigger.id}", user)
-        expect(response).to have_gitlab_http_status(200)
+        expect(response).to have_gitlab_http_status(:ok)
        expect(json_response).to be_a(Hash)
      end
      it 'responds with 404 Not Found if requesting non-existing trigger' do
        get api("/projects/#{project.id}/triggers/-5", user)
-        expect(response).to have_gitlab_http_status(404)
+        expect(response).to have_gitlab_http_status(:not_found)
      end
    end
@@ -170,7 +170,7 @@ describe API::Triggers do
      it 'does not return triggers list' do
        get api("/projects/#{project.id}/triggers/#{trigger.id}", user2)
-        expect(response).to have_gitlab_http_status(403)
+        expect(response).to have_gitlab_http_status(:forbidden)
      end
    end
@@ -178,7 +178,7 @@ describe API::Triggers do
      it 'does not return triggers list' do
        get api("/projects/#{project.id}/triggers/#{trigger.id}")
-        expect(response).to have_gitlab_http_status(401)
+        expect(response).to have_gitlab_http_status(:unauthorized)
      end
    end
  end
@@ -192,7 +192,7 @@ describe API::Triggers do
              params: { description: 'trigger' }
          end.to change {project.triggers.count}.by(1)
-          expect(response).to have_gitlab_http_status(201)
+          expect(response).to have_gitlab_http_status(:created)
          expect(json_response).to include('description' => 'trigger')
        end
      end
@@ -211,7 +211,7 @@ describe API::Triggers do
        post api("/projects/#{project.id}/triggers", user2),
          params: { description: 'trigger' }
-        expect(response).to have_gitlab_http_status(403)
+        expect(response).to have_gitlab_http_status(:forbidden)
      end
    end
@@ -220,7 +220,7 @@ describe API::Triggers do
        post api("/projects/#{project.id}/triggers"),
          params: { description: 'trigger' }
-        expect(response).to have_gitlab_http_status(401)
+        expect(response).to have_gitlab_http_status(:unauthorized)
      end
    end
  end
@@ -233,7 +233,7 @@ describe API::Triggers do
        put api("/projects/#{project.id}/triggers/#{trigger.id}", user),
          params: { description: new_description }
-        expect(response).to have_gitlab_http_status(200)
+        expect(response).to have_gitlab_http_status(:ok)
        expect(json_response).to include('description' => new_description)
        expect(trigger.reload.description).to eq(new_description)
      end
@@ -243,7 +243,7 @@ describe API::Triggers do
      it 'does not update trigger' do
        put api("/projects/#{project.id}/triggers/#{trigger.id}", user2)
-        expect(response).to have_gitlab_http_status(403)
+        expect(response).to have_gitlab_http_status(:forbidden)
      end
    end
@@ -251,7 +251,7 @@ describe API::Triggers do
      it 'does not update trigger' do
        put api("/projects/#{project.id}/triggers/#{trigger.id}")
-        expect(response).to have_gitlab_http_status(401)
+        expect(response).to have_gitlab_http_status(:unauthorized)
      end
    end
  end
@@ -262,14 +262,14 @@ describe API::Triggers do
        expect do
          delete api("/projects/#{project.id}/triggers/#{trigger.id}", user)
-          expect(response).to have_gitlab_http_status(204)
+          expect(response).to have_gitlab_http_status(:no_content)
        end.to change {project.triggers.count}.by(-1)
      end
      it 'responds with 404 Not Found if requesting non-existing trigger' do
        delete api("/projects/#{project.id}/triggers/-5", 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
@@ -281,7 +281,7 @@ describe API::Triggers do
      it 'does not delete trigger' do
        delete api("/projects/#{project.id}/triggers/#{trigger.id}", user2)
-        expect(response).to have_gitlab_http_status(403)
+        expect(response).to have_gitlab_http_status(:forbidden)
      end
    end
@@ -289,7 +289,7 @@ describe API::Triggers do
      it 'does not delete trigger' do
        delete api("/projects/#{project.id}/triggers/#{trigger.id}")
-        expect(response).to have_gitlab_http_status(401)
+        expect(response).to have_gitlab_http_status(:unauthorized)
      end
    end
  end

--- a/spec/requests/api/users_spec.rb
+++ b/spec/requests/api/users_spec.rb
--- a/spec/requests/api/variables_spec.rb
+++ b/spec/requests/api/variables_spec.rb
@@ -15,7 +15,7 @@ describe API::Variables do
      it 'returns project variables' do
        get api("/projects/#{project.id}/variables", user)
-        expect(response).to have_gitlab_http_status(200)
+        expect(response).to have_gitlab_http_status(:ok)
        expect(json_response).to be_a(Array)
      end
    end
@@ -24,7 +24,7 @@ describe API::Variables do
      it 'does not return project variables' do
        get api("/projects/#{project.id}/variables", user2)
-        expect(response).to have_gitlab_http_status(403)
+        expect(response).to have_gitlab_http_status(:forbidden)
      end
    end
@@ -32,7 +32,7 @@ describe API::Variables do
      it 'does not return project variables' do
        get api("/projects/#{project.id}/variables")
-        expect(response).to have_gitlab_http_status(401)
+        expect(response).to have_gitlab_http_status(:unauthorized)
      end
    end
  end
@@ -42,7 +42,7 @@ describe API::Variables do
      it 'returns project variable details' do
        get api("/projects/#{project.id}/variables/#{variable.key}", user)
-        expect(response).to have_gitlab_http_status(200)
+        expect(response).to have_gitlab_http_status(:ok)
        expect(json_response['value']).to eq(variable.value)
        expect(json_response['protected']).to eq(variable.protected?)
        expect(json_response['masked']).to eq(variable.masked?)
@@ -52,7 +52,7 @@ describe API::Variables do
      it 'responds with 404 Not Found if requesting non-existing variable' do
        get api("/projects/#{project.id}/variables/non_existing_variable", user)
-        expect(response).to have_gitlab_http_status(404)
+        expect(response).to have_gitlab_http_status(:not_found)
      end
    end
@@ -60,7 +60,7 @@ describe API::Variables do
      it 'does not return project variable details' do
        get api("/projects/#{project.id}/variables/#{variable.key}", user2)
-        expect(response).to have_gitlab_http_status(403)
+        expect(response).to have_gitlab_http_status(:forbidden)
      end
    end
@@ -68,7 +68,7 @@ describe API::Variables do
      it 'does not return project variable details' do
        get api("/projects/#{project.id}/variables/#{variable.key}")
-        expect(response).to have_gitlab_http_status(401)
+        expect(response).to have_gitlab_http_status(:unauthorized)
      end
    end
  end
@@ -80,7 +80,7 @@ describe API::Variables do
          post api("/projects/#{project.id}/variables", user), params: { key: 'TEST_VARIABLE_2', value: 'PROTECTED_VALUE_2', protected: true, masked: true }
        end.to change {project.variables.count}.by(1)
-        expect(response).to have_gitlab_http_status(201)
+        expect(response).to have_gitlab_http_status(:created)
        expect(json_response['key']).to eq('TEST_VARIABLE_2')
        expect(json_response['value']).to eq('PROTECTED_VALUE_2')
        expect(json_response['protected']).to be_truthy
@@ -93,7 +93,7 @@ describe API::Variables do
          post api("/projects/#{project.id}/variables", user), params: { variable_type: 'file',  key: 'TEST_VARIABLE_2', value: 'VALUE_2' }
        end.to change {project.variables.count}.by(1)
-        expect(response).to have_gitlab_http_status(201)
+        expect(response).to have_gitlab_http_status(:created)
        expect(json_response['key']).to eq('TEST_VARIABLE_2')
        expect(json_response['value']).to eq('VALUE_2')
        expect(json_response['protected']).to be_falsey
@@ -106,7 +106,7 @@ describe API::Variables do
          post api("/projects/#{project.id}/variables", user), params: { key: variable.key, value: 'VALUE_2' }
        end.to change {project.variables.count}.by(0)
-        expect(response).to have_gitlab_http_status(400)
+        expect(response).to have_gitlab_http_status(:bad_request)
      end
      it 'creates variable with a specific environment scope' do
@@ -114,7 +114,7 @@ describe API::Variables do
          post api("/projects/#{project.id}/variables", user), params: { key: 'TEST_VARIABLE_2', value: 'VALUE_2', environment_scope: 'review/*' }
        end.to change { project.variables.reload.count }.by(1)
-        expect(response).to have_gitlab_http_status(201)
+        expect(response).to have_gitlab_http_status(:created)
        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/*')
@@ -127,7 +127,7 @@ describe API::Variables do
          post api("/projects/#{project.id}/variables", user), params: { key: variable.key, value: 'VALUE_2', environment_scope: 'review/*' }
        end.to change { project.variables.reload.count }.by(1)
-        expect(response).to have_gitlab_http_status(201)
+        expect(response).to have_gitlab_http_status(:created)
        expect(json_response['key']).to eq(variable.key)
        expect(json_response['value']).to eq('VALUE_2')
        expect(json_response['environment_scope']).to eq('review/*')
@@ -138,7 +138,7 @@ describe API::Variables do
      it 'does not create variable' do
        post api("/projects/#{project.id}/variables", user2)
-        expect(response).to have_gitlab_http_status(403)
+        expect(response).to have_gitlab_http_status(:forbidden)
      end
    end
@@ -146,7 +146,7 @@ describe API::Variables do
      it 'does not create variable' do
        post api("/projects/#{project.id}/variables")
-        expect(response).to have_gitlab_http_status(401)
+        expect(response).to have_gitlab_http_status(:unauthorized)
      end
    end
  end
@@ -161,7 +161,7 @@ describe API::Variables do
        updated_variable = project.variables.reload.first
-        expect(response).to have_gitlab_http_status(200)
+        expect(response).to have_gitlab_http_status(:ok)
        expect(value_before).to eq(variable.value)
        expect(updated_variable.value).to eq('VALUE_1_UP')
        expect(updated_variable).to be_protected
@@ -171,7 +171,7 @@ describe API::Variables do
      it 'responds with 404 Not Found if requesting non-existing variable' do
        put api("/projects/#{project.id}/variables/non_existing_variable", user)
-        expect(response).to have_gitlab_http_status(404)
+        expect(response).to have_gitlab_http_status(:not_found)
      end
    end
@@ -179,7 +179,7 @@ describe API::Variables do
      it 'does not update variable' do
        put api("/projects/#{project.id}/variables/#{variable.key}", user2)
-        expect(response).to have_gitlab_http_status(403)
+        expect(response).to have_gitlab_http_status(:forbidden)
      end
    end
@@ -187,7 +187,7 @@ describe API::Variables do
      it 'does not update variable' do
        put api("/projects/#{project.id}/variables/#{variable.key}")
-        expect(response).to have_gitlab_http_status(401)
+        expect(response).to have_gitlab_http_status(:unauthorized)
      end
    end
  end
@@ -198,14 +198,14 @@ describe API::Variables do
        expect do
          delete api("/projects/#{project.id}/variables/#{variable.key}", user)
-          expect(response).to have_gitlab_http_status(204)
+          expect(response).to have_gitlab_http_status(:no_content)
        end.to change {project.variables.count}.by(-1)
      end
      it 'responds with 404 Not Found if requesting non-existing variable' do
        delete api("/projects/#{project.id}/variables/non_existing_variable", user)
-        expect(response).to have_gitlab_http_status(404)
+        expect(response).to have_gitlab_http_status(:not_found)
      end
    end
@@ -213,7 +213,7 @@ describe API::Variables do
      it 'does not delete variable' do
        delete api("/projects/#{project.id}/variables/#{variable.key}", user2)
-        expect(response).to have_gitlab_http_status(403)
+        expect(response).to have_gitlab_http_status(:forbidden)
      end
    end
@@ -221,7 +221,7 @@ describe API::Variables do
      it 'does not delete variable' do
        delete api("/projects/#{project.id}/variables/#{variable.key}")
-        expect(response).to have_gitlab_http_status(401)
+        expect(response).to have_gitlab_http_status(:unauthorized)
      end
    end
  end

--- a/spec/requests/api/version_spec.rb
+++ b/spec/requests/api/version_spec.rb
@@ -8,7 +8,7 @@ describe API::Version do
      it 'returns authentication error' do
        get api('/version')
-        expect(response).to have_gitlab_http_status(401)
+        expect(response).to have_gitlab_http_status(:unauthorized)
      end
    end
@@ -51,13 +51,13 @@ describe API::Version do
        it 'returns authorization error' do
          get api('/version', personal_access_token: personal_access_token)
-          expect(response).to have_gitlab_http_status(403)
+          expect(response).to have_gitlab_http_status(:forbidden)
        end
      end
    end
    def expect_version
-      expect(response).to have_gitlab_http_status(200)
+      expect(response).to have_gitlab_http_status(:ok)
      expect(json_response['version']).to eq(Gitlab::VERSION)
      expect(json_response['revision']).to eq(Gitlab.revision)
    end

--- a/spec/requests/api/wikis_spec.rb
+++ b/spec/requests/api/wikis_spec.rb
@@ -32,7 +32,7 @@ describe API::Wikis do
      it 'returns the list of wiki pages without content' do
        get api(url, user)
-        expect(response).to have_gitlab_http_status(200)
+        expect(response).to have_gitlab_http_status(:ok)
        expect(json_response.size).to eq(2)
        json_response.each_with_index do |page, index|
@@ -45,7 +45,7 @@ describe API::Wikis do
      it 'returns the list of wiki pages with content' do
        get api(url, user), params: { with_content: 1 }
-        expect(response).to have_gitlab_http_status(200)
+        expect(response).to have_gitlab_http_status(:ok)
        expect(json_response.size).to eq(2)
        json_response.each_with_index do |page, index|
@@ -60,14 +60,14 @@ describe API::Wikis do
    it 'return the empty list of wiki pages' do
      get api(url, user)
-      expect(response).to have_gitlab_http_status(200)
+      expect(response).to have_gitlab_http_status(:ok)
      expect(json_response.size).to eq(0)
    end
  end
  shared_examples_for 'returns wiki page' do
    it 'returns the wiki page' do
-      expect(response).to have_gitlab_http_status(200)
+      expect(response).to have_gitlab_http_status(:ok)
      expect(json_response.size).to eq(4)
      expect(json_response.keys).to match_array(expected_keys_with_content)
      expect(json_response['content']).to eq(page.content)
@@ -80,7 +80,7 @@ describe API::Wikis do
    it 'creates the wiki page' do
      post(api(url, user), params: payload)
-      expect(response).to have_gitlab_http_status(201)
+      expect(response).to have_gitlab_http_status(:created)
      expect(json_response.size).to eq(4)
      expect(json_response.keys).to match_array(expected_keys_with_content)
      expect(json_response['content']).to eq(payload[:content])
@@ -95,7 +95,7 @@ describe API::Wikis do
        post(api(url, user), params: payload)
-        expect(response).to have_gitlab_http_status(400)
+        expect(response).to have_gitlab_http_status(:bad_request)
        expect(json_response.size).to eq(1)
        expect(json_response['error']).to eq("#{part} is missing")
      end
@@ -106,7 +106,7 @@ describe API::Wikis do
    it 'updates the wiki page' do
      put(api(url, user), params: payload)
-      expect(response).to have_gitlab_http_status(200)
+      expect(response).to have_gitlab_http_status(:ok)
      expect(json_response.size).to eq(4)
      expect(json_response.keys).to match_array(expected_keys_with_content)
      expect(json_response['content']).to eq(payload[:content])
@@ -120,14 +120,14 @@ describe API::Wikis do
        put(api(url, user), params: payload)
-        expect(response).to have_gitlab_http_status(200)
+        expect(response).to have_gitlab_http_status(:ok)
      end
    end
  end
  shared_examples_for '403 Forbidden' do
    it 'returns 403 Forbidden' do
-      expect(response).to have_gitlab_http_status(403)
+      expect(response).to have_gitlab_http_status(:forbidden)
      expect(json_response.size).to eq(1)
      expect(json_response['message']).to eq('403 Forbidden')
    end
@@ -135,7 +135,7 @@ describe API::Wikis do
  shared_examples_for '404 Wiki Page Not Found' do
    it 'returns 404 Wiki Page Not Found' do
-      expect(response).to have_gitlab_http_status(404)
+      expect(response).to have_gitlab_http_status(:not_found)
      expect(json_response.size).to eq(1)
      expect(json_response['message']).to eq('404 Wiki Page Not Found')
    end
@@ -143,7 +143,7 @@ describe API::Wikis do
  shared_examples_for '404 Project Not Found' do
    it 'returns 404 Project Not Found' do
-      expect(response).to have_gitlab_http_status(404)
+      expect(response).to have_gitlab_http_status(:not_found)
      expect(json_response.size).to eq(1)
      expect(json_response['message']).to eq('404 Project Not Found')
    end
@@ -151,7 +151,7 @@ describe API::Wikis do
  shared_examples_for '204 No Content' do
    it 'returns 204 No Content' do
-      expect(response).to have_gitlab_http_status(204)
+      expect(response).to have_gitlab_http_status(:no_content)
    end
  end
@@ -161,7 +161,7 @@ describe API::Wikis do
      workhorse_post_with_file(api(url, user), file_key: :file, params: payload)
-      expect(response).to have_gitlab_http_status(201)
+      expect(response).to have_gitlab_http_status(:created)
      expect(json_response).to eq result_hash.deep_stringify_keys
    end
@@ -170,7 +170,7 @@ describe API::Wikis do
      post(api(url, user), params: payload)
-      expect(response).to have_gitlab_http_status(400)
+      expect(response).to have_gitlab_http_status(:bad_request)
      expect(json_response.size).to eq(1)
      expect(json_response['error']).to eq('file is missing')
    end
@@ -180,7 +180,7 @@ describe API::Wikis do
      post(api(url, user), params: payload)
-      expect(response).to have_gitlab_http_status(400)
+      expect(response).to have_gitlab_http_status(:bad_request)
      expect(json_response.size).to eq(1)
      expect(json_response['error']).to eq('file is invalid')
    end
@@ -190,7 +190,7 @@ describe API::Wikis do
      post(api(url, user), params: payload)
-      expect(response).to have_gitlab_http_status(201)
+      expect(response).to have_gitlab_http_status(:created)
      expect(json_response).to eq result_hash.deep_stringify_keys
    end
  end