aboutsummaryrefslogtreecommitdiffstats
path: root/actionpack/test/controller
diff options
context:
space:
mode:
authorAndy Lindeman <alindeman@gmail.com>2012-05-03 09:16:38 -0400
committerAndy Lindeman <alindeman@gmail.com>2012-05-03 09:16:38 -0400
commita544e006814a1ef82db6af50637eee3d35740c39 (patch)
tree73302f4af9393bfae515f7401a16c907146cbebd /actionpack/test/controller
parentfb7abea99aeccb07962e4e82abbd110ab51eae47 (diff)
downloadrails-a544e006814a1ef82db6af50637eee3d35740c39.tar.gz
rails-a544e006814a1ef82db6af50637eee3d35740c39.tar.bz2
rails-a544e006814a1ef82db6af50637eee3d35740c39.zip
Allows assert_redirected_to to accept a regular expression
Diffstat (limited to 'actionpack/test/controller')
-rw-r--r--actionpack/test/controller/action_pack_assertions_test.rb4
1 files changed, 4 insertions, 0 deletions
diff --git a/actionpack/test/controller/action_pack_assertions_test.rb b/actionpack/test/controller/action_pack_assertions_test.rb
index b121ca9481..f5f397c9c0 100644
--- a/actionpack/test/controller/action_pack_assertions_test.rb
+++ b/actionpack/test/controller/action_pack_assertions_test.rb
@@ -179,6 +179,9 @@ class ActionPackAssertionsControllerTest < ActionController::TestCase
assert_redirected_to 'http://test.host/route_two'
end
assert_raise(ActiveSupport::TestCase::Assertion) do
+ assert_redirected_to %r(^http://test.host/route_two)
+ end
+ assert_raise(ActiveSupport::TestCase::Assertion) do
assert_redirected_to :controller => 'action_pack_assertions', :action => 'nothing', :id => 'two'
end
assert_raise(ActiveSupport::TestCase::Assertion) do
@@ -212,6 +215,7 @@ class ActionPackAssertionsControllerTest < ActionController::TestCase
process :redirect_to_top_level_named_route
# assert_redirected_to "http://test.host/action_pack_assertions/foo" would pass because of exact match early return
assert_redirected_to "/action_pack_assertions/foo"
+ assert_redirected_to %r(/action_pack_assertions/foo)
end
end