rb - better implementation for how to use Marionette with Wires

Author: titusfortner

rb/lib/selenium/webdriver/common/driver.rb

@@ -52,9 +52,6 @@ def for(browser, opts = {})
                      else
                        Firefox::Bridge.new(opts)
                      end
-                   when :firefox_nightly
-                     Firefox::Binary.nightly_path
-                     Firefox::W3CBridge.new(opts)
                    when :remote
                      Remote::Bridge.new(opts)
                    when :ie, :internet_explorer

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

@@ -149,25 +149,8 @@ def path
             @path
           end
 
-          def nightly_path
-            @path = case Platform.os
-                    when :macosx
-                      "/Applications/FirefoxNightly.app/Contents/MacOS/firefox-bin"
-                    when :windows
-                      "#{Platform.find_in_program_files("\\Nightly\\firefox.exe").gsub('m Files (x86)', '~2')}"
-                    when :linux
-                      ENV['FIREFOX_NIGHTLY_PATH'] or raise Error::WebDriverError, "Set ENV['FIREFOX_NIGHTLY_PATH'] when using Firefox Nightly on Linux"
-                    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
+            @version = case Platform.os
                          when :macosx
                            `#{path} -v`.strip[/[^\s]*$/][/^\d+/].to_i
                          when :windows

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

@@ -69,15 +69,13 @@ def firefox(opts = {})
                 }.merge(opts))
           end
 
-          def w3c?(opts = {})
-            return true if opts[:browser_name] == :firefox_nightly
-            w3c_opts? || Firefox::Binary.version > 43
-          end
+          alias_method :ff, :firefox
 
-          def w3c_opts?(opts = {})
-            intersect = Remote::W3CCapabilities::DEFAULTS.keys & opts.keys
-            common = [:takes_screenshot, :proxy]
-            !(intersect - common).empty?
+          def w3c?(opts = {})
+            return false unless opts[:desired_capabilities].is_a?(W3CCapabilities) || opts.delete(:wires)
+            firefox_version = Firefox::Binary.version
+            raise ArgumentError, "Firefox Version #{firefox_version} does not support W3CCapabilities" if firefox_version < 43
+            true
           end
 
           #

rb/spec/integration/selenium/webdriver/firefox/w3c_spec.rb

@@ -0,0 +1,72 @@
+# encoding: utf-8
+#
+# Licensed to the Software Freedom Conservancy (SFC) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The SFC licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
+#
+#   http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
+
+require 'selenium-webdriver'
+
+module Selenium
+  module WebDriver
+
+    describe Firefox do
+
+      context "when designated firefox installation includes Marionette" do
+        before(:all) { Firefox::Binary.path = "/Applications/FirefoxDeveloperEdition.app/Contents/MacOS/firefox-bin" }
+        after { @driver.quit }
+
+        # Currently versions that support Wires do not support Legacy Firefox Extension
+        xit "Does not use wires by default" do
+          @driver = Selenium::WebDriver.for :firefox
+          expect(@driver.instance_variable_get('@bridge').instance_variable_get('@launcher')).to_not be_nil
+        end
+
+        it "Uses Wires when initialized with :desired_capabilities" do
+          caps = Selenium::WebDriver::Remote::W3CCapabilities.firefox
+          expect { @driver = Selenium::WebDriver.for :firefox, :desired_capabilities => caps }.to_not raise_exception
+        end
+
+        it "Uses Wires when initialized with wires option" do
+          @driver = Selenium::WebDriver.for :firefox, {wires: true}
+          expect(@driver.instance_variable_get('@bridge').instance_variable_get('@launcher')).to be_nil
+        end
+      end
+
+      context "when designated firefox installation does not include Marionette" do
+        before(:all) { Firefox::Binary.path = "/Applications/Firefox.app/Contents/MacOS/firefox-bin" }
+        let(:message) { /Firefox Version \d\d does not support W3CCapabilities/ }
+
+        it "Does not use Wires by default" do
+          driver = Selenium::WebDriver.for :firefox
+          expect(driver.instance_variable_get('@bridge').instance_variable_get('@launcher')).to_not be_nil
+          driver.quit
+        end
+
+        it "Raises Wires Exception when initialized with :desired_capabilities" do
+          caps = Selenium::WebDriver::Remote::W3CCapabilities.firefox
+          opt = {:desired_capabilities => caps}
+          expect { @driver = Selenium::WebDriver.for :firefox, opt }.to raise_exception ArgumentError, message
+        end
+
+        it "Raises Wires Exception when initialized with wires option" do
+          expect{@driver = Selenium::WebDriver.for :firefox, {wires: true}}.to raise_exception ArgumentError, message
+        end
+      end
+
+
+    end # Driver
+  end # WebDriver
+end # Selenium