2 files changed, 9 insertions, 5 deletions
diff --git a/actionview/lib/action_view/test_case.rb b/actionview/lib/action_view/test_case.rb
index 9e8e6f43d5..d0da415c5d 100644
--- a/actionview/lib/action_view/test_case.rb
+++ b/actionview/lib/action_view/test_case.rb
@@ -259,7 +259,7 @@ module ActionView
 
       def method_missing(selector, *args)
         if @controller.respond_to?(:_routes) &&
-          ( @controller._routes.named_routes.helpers.include?(selector) ||
+          ( @controller._routes.named_routes.route_defined?(selector) ||
             @controller._routes.mounted_helpers.method_defined?(selector) )
           @controller.__send__(selector, *args)
         else
diff --git a/actionview/test/activerecord/polymorphic_routes_test.rb b/actionview/test/activerecord/polymorphic_routes_test.rb
index fef27ef492..e220dcb8cb 100644
--- a/actionview/test/activerecord/polymorphic_routes_test.rb
+++ b/actionview/test/activerecord/polymorphic_routes_test.rb
@@ -158,34 +158,38 @@ class PolymorphicRoutesTest < ActionController::TestCase
 
   def test_with_nil
     with_test_routes do
-      assert_raise ArgumentError, "Nil location provided. Can't build URI." do
+      exception = assert_raise ArgumentError do
         polymorphic_url(nil)
       end
+      assert_equal "Nil location provided. Can't build URI.", exception.message
     end
   end
 
   def test_with_empty_list
     with_test_routes do
-      assert_raise ArgumentError, "Nil location provided. Can't build URI." do
+      exception = assert_raise ArgumentError do
         polymorphic_url([])
       end
+      assert_equal "Nil location provided. Can't build URI.", exception.message
     end
   end
 
   def test_with_nil_id
     with_test_routes do
-      assert_raise ArgumentError, "Nil location provided. Can't build URI." do
+      exception = assert_raise ArgumentError do
         polymorphic_url({ :id => nil })
       end
+      assert_equal "Nil location provided. Can't build URI.", exception.message
     end
   end
 
   def test_with_nil_in_list
     with_test_routes do
-      assert_raise ArgumentError, "Nil location provided. Can't build URI." do
+      exception = assert_raise ArgumentError do
         @series.save
         polymorphic_url([nil, @series])
       end
+      assert_equal "Nil location provided. Can't build URI.", exception.message
     end
   end