2 files changed, 7 insertions, 3 deletions
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 784005cb93..ddc961cf84 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
@@ -22,12 +22,12 @@ module ActionDispatch
         # fails add +take_failed_screenshot+ to the teardown block before clearing
         # sessions.
         def take_failed_screenshot
-          take_screenshot unless passed?
+          take_screenshot if failed?
         end
 
         private
           def image_name
-            passed? ? method_name : "failures_#{method_name}"
+            failed? ? "failures_#{method_name}" : method_name
           end
 
           def image_path
@@ -51,6 +51,10 @@ module ActionDispatch
           def inline_base64(path)
             Base64.encode64(path).gsub("\n", "")
           end
+
+          def failed?
+            !passed? && !skipped?
+          end
       end
     end
   end
diff --git a/actionpack/lib/action_dispatch/system_testing/test_helpers/setup_and_teardown.rb b/actionpack/lib/action_dispatch/system_testing/test_helpers/setup_and_teardown.rb
index 491559eedf..1c89bfacfa 100644
--- a/actionpack/lib/action_dispatch/system_testing/test_helpers/setup_and_teardown.rb
+++ b/actionpack/lib/action_dispatch/system_testing/test_helpers/setup_and_teardown.rb
@@ -10,8 +10,8 @@ module ActionDispatch
         end
 
         def after_teardown
-          super
           take_failed_screenshot
+          super
           Capybara.reset_sessions!
         end
       end