Blowaway before hooks as well as after hooks to preserve order

rspec · Aug 23, 2019 · 38524ce · 38524ce
1 parent 9c6d8f3
commit 38524ce
Showing 1 changed file with 10 additions and 2 deletions.
diff --git a/lib/rspec/rails/example/system_example_group.rb b/lib/rspec/rails/example/system_example_group.rb
@@ -15,7 +15,11 @@ module SystemExampleGroup
       CHARS_TO_TRANSLATE = ['/', '.', ':', ',', "'", '"', " "].freeze
 
       # @private
-      module BlowAwayAfterTeardownHook
+      module BlowAwayTeardownHooks
+        # @private
+        def before_teardown
+        end
+
         # @private
         def after_teardown
         end
@@ -59,13 +63,16 @@ def app
           """.gsub(/\s+/, ' ').strip
         end
 
+        original_before_teardown =
+          ::ActionDispatch::SystemTesting::TestHelpers::SetupAndTeardown.instance_method(:before_teardown)
+
         original_after_teardown =
           ::ActionDispatch::SystemTesting::TestHelpers::SetupAndTeardown.instance_method(:after_teardown)
 
         other.include ActionDispatch::IntegrationTest::Behavior
         other.include ::ActionDispatch::SystemTesting::TestHelpers::SetupAndTeardown
         other.include ::ActionDispatch::SystemTesting::TestHelpers::ScreenshotHelper
-        other.include BlowAwayAfterTeardownHook
+        other.include BlowAwayTeardownHooks
 
         attr_reader :driver
 
@@ -93,6 +100,7 @@ def driven_by(*args, &blk)
           orig_stdout = $stdout
           $stdout = StringIO.new
           begin
+            original_before_teardown.bind(self).call
             original_after_teardown.bind(self).call
           ensure
             myio = $stdout