rb - Firefox Nightly specs passing for Windows

Author: titusfortner

rb/lib/selenium/webdriver/firefox/binary.rb

@@ -149,18 +149,30 @@ def path
             @path
           end
 
-          def version
-            `#{path} -v`.strip[/[^\s]*$/][/^\d+/].to_i
-          end
-
           def nightly_path
             @path = case Platform.os
                     when :macosx
-                      nightly_path = "/Applications/FirefoxNightly.app/Contents/MacOS/firefox-bin"
-                      nightly_path if File.exist?(nightly_path)
+                      "/Applications/FirefoxNightly.app/Contents/MacOS/firefox-bin"
                     when :windows
-                      Platform.find_in_program_files("\\Nightly\\firefox.exe")
+                      "#{Platform.find_in_program_files("\\Nightly\\firefox.exe").gsub('m Files (x86)', '~2')}"
                     end
+
+            unless File.file?(@path.to_s) && version > 43
+              raise Error::WebDriverError, "Could not find Firefox Nightly binary. Make sure Firefox Nightly is installed or set the path manually with #{self}.path="
+            end
+
+            @path
+          end
+
+          def version
+            @version ||= case Platform.os
+                         when :macosx
+                           `#{path} -v`.strip[/[^\s]*$/][/^\d+/].to_i
+                         when :windows
+                           `\"#{path}\" -v | more`.strip[/[^\s]*$/][/^\d+/].to_i
+                         else
+                           0
+                         end
           end
 
           private

rb/lib/selenium/webdriver/firefox/w3c_bridge.rb

@@ -49,7 +49,6 @@ def initialize(opts = {})
           }
 
           remote_opts.merge!(:http_client => http_client) if http_client
-
           super(remote_opts)
         end
 

rb/lib/selenium/webdriver/remote/w3c_bridge.rb

@@ -63,19 +63,19 @@ def initialize(opts = {})
           opts = opts.dup
 
           http_client          = opts.delete(:http_client) { Http::Default.new }
-          desired_capabilities = opts.delete(:desired_capabilities) { Capabilities.firefox }
+          desired_capabilities = opts.delete(:desired_capabilities) { W3CCapabilities.firefox }
           url                  = opts.delete(:url) { "http://#{Platform.localhost}:4444/wd/hub" }
 
           unless opts.empty?
             raise ArgumentError, "unknown option#{'s' if opts.size != 1}: #{opts.inspect}"
           end
 
           if desired_capabilities.kind_of?(Symbol)
-            unless Capabilities.respond_to?(desired_capabilities)
+            unless W3CCapabilities.respond_to?(desired_capabilities)
               raise Error::WebDriverError, "invalid desired capability: #{desired_capabilities.inspect}"
             end
 
-            desired_capabilities = Capabilities.send(desired_capabilities)
+            desired_capabilities = W3CCapabilities.send(desired_capabilities)
           end
 
           uri = url.kind_of?(URI) ? url : URI.parse(url)
@@ -122,7 +122,7 @@ def create_session(desired_capabilities)
           resp = raw_execute :newSession, {}, :desiredCapabilities => desired_capabilities
           @session_id = resp['sessionId'] or raise Error::WebDriverError, 'no sessionId in returned payload'
 
-          Capabilities.json_create resp['value']
+          W3CCapabilities.json_create resp['value']
         end
 
         def status
@@ -134,7 +134,7 @@ def get(url)
         end
 
         def getCapabilities
-          Capabilities.json_create execute(:getCapabilities)
+          W3CCapabilities.json_create execute(:getCapabilities)
         end
 
         def setImplicitWaitTimeout(milliseconds)

rb/lib/selenium/webdriver/remote/w3c_capabilities.rb

@@ -27,14 +27,15 @@ module Remote
       class W3CCapabilities
 
         DEFAULTS = {
-            :browser_version => '',
-            :platform_name => :any,
-            :platform_version => false,
-            :accept_ssl_certs => false,
-            :takes_screenshot => false,
-            :takes_element_screenshot => false,
-            :page_load_strategy => false,
-            :proxy => nil
+          :browser_name => '',
+          :browser_version => '',
+          :platform_name => :any,
+          :platform_version => false,
+          :accept_ssl_certs => false,
+          :takes_screenshot => false,
+          :takes_element_screenshot => false,
+          :page_load_strategy => false,
+          :proxy => nil
         }
 
         DEFAULTS.each_key do |key|
@@ -47,6 +48,8 @@ class W3CCapabilities
           end
         end
 
+        alias_method :version, :browser_version
+
         #
         # Convenience methods for the common choices.
         #
@@ -67,6 +70,7 @@ def firefox(opts = {})
           end
 
           def w3c?(opts={})
+            return true if opts[:browser_name] == :firefox_nightly
             intersect = Remote::W3CCapabilities::DEFAULTS.keys & opts.keys
             common = [:takes_screenshot, :proxy]
             !(intersect - common).empty? || Firefox::Binary.version > 43

rb/spec/integration/selenium/webdriver/spec_support/guards.rb

@@ -77,7 +77,7 @@ def current_env
               :platform       => Platform.os,
               :native         => GlobalTestEnv.native_events?,
               :window_manager => !!ENV['DESKTOP_SESSION'],
-              :w3c            => GlobalTestEnv.w3c? || GlobalTestEnv.driver == :firefox_nightly
+              :w3c            => GlobalTestEnv.w3c?(:browser_name => GlobalTestEnv.driver)
             }
           end
 

rb/spec/integration/selenium/webdriver/spec_support/test_environment.rb

@@ -108,8 +108,8 @@ def native_events?
           @native_events ||= !!ENV['native']
         end
 
-        def w3c?
-          Remote::W3CCapabilities.w3c?
+        def w3c?(opt = {})
+          Remote::W3CCapabilities.w3c?(opt)
         end
 
         def url_for(filename)

rb/spec/unit/selenium/client/protocol_spec.rb

@@ -57,7 +57,7 @@ class ProtocolClient
 
     it "succeeds when given zero args" do
       expect(client).to receive(:remote_control_command).with(:a_verb, [])
-      client.string_command(:a_verb)
+      client.string_command :a_verb
     end
   end