2 files changed, 8 insertions, 37 deletions
diff --git a/actionpack/test/dispatch/system_testing/screenshot_helper_test.rb b/actionpack/test/dispatch/system_testing/screenshot_helper_test.rb
index b756b91379..b0b36f9d74 100644
--- a/actionpack/test/dispatch/system_testing/screenshot_helper_test.rb
+++ b/actionpack/test/dispatch/system_testing/screenshot_helper_test.rb
@@ -36,6 +36,14 @@ class ScreenshotHelperTest < ActiveSupport::TestCase
     end
   end
 
+  test "image name truncates names over 225 characters" do
+    new_test = DrivenBySeleniumWithChrome.new("x" * 400)
+
+    Rails.stub :root, Pathname.getwd do
+      assert_equal Rails.root.join("tmp/screenshots/#{"x" * 225}.png").to_s, new_test.send(:image_path)
+    end
+  end
+
   test "defaults to simple output for the screenshot" do
     new_test = DrivenBySeleniumWithChrome.new("x")
     assert_equal "simple", new_test.send(:output_type)
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 847b09dcfe..3319db1665 100644
--- a/actionpack/test/dispatch/system_testing/system_test_case_test.rb
+++ b/actionpack/test/dispatch/system_testing/system_test_case_test.rb
@@ -46,40 +46,3 @@ class SetHostTest < DrivenByRackTest
     assert_equal "http://example.com", Capybara.app_host
   end
 end
-
-class UndefMethodsTest < DrivenBySeleniumWithChrome
-  test "get" 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
-    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
-    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
-    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
-    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