2 files changed, 11 insertions, 6 deletions
diff --git a/actionpack/lib/action_dispatch/system_testing/test_helpers/undef_methods.rb b/actionpack/lib/action_dispatch/system_testing/test_helpers/undef_methods.rb
index ef680cafed..d64be3b3d9 100644
--- a/actionpack/lib/action_dispatch/system_testing/test_helpers/undef_methods.rb
+++ b/actionpack/lib/action_dispatch/system_testing/test_helpers/undef_methods.rb
@@ -14,7 +14,7 @@ module ActionDispatch
 
           def method_missing(method, *args, &block)
             if METHODS.include?(method)
-              raise NoMethodError
+              raise NoMethodError, "System tests cannot make direct requests via ##{method}; use #visit and #click_on instead. See http://www.rubydoc.info/github/teamcapybara/capybara/master#The_DSL for more information."
             else
               super
             end
diff --git a/actionpack/test/dispatch/system_testing/system_test_case_test.rb b/actionpack/test/dispatch/system_testing/system_test_case_test.rb
index b60ec559ae..771a2a8d6e 100644
--- a/actionpack/test/dispatch/system_testing/system_test_case_test.rb
+++ b/actionpack/test/dispatch/system_testing/system_test_case_test.rb
@@ -36,32 +36,37 @@ end
 
 class UndefMethodsTest < DrivenBySeleniumWithChrome
   test "get" do
-    assert_raise NoMethodError do
+    exception = assert_raise NoMethodError do
       get "http://example.com"
     end
+    assert_equal "System tests cannot make direct requests via #get; use #visit and #click_on instead. See http://www.rubydoc.info/github/teamcapybara/capybara/master#The_DSL for more information.", exception.message
   end
 
   test "post" do
-    assert_raise NoMethodError do
+    exception = assert_raise NoMethodError do
       post "http://example.com"
     end
+    assert_equal "System tests cannot make direct requests via #post; use #visit and #click_on instead. See http://www.rubydoc.info/github/teamcapybara/capybara/master#The_DSL for more information.", exception.message
   end
 
   test "put" do
-    assert_raise NoMethodError do
+    exception = assert_raise NoMethodError do
       put "http://example.com"
     end
+    assert_equal "System tests cannot make direct requests via #put; use #visit and #click_on instead. See http://www.rubydoc.info/github/teamcapybara/capybara/master#The_DSL for more information.", exception.message
   end
 
   test "patch" do
-    assert_raise NoMethodError do
+    exception = assert_raise NoMethodError do
       patch "http://example.com"
     end
+    assert_equal "System tests cannot make direct requests via #patch; use #visit and #click_on instead. See http://www.rubydoc.info/github/teamcapybara/capybara/master#The_DSL for more information.", exception.message
   end
 
   test "delete" do
-    assert_raise NoMethodError do
+    exception = assert_raise NoMethodError do
       delete "http://example.com"
     end
+    assert_equal "System tests cannot make direct requests via #delete; use #visit and #click_on instead. See http://www.rubydoc.info/github/teamcapybara/capybara/master#The_DSL for more information.", exception.message
   end
 end