aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRafael França <rafaelmfranca@gmail.com>2015-12-11 14:11:15 -0200
committerRafael França <rafaelmfranca@gmail.com>2015-12-11 14:11:15 -0200
commitb0e5fc2737ed0b2f67f9b9538d01e084545493fd (patch)
tree4780e6d4f4467001787ca94b4e67b5cc43c5174c
parent8570c806bf6785bed657eb172ff2d0c795c98505 (diff)
parentb24711621075350285fed67392720349722f4654 (diff)
downloadrails-b0e5fc2737ed0b2f67f9b9538d01e084545493fd.tar.gz
rails-b0e5fc2737ed0b2f67f9b9538d01e084545493fd.tar.bz2
rails-b0e5fc2737ed0b2f67f9b9538d01e084545493fd.zip
Merge pull request #22514 from prathamesh-sonpatki/use-assert-over-assert-predicate
Use assert over assert_predicate in assert_response
-rw-r--r--actionpack/lib/action_dispatch/testing/assertions/response.rb2
-rw-r--r--actionpack/test/assertions/response_assertions_test.rb4
2 files changed, 3 insertions, 3 deletions
diff --git a/actionpack/lib/action_dispatch/testing/assertions/response.rb b/actionpack/lib/action_dispatch/testing/assertions/response.rb
index 5af052afb4..cc2a2fb119 100644
--- a/actionpack/lib/action_dispatch/testing/assertions/response.rb
+++ b/actionpack/lib/action_dispatch/testing/assertions/response.rb
@@ -31,7 +31,7 @@ module ActionDispatch
if Symbol === type
if [:success, :missing, :redirect, :error].include?(type)
- assert_predicate @response, RESPONSE_PREDICATES[type], message
+ assert @response.send(RESPONSE_PREDICATES[type]), message
else
code = Rack::Utils::SYMBOL_TO_STATUS_CODE[type]
if code.nil?
diff --git a/actionpack/test/assertions/response_assertions_test.rb b/actionpack/test/assertions/response_assertions_test.rb
index 6c7036aa1a..00fb1c0f12 100644
--- a/actionpack/test/assertions/response_assertions_test.rb
+++ b/actionpack/test/assertions/response_assertions_test.rb
@@ -70,8 +70,8 @@ module ActionDispatch
assert_response :success
end
- expected = "Expected response to be a <success>, but was a redirect to <http://test.host/posts/redirect/1>."
- assert_match expected, error.message
+ expected = "Expected response to be a <success>, but was a redirect to <http://test.host/posts/redirect/1>"
+ assert_equal expected, error.message
end
end
end