Revert "Refactor system test implementation to be good"

This reverts commit 53d3225.

Author: Sam Phippen

lib/rspec/rails/example/system_example_group.rb

@@ -5,30 +5,47 @@ module Rails
       # @api public
       # Container class for request spec functionality.
       module SystemExampleGroup
-        # In rails system test inherits from integration test.
-        # RequestExampleGroup wraps that, so we just include it here
-        include RSpec::Rails::RequestExampleGroup
+        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
 
-        original_after_teardown = ::ActionDispatch::SystemTesting::TestHelpers::SetupAndTeardown.instance_method(:after_teardown)
-
-        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
+        include ActionDispatch::IntegrationTest::Behavior
 
+        module BlowAwayAfterTeardownHook
           def after_teardown
           end
         end
-        include SystemTestHooks
 
-        included do
-          attr_reader :driver
+        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
 
+
+        # Delegates to `Rails.application`.
+        def app
+          ::Rails.application
+        end
+
+        included do
           def driven_by(*args, &blk)
-            @driver = ::ActionDispatch::SystemTestCase.driven_by(*args, &blk).tap(&:use)
+            @driver = ::ActionDispatch::SystemTestCase.driven_by(*args, &blk).tap { |d|
+              d.use
+            }
+          end
+
+          def driver
+            @driver
           end
 
           before do
@@ -39,6 +56,10 @@ def driven_by(*args, &blk)
           after do
             original_after_teardown.bind(self).call
           end
+
+          around do |ex|
+            ex.run
+          end
         end
       end
     end