summaryrefslogtreecommitdiff
path: root/spec
diff options
context:
space:
mode:
authorRémy Coutable <remy@rymai.me>2018-06-14 07:03:59 +0000
committerRémy Coutable <remy@rymai.me>2018-06-14 07:03:59 +0000
commit8e0697dae375266ee9eaff3dfc4e892f2bd365cb (patch)
tree5806a872730d2c222b8f16c3b7e47387c74a7500 /spec
parent69966fcb8d19f0ce219a498efb2855902a2895b1 (diff)
parentb6996837ea992a98018caa0210f10ae6f3bcc9c0 (diff)
downloadgitlab-ce-8e0697dae375266ee9eaff3dfc4e892f2bd365cb.tar.gz
Merge branch 'rails5-fix-47804' into 'master'
Rails5 fix stack level too deep Closes #47804 See merge request gitlab-org/gitlab-ce!19762
Diffstat (limited to 'spec')
-rw-r--r--spec/controllers/application_controller_spec.rb8
1 files changed, 4 insertions, 4 deletions
diff --git a/spec/controllers/application_controller_spec.rb b/spec/controllers/application_controller_spec.rb
index fbafb4a4de8..74f362fd7fc 100644
--- a/spec/controllers/application_controller_spec.rb
+++ b/spec/controllers/application_controller_spec.rb
@@ -512,7 +512,7 @@ describe ApplicationController do
context '422 errors' do
it 'logs a response with a string' do
- response = spy(ActionDispatch::Response, status: 422, body: 'Hello world', content_type: 'application/json')
+ response = spy(ActionDispatch::Response, status: 422, body: 'Hello world', content_type: 'application/json', cookies: {})
allow(controller).to receive(:response).and_return(response)
get :index
@@ -521,7 +521,7 @@ describe ApplicationController do
it 'logs a response with an array' do
body = ['I want', 'my hat back']
- response = spy(ActionDispatch::Response, status: 422, body: body, content_type: 'application/json')
+ response = spy(ActionDispatch::Response, status: 422, body: body, content_type: 'application/json', cookies: {})
allow(controller).to receive(:response).and_return(response)
get :index
@@ -529,7 +529,7 @@ describe ApplicationController do
end
it 'does not log a string with an empty body' do
- response = spy(ActionDispatch::Response, status: 422, body: nil, content_type: 'application/json')
+ response = spy(ActionDispatch::Response, status: 422, body: nil, content_type: 'application/json', cookies: {})
allow(controller).to receive(:response).and_return(response)
get :index
@@ -537,7 +537,7 @@ describe ApplicationController do
end
it 'does not log an HTML body' do
- response = spy(ActionDispatch::Response, status: 422, body: 'This is a test', content_type: 'application/html')
+ response = spy(ActionDispatch::Response, status: 422, body: 'This is a test', content_type: 'application/html', cookies: {})
allow(controller).to receive(:response).and_return(response)
get :index