Merge pull request #29315 from mariochavez/driven_by_support_headless_drivers

SystemTesting::Driver can register capybara-webkit and poltergeist

1 files changed, 24 insertions, 5 deletions

diff --git a/actionpack/lib/action_dispatch/system_testing/driver.rb b/actionpack/lib/action_dispatch/system_testing/driver.rb
index 5cf17883f7..1a027f2e23 100644
--- a/actionpack/lib/action_dispatch/system_testing/driver.rb
+++ b/actionpack/lib/action_dispatch/system_testing/driver.rb
@@ -9,23 +9,42 @@ module ActionDispatch
       end
 
       def use
-        register if selenium?
+        register unless rack_test?
+
         setup
       end
 
       private
-        def selenium?
-          @name == :selenium
+        def rack_test?
+          @name == :rack_test
         end
 
         def register
           Capybara.register_driver @name do |app|
-            Capybara::Selenium::Driver.new(app, { browser: @browser }.merge(@options)).tap do |driver|
-              driver.browser.manage.window.size = Selenium::WebDriver::Dimension.new(*@screen_size)
+            case @name
+            when :selenium then register_selenium(app)
+            when :poltergeist then register_poltergeist(app)
+            when :webkit then register_webkit(app)
             end
           end
         end
 
+        def register_selenium(app)
+          Capybara::Selenium::Driver.new(app, { browser: @browser }.merge(@options)).tap do |driver|
+            driver.browser.manage.window.size = Selenium::WebDriver::Dimension.new(*@screen_size)
+          end
+        end
+
+        def register_poltergeist(app)
+          Capybara::Poltergeist::Driver.new(app, @options.merge(window_size: @screen_size))
+        end
+
+        def register_webkit(app)
+          Capybara::Webkit::Driver.new(app, Capybara::Webkit::Configuration.to_hash.merge(@options)).tap do |driver|
+            driver.resize_window(*@screen_size)
+          end
+        end
+
         def setup
           Capybara.current_driver = @name
         end