Merge pull request #186 from janbiedermann/win_win

Windows support

Author: route

lib/ferrum/browser/options/base.rb

@@ -26,6 +26,8 @@ def except(*keys)
         def detect_path
           if Ferrum.mac?
             self.class::MAC_BIN_PATH.find { |n| File.exist?(n) }
+          elsif Ferrum.windows?
+            self.class::WINDOWS_BIN_PATH.find { |path| File.exist?(path) }
           else
             self.class::LINUX_BIN_PATH.find do |name|
               path = Cliver.detect(name) and break(path)

lib/ferrum/browser/options/chrome.rb

@@ -49,6 +49,10 @@ class Chrome < Base
         LINUX_BIN_PATH = %w[chromium google-chrome-unstable google-chrome-beta
                             google-chrome chrome chromium-browser
                             google-chrome-stable].freeze
+        WINDOWS_BIN_PATH = [
+          "C:/Program Files/Google/Chrome Dev/Application/chrome.exe",
+          "C:/Program Files/Google/Chrome/Application/chrome.exe"
+        ].freeze
 
         def merge_required(flags, options, user_data_dir)
           port = options.fetch(:port, BROWSER_PORT)

lib/ferrum/browser/options/firefox.rb

@@ -12,6 +12,10 @@ class Firefox < Base
           "/Applications/Firefox.app/Contents/MacOS/firefox-bin"
         ].freeze
         LINUX_BIN_PATH = %w[firefox].freeze
+        WINDOWS_BIN_PATH = [
+          "C:/Program Files/Firefox Developer Edition/firefox.exe",
+          "C:/Program Files/Mozilla Firefox/firefox.exe"
+        ].freeze
 
         def merge_required(flags, options, user_data_dir)
           port = options.fetch(:port, BROWSER_PORT)

lib/ferrum/browser/process.rb

@@ -34,7 +34,8 @@ def self.process_killer(pid)
         proc do
           begin
             if Ferrum.windows?
-              ::Process.kill("KILL", pid)
+              # Process.kill is unreliable on Windows
+              ::Process.kill("KILL", pid) unless system("taskkill /f /t /pid #{pid} >NUL 2>NUL")
             else
               ::Process.kill("USR1", pid)
               start = Ferrum.monotonic_time
@@ -88,7 +89,7 @@ def start
             @xvfb = Xvfb.start(@command.options)
             ObjectSpace.define_finalizer(self, self.class.process_killer(@xvfb.pid))
           end
-
+          
           @pid = ::Process.spawn(Hash(@xvfb&.to_env), *@command.to_a, process_options)
           ObjectSpace.define_finalizer(self, self.class.process_killer(@pid))
 

lib/ferrum/page.rb

@@ -113,7 +113,13 @@ def position
       @browser.command("Browser.getWindowBounds", windowId: window_id).fetch("bounds").values_at("left", "top")
     end
 
-    def position=(left:, top:)
+    def position=(*args)
+      if args.size == 1
+        left = args[0][:left]
+        top = args[0][:top]
+      else
+        raise "Use like: browser.position = { left: 1, right: 2}"
+      end
       @browser.command("Browser.setWindowBounds", windowId: window_id, bounds: { left: left, top: top })
     end
 

spec/support/broken_chrome.bat

@@ -0,0 +1,3 @@
+echo "Broken Chrome error message"
+echo %0
+exit 1

spec/support/custom_chrome.bat

@@ -0,0 +1,5 @@
+set DIRPATH=%~dp0
+type nul >> %DIRPATH%\custom_chrome_called
+set /p CHROME=<%DIRPATH%\chrome_path
+rem echo %CHROME% %* > %DIRPATH%\chrome_executed
+"%CHROME%" %*

spec/support/no_chrome.bat

@@ -0,0 +1 @@
+dir