spec/implementation.rb in watir-webdriver-0.9.2 vs spec/implementation.rb in watir-webdriver-0.9.3

@@ -19,14 +19,14 @@
 
   def start_remote_server
     require 'selenium/server'
 
     @server ||= Selenium::Server.new(remote_server_jar,
-                                     :port       => Selenium::WebDriver::PortProber.above(4444),
-                                     :log        => !!$DEBUG,
-                                     :background => true,
-                                     :timeout    => 60)
+                                     port: Selenium::WebDriver::PortProber.above(4444),
+                                     log: !!$DEBUG,
+                                     background: true,
+                                     timeout: 60)
 
     @server.start
     at_exit { @server.stop }
   end
 
@@ -48,27 +48,25 @@
     @imp.browser_class = Watir::Browser
   end
 
   def set_browser_args
     args = case browser
-           when :firefox
-             firefox_args
            when :chrome
              chrome_args
            when :remote
              remote_args
            else
-             [browser, {}]
+             {}
            end
 
     if ENV['SELECTOR_STATS']
       listener = SelectorListener.new
-      args.last.merge!(listener: listener)
+      args.merge!(listener: listener)
       at_exit { listener.report }
     end
 
-    @imp.browser_args = args
+    @imp.browser_args = [browser, args]
   end
 
   def mobile?
     [:android, :iphone].include? browser
   end
@@ -122,18 +120,12 @@
     }
   ensure
     browser_instance.close if browser_instance
   end
 
-  def firefox_args
-    [:firefox, {}]
-  end
-
   def chrome_args
-    opts = {
-      args: ["--disable-translate"]
-    }
+    opts = {args: ["--disable-translate"]}
 
     if url = ENV['WATIR_WEBDRIVER_CHROME_SERVER']
       opts[:url] = url
     end
 
@@ -147,17 +139,16 @@
 
     if ENV['TRAVIS']
       opts[:args] << "--no-sandbox" # https://github.com/travis-ci/travis-ci/issues/938
     end
 
-    [:chrome, opts]
+    opts
   end
 
   def remote_args
     url = ENV["REMOTE_SERVER_URL"] || "http://127.0.0.1:#{@server.port}/wd/hub"
-    remote_browser_name = ENV['REMOTE_BROWSER'].to_sym
-    caps =  Selenium::WebDriver::Remote::Capabilities.send(remote_browser_name)
-    [:remote, {url: url, desired_capabilities: caps}]
+    caps = Selenium::WebDriver::Remote::Capabilities.send(remote_browser)
+    {url: url, desired_capabilities: caps}
   end
 
   def add_html_routes
     glob = File.expand_path("../html/*.html", __FILE__)
     Dir[glob].each do |path|