2 files changed, 1 insertions, 6 deletions
diff --git a/actionpack/lib/action_dispatch/system_testing/driver.rb b/actionpack/lib/action_dispatch/system_testing/driver.rb
index 65e43d3584..72d132d64f 100644
--- a/actionpack/lib/action_dispatch/system_testing/driver.rb
+++ b/actionpack/lib/action_dispatch/system_testing/driver.rb
@@ -12,10 +12,6 @@ module ActionDispatch
         setup
       end
 
-      def reset
-        Capybara.current_driver = @current
-      end
-
       private
         def selenium?
           @name == :selenium
@@ -31,7 +27,6 @@ module ActionDispatch
 
         def setup
           Capybara.current_driver = @name
-          @current = Capybara.current_driver
         end
     end
   end
diff --git a/actionpack/lib/action_dispatch/system_testing/test_helpers/screenshot_helper.rb b/actionpack/lib/action_dispatch/system_testing/test_helpers/screenshot_helper.rb
index e37f6d02aa..6de8fb74dc 100644
--- a/actionpack/lib/action_dispatch/system_testing/test_helpers/screenshot_helper.rb
+++ b/actionpack/lib/action_dispatch/system_testing/test_helpers/screenshot_helper.rb
@@ -57,7 +57,7 @@ module ActionDispatch
           end
 
           def supports_screenshot?
-            page.driver.public_methods(false).include?(:save_screenshot)
+            Capybara.current_driver != :rack_test
           end
       end
     end