selenium-webdriver 3.0.1 → 3.0.2

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

@@ -76,8 +76,8 @@ module Selenium
           end
 
           def firefox(opts = {})
-            opts[:browser_version] = opts.delete :version
-            opts[:platform_name] = opts.delete :platform
+            opts[:browser_version] = opts.delete(:version) if opts.key?(:version)
+            opts[:platform_name] = opts.delete(:platform) if opts.key?(:platform)
 
             new({browser_name: 'firefox'}.merge(opts))
           end
@@ -85,7 +85,7 @@ module Selenium
           alias_method :ff, :firefox
 
           def w3c?(opts = {})
-            opts[:marioentte] != false &&
+            opts[:marionette] != false &&
                 (!opts[:desired_capabilities] || opts[:desired_capabilities][:marionette] != false)
           end
 

data/lib/selenium/webdriver/remote/w3c_commands.rb

@@ -25,110 +25,114 @@ module Selenium
         # http://www.w3.org/TR/2015/WD-webdriver-20150918/#list-of-endpoints
         #
 
-        #
-        # session handling
-        #
-
-        command :newSession, :post, 'session'
-        command :deleteSession, :delete, 'session/:session_id'
-
-        #
-        # basic driver
-        #
-
-        command :get, :post, 'session/:session_id/url'
-        command :getCurrentUrl, :get, 'session/:session_id/url'
-        command :back, :post, 'session/:session_id/back'
-        command :forward, :post, 'session/:session_id/forward'
-        command :refresh, :post, 'session/:session_id/refresh'
-        command :getTitle, :get, 'session/:session_id/title'
-
-        #
-        # window and Frame handling
-        #
-
-        command :getWindowHandle, :get, 'session/:session_id/window'
-        command :closeWindow, :delete, 'session/:session_id/window'
-        command :switchToWindow, :post, 'session/:session_id/window'
-        command :getWindowHandles, :get, 'session/:session_id/window/handles'
-        command :fullscreenWindow, :post, 'session/:session_id/window/fullscreen'
-        command :maximizeWindow, :post, 'session/:session_id/window/maximize'
-        command :setWindowSize, :post, 'session/:session_id/window/size'
-        command :getWindowSize, :get, 'session/:session_id/window/size'
-        command :switchToFrame, :post, 'session/:session_id/frame'
-        command :switchToParentFrame, :post, 'session/:session_id/frame/parent'
-
-        #
-        # element
-        #
-
-        command :findElement, :post, 'session/:session_id/element'
-        command :findElements, :post, 'session/:session_id/elements'
-        command :findChildElement, :post, 'session/:session_id/element/:id/element'
-        command :findChildElements, :post, 'session/:session_id/element/:id/elements'
-        command :getActiveElement, :get, 'session/:session_id/element/active'
-        command :isElementSelected, :get, 'session/:session_id/element/:id/selected'
-        command :getElementAttribute, :get, 'session/:session_id/element/:id/attribute/:name'
-        command :getElementProperty, :get, 'session/:session_id/element/:id/property/:name'
-        command :getElementCssValue, :get, 'session/:session_id/element/:id/css/:property_name'
-        command :getElementText, :get, 'session/:session_id/element/:id/text'
-        command :getElementTagName, :get, 'session/:session_id/element/:id/name'
-        command :getElementRect, :get, 'session/:session_id/element/:id/rect'
-        command :isElementEnabled, :get, 'session/:session_id/element/:id/enabled'
-
-        #
-        # document handling
-        #
-
-        command :getPageSource, :get, '/session/:session_id/source'
-        command :executeScript, :post, 'session/:session_id/execute/sync'
-        command :executeAsyncScript, :post, 'session/:session_id/execute/async'
-
-        #
-        # cookies
-        #
-
-        command :getAllCookies, :get, 'session/:session_id/cookie'
-        command :getCookie, :get, 'session/:session_id/cookie/:name'
-        command :addCookie, :post, 'session/:session_id/cookie'
-        command :deleteCookie, :delete, 'session/:session_id/cookie/:name'
-
-        #
-        # timeouts
-        #
-
-        command :setTimeout, :post, 'session/:session_id/timeouts'
-
-        #
-        # actions
-        #
-
-        command :actions, :post, 'session/:session_id/actions'
-
-        #
-        # Element Operations
-        #
-
-        command :elementClick, :post, 'session/:session_id/element/:id/click'
-        command :elementTap, :post, 'session/:session_id/element/:id/tap'
-        command :elementClear, :post, 'session/:session_id/element/:id/clear'
-        command :elementSendKeys, :post, 'session/:session_id/element/:id/value'
-
-        #
-        # alerts
-        #
-
-        command :dismissAlert, :post, 'session/:session_id/alert/dismiss'
-        command :acceptAlert, :post, 'session/:session_id/alert/accept'
-        command :getAlertText, :get, 'session/:session_id/alert/text'
-        command :sendAlertText, :post, 'session/:session_id/alert/text'
-
-        #
-        # screenshot
-        #
-
-        command :takeScreenshot, :get, 'session/:session_id/screenshot'
-        command :takeElementScreenshot, :get, 'session/:session_id/element/:id/screenshot'
+        COMMANDS = {
+
+            #
+            # session handling
+            #
+
+            new_session: [:post, 'session'.freeze],
+            delete_session: [:delete, 'session/:session_id'.freeze],
+
+            #
+            # basic driver
+            #
+
+            get: [:post, 'session/:session_id/url'.freeze],
+            get_current_url: [:get, 'session/:session_id/url'.freeze],
+            back: [:post, 'session/:session_id/back'.freeze],
+            forward: [:post, 'session/:session_id/forward'.freeze],
+            refresh: [:post, 'session/:session_id/refresh'.freeze],
+            get_title: [:get, 'session/:session_id/title'.freeze],
+
+            #
+            # window and Frame handling
+            #
+
+            get_window_handle: [:get, 'session/:session_id/window'.freeze],
+            close_window: [:delete, 'session/:session_id/window'.freeze],
+            switch_to_window: [:post, 'session/:session_id/window'.freeze],
+            get_window_handles: [:get, 'session/:session_id/window/handles'.freeze],
+            fullscreen_window: [:post, 'session/:session_id/window/fullscreen'.freeze],
+            maximize_window: [:post, 'session/:session_id/window/maximize'.freeze],
+            set_window_size: [:post, 'session/:session_id/window/size'.freeze],
+            get_window_size: [:get, 'session/:session_id/window/size'.freeze],
+            switch_to_frame: [:post, 'session/:session_id/frame'.freeze],
+            switch_to_parent_frame: [:post, 'session/:session_id/frame/parent'.freeze],
+
+            #
+            # element
+            #
+
+            find_element: [:post, 'session/:session_id/element'.freeze],
+            find_elements: [:post, 'session/:session_id/elements'.freeze],
+            find_child_element: [:post, 'session/:session_id/element/:id/element'.freeze],
+            find_child_elements: [:post, 'session/:session_id/element/:id/elements'.freeze],
+            get_active_element: [:get, 'session/:session_id/element/active'.freeze],
+            is_element_selected: [:get, 'session/:session_id/element/:id/selected'.freeze],
+            get_element_attribute: [:get, 'session/:session_id/element/:id/attribute/:name'.freeze],
+            get_element_property: [:get, 'session/:session_id/element/:id/property/:name'.freeze],
+            get_element_css_value: [:get, 'session/:session_id/element/:id/css/:property_name'.freeze],
+            get_element_text: [:get, 'session/:session_id/element/:id/text'.freeze],
+            get_element_tag_name: [:get, 'session/:session_id/element/:id/name'.freeze],
+            get_element_rect: [:get, 'session/:session_id/element/:id/rect'.freeze],
+            is_element_enabled: [:get, 'session/:session_id/element/:id/enabled'.freeze],
+
+            #
+            # document handling
+            #
+
+            get_page_source: [:get, '/session/:session_id/source'.freeze],
+            execute_script: [:post, 'session/:session_id/execute/sync'.freeze],
+            execute_async_script: [:post, 'session/:session_id/execute/async'.freeze],
+
+            #
+            # cookies
+            #
+
+            get_all_cookies: [:get, 'session/:session_id/cookie'.freeze],
+            get_cookie: [:get, 'session/:session_id/cookie/:name'.freeze],
+            add_cookie: [:post, 'session/:session_id/cookie'.freeze],
+            delete_cookie: [:delete, 'session/:session_id/cookie/:name'.freeze],
+            delete_all_cookies: [:delete, 'session/:session_id/cookie'.freeze],
+
+            #
+            # timeouts
+            #
+
+            set_timeout: [:post, 'session/:session_id/timeouts'.freeze],
+
+            #
+            # actions
+            #
+
+            actions: [:post, 'session/:session_id/actions'.freeze],
+
+            #
+            # Element Operations
+            #
+
+            element_click: [:post, 'session/:session_id/element/:id/click'.freeze],
+            element_tap: [:post, 'session/:session_id/element/:id/tap'.freeze],
+            element_clear: [:post, 'session/:session_id/element/:id/clear'.freeze],
+            element_send_keys: [:post, 'session/:session_id/element/:id/value'.freeze],
+
+            #
+            # alerts
+            #
+
+            dismiss_alert: [:post, 'session/:session_id/alert/dismiss'.freeze],
+            accept_alert: [:post, 'session/:session_id/alert/accept'.freeze],
+            get_alert_text: [:get, 'session/:session_id/alert/text'.freeze],
+            send_alert_text: [:post, 'session/:session_id/alert/text'.freeze],
+
+            #
+            # screenshot
+            #
+
+            take_screenshot: [:get, 'session/:session_id/screenshot'.freeze],
+            take_element_screenshot: [:get, 'session/:session_id/element/:id/screenshot'.freeze]
+        }.freeze
       end
     end # Remote
   end # WebDriver

data/lib/selenium/webdriver/safari.rb

@@ -23,11 +23,6 @@ require 'pathname'
 module Selenium
   module WebDriver
     module Safari
-      MISSING_TEXT = <<-ERROR.tr("\n", '').freeze
-        Unable to find Apple's safaridriver which comes with Safari 10.
-        More info at https://webkit.org/blog/6900/webdriver-support-in-safari-10/
-      ERROR
-
       class << self
         def path=(path)
           Platform.assert_executable(path)
@@ -41,19 +36,25 @@ module Selenium
           raise Error::WebDriverError, 'Unable to find Safari'
         end
 
-        def resource_path
-          @resource_path ||= Pathname.new(File.expand_path('../safari/resources', __FILE__))
-        end
-
         def driver_path=(path)
+          warn <<-DEPRECATE.gsub(/\n +| {2,}/, ' ').freeze
+            [DEPRECATION] `driver_path=` is deprecated. Pass the driver path as an option instead.
+            e.g. Selenium::WebDriver.for :safari, driver_path: '/path'
+          DEPRECATE
+
           Platform.assert_executable path
           @driver_path = path
         end
 
-        def driver_path
-          @driver_path ||= '/usr/bin/safaridriver'
-          return @driver_path if File.file?(@driver_path) && File.executable?(@driver_path)
-          raise Error::WebDriverError, MISSING_TEXT
+        def driver_path(warning = true)
+          if warning
+            warn <<-DEPRECATE.gsub(/\n +| {2,}/, ' ').freeze
+              [DEPRECATION] `driver_path` is deprecated. Pass the driver path as an option instead.
+              e.g. Selenium::WebDriver.for :safari, driver_path: '/path'
+            DEPRECATE
+          end
+
+          @driver_path ||= nil
         end
       end
     end # Safari

data/lib/selenium/webdriver/safari/bridge.rb

@@ -27,7 +27,8 @@ module Selenium
           port = opts.delete(:port) || Service::DEFAULT_PORT
           service_args = opts.delete(:service_args) || {}
 
-          @service = Service.new(Safari.driver_path, port, *extract_service_args(service_args))
+          driver_path = opts.delete(:driver_path) || Safari.driver_path(false)
+          @service = Service.new(driver_path, port, *extract_service_args(service_args))
           @service.start
           opts[:url] = @service.uri
 

data/lib/selenium/webdriver/safari/service.rb

@@ -26,9 +26,25 @@ module Selenium
 
       class Service < WebDriver::Service
         DEFAULT_PORT = 7050
+        @executable = '/usr/bin/safaridriver'.freeze
+        @missing_text = <<-ERROR.gsub(/\n +| {2,}/, ' ').freeze
+          Unable to find Apple's safaridriver which comes with Safari 10.
+          More info at https://webkit.org/blog/6900/webdriver-support-in-safari-10/
+        ERROR
+
+        def stop
+          stop_process
+        end
 
         private
 
+        def binary_path(path)
+          path = self.class.executable if path.nil?
+          raise Error::WebDriverError, self.class.missing_text unless path
+          Platform.assert_executable path
+          path
+        end
+
         def start_process
           server_command = [@executable_path, "--port=#{@port}", *@extra_args]
           @process       = ChildProcess.build(*server_command)
@@ -37,10 +53,6 @@ module Selenium
           @process.start
         end
 
-        def stop_server
-          connect_to_server { |http| http.head('/shutdown') }
-        end
-
         def cannot_connect_error_text
           "unable to connect to safaridriver #{@host}:#{@port}"
         end

data/selenium-webdriver.gemspec

@@ -5,7 +5,7 @@ raise "cwd must be #{root} when reading gemspec" if root != Dir.pwd
 
 Gem::Specification.new do |s|
   s.name = 'selenium-webdriver'
-  s.version = '3.0.1'
+  s.version = '3.0.2'
 
   s.authors = ['Alex Rodionov', 'Titus Fortner']
   s.email = ['p0deje@gmail.com', 'titusfortner@gmail.com']

metadata

@@ -2,7 +2,7 @@
 name: selenium-webdriver
 version: !ruby/object:Gem::Version 
   prerelease: 
-  version: 3.0.1
+  version: 3.0.2
 platform: ruby
 authors: 
   - Alex Rodionov
@@ -11,7 +11,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2016-11-07 00:00:00 -06:00
+date: 2016-11-25 00:00:00 -06:00
 default_executable: 
 dependencies: 
   - !ruby/object:Gem::Dependency 
@@ -124,7 +124,6 @@ extra_rdoc_files: []
 files: 
   - CHANGES
   - Gemfile
-  - Gemfile.lock
   - LICENSE
   - README.md
   - selenium-webdriver.gemspec
@@ -172,6 +171,7 @@ files:
   - lib/selenium/webdriver/common/touch_action_builder.rb
   - lib/selenium/webdriver/common/touch_screen.rb
   - lib/selenium/webdriver/common/w3c_error.rb
+  - lib/selenium/webdriver/common/w3c_options.rb
   - lib/selenium/webdriver/common/wait.rb
   - lib/selenium/webdriver/common/window.rb
   - lib/selenium/webdriver/common/zipper.rb
@@ -189,7 +189,6 @@ files:
   - lib/selenium/webdriver/common/html5/session_storage.rb
   - lib/selenium/webdriver/common/html5/shared_web_storage.rb
   - lib/selenium/webdriver/edge/bridge.rb
-  - lib/selenium/webdriver/edge/legacy_support.rb
   - lib/selenium/webdriver/edge/service.rb
   - lib/selenium/webdriver/firefox/binary.rb
   - lib/selenium/webdriver/firefox/bridge.rb

data/Gemfile.lock

@@ -1,53 +0,0 @@
-PATH
-  remote: .
-  specs:
-    selenium-webdriver (3.0.1)
-      childprocess (~> 0.5)
-      rubyzip (~> 1.0)
-      websocket (~> 1.0)
-
-GEM
-  remote: https://rubygems.org/
-  specs:
-    addressable (2.4.0)
-    builder (3.2.2)
-    childprocess (0.5.9)
-      ffi (~> 1.0, >= 1.0.11)
-    ci_reporter (1.9.3)
-      builder (>= 2.1.2)
-    crack (0.4.3)
-      safe_yaml (~> 1.0.0)
-    diff-lcs (1.2.5)
-    ffi (1.9.14)
-    hashdiff (0.3.0)
-    rack (1.6.4)
-    rspec (2.99.0)
-      rspec-core (~> 2.99.0)
-      rspec-expectations (~> 2.99.0)
-      rspec-mocks (~> 2.99.0)
-    rspec-core (2.99.2)
-    rspec-expectations (2.99.2)
-      diff-lcs (>= 1.1.3, < 2.0)
-    rspec-mocks (2.99.4)
-    rubyzip (1.2.0)
-    safe_yaml (1.0.4)
-    webmock (1.24.6)
-      addressable (>= 2.3.6)
-      crack (>= 0.3.2)
-      hashdiff
-    websocket (1.2.3)
-    yard (0.8.7.6)
-
-PLATFORMS
-  ruby
-
-DEPENDENCIES
-  ci_reporter (~> 1.6, >= 1.6.2)
-  rack (~> 1.0)
-  rspec (~> 2.99.0)
-  selenium-webdriver!
-  webmock (~> 1.7, >= 1.7.5)
-  yard (~> 0.8.7)
-
-BUNDLED WITH
-   1.13.6

data/lib/selenium/webdriver/edge/legacy_support.rb

@@ -1,117 +0,0 @@
-# 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.
-
-module Selenium
-  module WebDriver
-    module Edge
-      module LegacySupport
-        # These are commands Edge is still using from JSON Wire Protocol
-        %i[executeScript executeAsyncScript submitElement doubleClick
-           mouseDown mouseUp mouseMoveTo click
-           sendKeysToActiveElement getWindowHandles getCurrentWindowHandle
-           getWindowSize setWindowSize getWindowPosition setWindowPosition
-           maximizeWindow getAlertText acceptAlert dismissAlert].each do |cmd|
-          jwp = Remote::Bridge::COMMANDS[cmd]
-          Remote::W3CBridge.command(cmd, jwp.first, jwp.last)
-        end
-
-        def execute_script(script, *args)
-          result = execute :executeScript, {}, {script: script, args: args}
-          unwrap_script_result result
-        end
-
-        def execute_async_script(script, *args)
-          result = execute :executeAsyncScript, {}, {script: script, args: args}
-          unwrap_script_result result
-        end
-
-        def submit_element(element)
-          execute :submitElement, id: element['ELEMENT']
-        end
-
-        def double_click
-          execute :doubleClick
-        end
-
-        def click
-          execute :click, {}, {button: 0}
-        end
-
-        def context_click
-          execute :click, {}, {button: 2}
-        end
-
-        def mouse_down
-          execute :mouseDown
-        end
-
-        def mouse_up
-          execute :mouseUp
-        end
-
-        def mouse_move_to(element, x = nil, y = nil)
-          element_id = element['ELEMENT'] if element
-          params = {element: element_id}
-
-          if x && y
-            params[:xoffset] = x
-            params[:yoffset] = y
-          end
-
-          execute :mouseMoveTo, {}, params
-        end
-
-        def send_keys_to_active_element(key)
-          execute :sendKeysToActiveElement, {}, {value: key}
-        end
-
-        def window_handle
-          execute :getCurrentWindowHandle
-        end
-
-        def window_size(handle = :current)
-          data = execute :getWindowSize, window_handle: handle
-
-          Dimension.new data['width'], data['height']
-        end
-
-        def resize_window(width, height, handle = :current)
-          execute :setWindowSize, {window_handle: handle},
-                  {width: width,
-                   height: height}
-        end
-
-        def window_position(handle = :current)
-          data = execute :getWindowPosition, window_handle: handle
-
-          Point.new data['x'], data['y']
-        end
-
-        def reposition_window(x, y, handle = :current)
-          execute :setWindowPosition, {window_handle: handle},
-                  {x: x, y: y}
-        end
-
-        def maximize_window(handle = :current)
-          execute :maximizeWindow, window_handle: handle
-        end
-      end # LegacySupport
-    end # Edge
-  end # WebDriver
-end # Selenium