summaryrefslogtreecommitdiff
path: root/spec/controllers
diff options
context:
space:
mode:
authorGitLab Bot <gitlab-bot@gitlab.com>2019-11-17 12:06:19 +0000
committerGitLab Bot <gitlab-bot@gitlab.com>2019-11-17 12:06:19 +0000
commit190e204decaba9c14f5a5997d243ed007f68b2a1 (patch)
treedfac782883833c6551a559a19543d8e41fd1123e /spec/controllers
parent926a77904fe25d533f0e1e503da0317c8f2011c7 (diff)
downloadgitlab-ce-190e204decaba9c14f5a5997d243ed007f68b2a1.tar.gz
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'spec/controllers')
-rw-r--r--spec/controllers/application_controller_spec.rb6
1 files changed, 3 insertions, 3 deletions
diff --git a/spec/controllers/application_controller_spec.rb b/spec/controllers/application_controller_spec.rb
index ca39f5dd9f2..04bbffc587f 100644
--- a/spec/controllers/application_controller_spec.rb
+++ b/spec/controllers/application_controller_spec.rb
@@ -637,7 +637,7 @@ describe ApplicationController do
context 'given a 422 error page' do
controller do
def index
- render 'errors/omniauth_error', layout: 'errors', status: 422
+ render 'errors/omniauth_error', layout: 'errors', status: :unprocessable_entity
end
end
@@ -651,7 +651,7 @@ describe ApplicationController do
context 'given a 500 error page' do
controller do
def index
- render 'errors/omniauth_error', layout: 'errors', status: 500
+ render 'errors/omniauth_error', layout: 'errors', status: :internal_server_error
end
end
@@ -665,7 +665,7 @@ describe ApplicationController do
context 'given a 200 success page' do
controller do
def index
- render 'errors/omniauth_error', layout: 'errors', status: 200
+ render 'errors/omniauth_error', layout: 'errors', status: :ok
end
end