Refactor system test implementation to be good

Author: Sam Phippen

lib/rspec/rails/example/system_example_group.rb

@@ -5,47 +5,30 @@ module Rails
       # @api public
       # Container class for request spec functionality.
       module SystemExampleGroup
-        extend ActiveSupport::Concern
-        include RSpec::Rails::RailsExampleGroup
-        include ActionDispatch::Integration::Runner
-        include ActionDispatch::Assertions
-        include RSpec::Rails::Matchers::RedirectTo
-        include RSpec::Rails::Matchers::RenderTemplate
-        include ActionController::TemplateAssertions
-
-        include ActionDispatch::IntegrationTest::Behavior
-
-        module BlowAwayAfterTeardownHook
-          def after_teardown
-          end
-        end
+        # In rails system test inherits from integration test.
+        # RequestExampleGroup wraps that, so we just include it here
+        include RSpec::Rails::RequestExampleGroup
 
         original_after_teardown = ::ActionDispatch::SystemTesting::TestHelpers::SetupAndTeardown.instance_method(:after_teardown)
 
-        include ::ActionDispatch::SystemTesting::TestHelpers::SetupAndTeardown
-        include ::ActionDispatch::SystemTesting::TestHelpers::ScreenshotHelper
-        include BlowAwayAfterTeardownHook
-
-        # for the SystemTesting Screenshot situation
-        def passed?
-          RSpec.current_example.exception.nil?
-        end
-
+        module SystemTestHooks
+          include ::ActionDispatch::SystemTesting::TestHelpers::SetupAndTeardown
+          include ::ActionDispatch::SystemTesting::TestHelpers::ScreenshotHelper
+          # for the SystemTesting Screenshot situation
+          def passed?
+            RSpec.current_example.exception.nil?
+          end
 
-        # Delegates to `Rails.application`.
-        def app
-          ::Rails.application
+          def after_teardown
+          end
         end
+        include SystemTestHooks
 
         included do
-          def driven_by(*args, &blk)
-            @driver = ::ActionDispatch::SystemTestCase.driven_by(*args, &blk).tap { |d|
-              d.use
-            }
-          end
+          attr_reader :driver
 
-          def driver
-            @driver
+          def driven_by(*args, &blk)
+            @driver = ::ActionDispatch::SystemTestCase.driven_by(*args, &blk).tap(&:use)
           end
 
           before do
@@ -56,10 +39,6 @@ def driver
           after do
             original_after_teardown.bind(self).call
           end
-
-          around do |ex|
-            ex.run
-          end
         end
       end
     end