[rb] refrain from sending default capabilities for w3c

Signed-off-by: Titus Fortner <titusfortner@gmail.com>
odedniv · Jan 28, 2017 · ac31f00 · ac31f00
1 parent 52c344b
commit ac31f00
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 16 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -159,7 +159,7 @@ matrix:
       jdk: oraclejdk8
       env: MARIONETTE=1 TASK=//rb:firefox-test
       addons:
-        firefox: latest
+        firefox: latest-nightly
     - language: ruby
       rvm: 2.3.3
       jdk: oraclejdk8
@@ -179,7 +179,7 @@ matrix:
       jdk: oraclejdk8
       env: MARIONETTE=1 TASK=//rb:remote-firefox-test
       addons:
-        firefox: latest
+        firefox: latest-nightly
     - language: ruby
       rvm: 2.3.3
       jdk: oraclejdk8
@@ -205,6 +205,7 @@ matrix:
     - env: TOXENV=py36-firefox
     - env: MARIONETTE=1 TOXENV=py36-marionette
     - env: TOXENV=py36-remote
+    - env: PHANTOMJS=1 TASK=//rb:remote-phantomjs-test
     - env: TASK=//rb:docs
 before_install: ./scripts/travis/before_install.sh
 install: ./scripts/travis/install.sh

diff --git a/rb/lib/selenium/webdriver/firefox/w3c_bridge.rb b/rb/lib/selenium/webdriver/firefox/w3c_bridge.rb
@@ -56,7 +56,8 @@ def quit
         private
 
         def create_capabilities(opts)
-          caps = opts.delete(:desired_capabilities) || Remote::W3CCapabilities.firefox
+          caps = Remote::W3CCapabilities.firefox
+          caps.merge!(opts.delete(:desired_capabilities)) if opts.key? :desired_capabilities
           firefox_options_caps = caps[:firefox_options] || {}
           caps[:firefox_options] = firefox_options_caps.merge(opts[:firefox_options] || {})
           if opts.key?(:profile)

diff --git a/rb/lib/selenium/webdriver/remote/w3c_capabilities.rb b/rb/lib/selenium/webdriver/remote/w3c_capabilities.rb
@@ -28,22 +28,14 @@ module Remote
       # TODO - uncomment when Mozilla fixes this:
       # https://bugzilla.mozilla.org/show_bug.cgi?id=1326397
       class W3CCapabilities
-        DEFAULTS = {
-          browser_name: '',
-#          browser_version: :any,
-#          platform_name: :any,
-#          platform_version: :any,
-#          accept_insecure_certs: false,
-          page_load_strategy: 'normal',
-          proxy: nil
-        }.freeze
-
         KNOWN = [
+          :browser_name,
           :browser_version,
           :platform_name,
           :platform_version,
           :accept_insecure_certs,
-
+          :page_load_strategy,
+          :proxy,
           :remote_session_id,
           :accessibility_checks,
           :rotatable,
@@ -53,7 +45,7 @@ class W3CCapabilities
           :script_timeout,
         ].freeze
 
-        (DEFAULTS.keys + KNOWN).each do |key|
+        KNOWN.each do |key|
           define_method key do
             @capabilities.fetch(key)
           end
@@ -150,7 +142,7 @@ def json_create(data)
         #
 
         def initialize(opts = {})
-          @capabilities = DEFAULTS.merge(opts)
+          @capabilities = opts
           self.proxy = opts.delete(:proxy)
         end