Commit fafe0643 authored by Markus Koller's avatar Markus Koller Committed by Douwe Maan

Support both request and feature specs in have_gitlab_http_status

parent aa07a69c
...@@ -8,7 +8,11 @@ RSpec::Matchers.define :have_gitlab_http_status do |expected| ...@@ -8,7 +8,11 @@ RSpec::Matchers.define :have_gitlab_http_status do |expected|
end end
failure_message do |actual| failure_message do |actual|
# actual can be either an ActionDispatch::TestResponse (which uses #response_code)
# or a Capybara::Session (which uses #status_code)
response_code = actual.try(:response_code) || actual.try(:status_code)
"expected the response to have status code #{expected.inspect}" \ "expected the response to have status code #{expected.inspect}" \
" but it was #{actual.status_code}. The response was: #{actual.body}" " but it was #{response_code}. The response was: #{actual.body}"
end end
end end
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment