selenium-webdriver 2.53.4 → 3.8.0

data/lib/selenium/webdriver/{phantomjs.rb → common/w3c_options.rb}

@@ -1,5 +1,3 @@
-# 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
@@ -17,25 +15,29 @@
 # specific language governing permissions and limitations
 # under the License.
 
-require 'net/http'
-
-require 'selenium/webdriver/phantomjs/service'
-require 'selenium/webdriver/phantomjs/bridge'
-
 module Selenium
   module WebDriver
+    class W3COptions < Options
 
-    module PhantomJS
+      #
+      # Get the cookie with the given name
+      #
+      # @param [String] name the name of the cookie
+      # @return [Hash, nil] the cookie, or nil if it wasn't found.
+      #
 
-      def self.path=(path)
-        Platform.assert_executable path
-        @path = path
+      def cookie_named(name)
+        convert_cookie(@bridge.cookie(name))
       end
 
-      def self.path
-        @path ||= Platform.find_binary("phantomjs")
+      #
+      # Delete all cookies
+      #
+
+      def delete_all_cookies
+        @bridge.delete_all_cookies
       end
 
-    end # PhantomJS
+    end # WC3Options
   end # WebDriver
 end # Selenium

data/lib/selenium/webdriver/common/wait.rb

@@ -1,5 +1,3 @@
-# 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
@@ -20,7 +18,6 @@
 module Selenium
   module WebDriver
     class Wait
-
       DEFAULT_TIMEOUT  = 5
       DEFAULT_INTERVAL = 0.2
 
@@ -41,7 +38,6 @@ module Selenium
         @ignored  = Array(opts[:ignore] || Error::NoSuchElementError)
       end
 
-
       #
       # Wait until the given block returns a true value.
       #
@@ -49,7 +45,7 @@ module Selenium
       # @return [Object] the result of the block
       #
 
-      def until(&blk)
+      def until
         end_time = Time.now + @timeout
         last_error = nil
 
@@ -64,19 +60,16 @@ module Selenium
           sleep @interval
         end
 
-
-        if @message
-          msg = @message.dup
-        else
-          msg = "timed out after #{@timeout} seconds"
-        end
+        msg = if @message
+                @message.dup
+              else
+                "timed out after #{@timeout} seconds"
+              end
 
         msg << " (#{last_error.message})" if last_error
 
         raise Error::TimeOutError, msg
       end
-
     end # Wait
   end # WebDriver
 end # Selenium
-

data/lib/selenium/webdriver/common/window.rb

@@ -1,5 +1,3 @@
-# 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
@@ -19,13 +17,11 @@
 
 module Selenium
   module WebDriver
-
     #
     # @api beta This API may be changed or removed in a future release.
     #
 
     class Window
-
       #
       # @api private
       #
@@ -42,11 +38,11 @@ module Selenium
 
       def size=(dimension)
         unless dimension.respond_to?(:width) && dimension.respond_to?(:height)
-          raise ArgumentError, "expected #{dimension.inspect}:#{dimension.class}" +
-                                " to respond to #width and #height"
+          raise ArgumentError, "expected #{dimension.inspect}:#{dimension.class}" \
+                               ' to respond to #width and #height'
         end
 
-        @bridge.setWindowSize dimension.width, dimension.height
+        @bridge.resize_window dimension.width, dimension.height
       end
 
       #
@@ -56,7 +52,7 @@ module Selenium
       #
 
       def size
-        @bridge.getWindowSize
+        @bridge.window_size
       end
 
       #
@@ -67,11 +63,11 @@ module Selenium
 
       def position=(point)
         unless point.respond_to?(:x) && point.respond_to?(:y)
-          raise ArgumentError, "expected #{point.inspect}:#{point.class}" +
-                                " to respond to #x and #y"
+          raise ArgumentError, "expected #{point.inspect}:#{point.class}" \
+                               ' to respond to #x and #y'
         end
 
-        @bridge.setWindowPosition point.x, point.y
+        @bridge.reposition_window point.x, point.y
       end
 
       #
@@ -81,7 +77,35 @@ module Selenium
       #
 
       def position
-        @bridge.getWindowPosition
+        @bridge.window_position
+      end
+
+      #
+      # Sets the current window rect to the given point and position.
+      #
+      # @param [Selenium::WebDriver::Rectangle, #x, #y, #width, #height] rectangle The new rect.
+      #
+
+      def rect=(rectangle)
+        unless %w[x y width height].all? { |val| rectangle.respond_to? val }
+          raise ArgumentError, "expected #{rectangle.inspect}:#{rectangle.class}" \
+                               ' to respond to #x, #y, #width, and #height'
+        end
+
+        @bridge.set_window_rect(x: rectangle.x,
+                                y: rectangle.y,
+                                width: rectangle.width,
+                                height: rectangle.height)
+      end
+
+      #
+      # Get the rect of the current window.
+      #
+      # @return [Selenium::WebDriver::Rectangle] The rectangle.
+      #
+
+      def rect
+        @bridge.window_rect
       end
 
       #
@@ -94,7 +118,7 @@ module Selenium
       #
 
       def resize_to(width, height)
-        @bridge.setWindowSize Integer(width), Integer(height)
+        @bridge.resize_window Integer(width), Integer(height)
       end
 
       #
@@ -106,7 +130,7 @@ module Selenium
       #
 
       def move_to(x, y)
-        @bridge.setWindowPosition Integer(x), Integer(y)
+        @bridge.reposition_window Integer(x), Integer(y)
       end
 
       #
@@ -114,7 +138,15 @@ module Selenium
       #
 
       def maximize
-        @bridge.maximizeWindow
+        @bridge.maximize_window
+      end
+
+      #
+      # Minimize the current window
+      #
+
+      def minimize
+        @bridge.minimize_window
       end
 
       #
@@ -122,9 +154,8 @@ module Selenium
       #
 
       def full_screen
-        @bridge.fullscreenWindow
+        @bridge.full_screen_window
       end
-
     end # Window
   end # WebDriver
 end # Selenium

data/lib/selenium/webdriver/common/zipper.rb

@@ -1,5 +1,3 @@
-# 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
@@ -20,6 +18,7 @@
 require 'zip'
 require 'tempfile'
 require 'find'
+require 'base64'
 
 module Selenium
   module WebDriver
@@ -28,13 +27,11 @@ module Selenium
     #
 
     module Zipper
-
-      EXTENSIONS = %w[.zip .xpi]
+      EXTENSIONS = %w[.zip .xpi].freeze
 
       class << self
-
         def unzip(path)
-          destination = Dir.mktmpdir("webdriver-unzip")
+          destination = Dir.mktmpdir('webdriver-unzip')
           FileReaper << destination
 
           Zip::File.open(path) do |zip|
@@ -59,7 +56,7 @@ module Selenium
             end
 
             zip.commit
-            File.open(zip.name, "rb") { |io| Base64.strict_encode64 io.read }
+            File.open(zip.name, 'rb') { |io| Base64.strict_encode64 io.read }
           end
         end
 
@@ -68,7 +65,7 @@ module Selenium
             add_zip_entry zip, path, File.basename(path)
 
             zip.commit
-            File.open(zip.name, "rb") { |io| Base64.strict_encode64 io.read }
+            File.open(zip.name, 'rb') { |io| Base64.strict_encode64 io.read }
           end
         end
 
@@ -78,7 +75,7 @@ module Selenium
           # can't use Tempfile here since it doesn't support File::BINARY mode on 1.8
           # can't use Dir.mktmpdir(&blk) because of http://jira.codehaus.org/browse/JRUBY-4082
           tmp_dir = Dir.mktmpdir
-          zip_path = File.join(tmp_dir, "webdriver-zip")
+          zip_path = File.join(tmp_dir, 'webdriver-zip')
 
           begin
             Zip::File.open(zip_path, Zip::File::CREATE, &blk)
@@ -94,7 +91,6 @@ module Selenium
 
           zip.add entry, file
         end
-
       end
     end # Zipper
   end # WebDriver

data/lib/selenium/webdriver/edge.rb

@@ -1,5 +1,3 @@
-# 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
@@ -19,26 +17,21 @@
 
 require 'net/http'
 
-require 'selenium/webdriver/edge/service'
 require 'selenium/webdriver/edge/bridge'
+require 'selenium/webdriver/edge/driver'
+require 'selenium/webdriver/edge/service'
 
 module Selenium
   module WebDriver
-
     module Edge
       def self.driver_path=(path)
-        Service.executable_path = path
-      end
-
-      def self.path=(path)
         Platform.assert_executable path
-        @path = path
+        @driver_path = path
       end
 
-      def self.path
-        @path ||= nil
+      def self.driver_path(warning = true)
+        @driver_path ||= nil
       end
-
     end # Edge
   end # WebDriver
 end # Selenium

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

@@ -1,5 +1,3 @@
-# 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
@@ -20,83 +18,54 @@
 module Selenium
   module WebDriver
     module Edge
-
-      # @api private
-      class Bridge < Remote::W3CBridge
-
-        def initialize(opts = {})
-
-          http_client = opts.delete(:http_client)
-
-          if opts.has_key?(:url)
-            url = opts.delete(:url)
+      module Bridge
+
+        def commands(command)
+          unsupported = %i[execute_script execute_async_script submit_element double_click
+                           mouse_down mouse_up mouse_move_to click
+                           send_keys_to_active_element get_window_handles get_current_window_handle
+                           get_window_size set_window_size get_window_position set_window_position
+                           maximize_window get_alert_text accept_alert dismiss_alert]
+          if unsupported.include? command
+            Remote::OSS::Bridge::COMMANDS[command]
           else
-            @service = Service.default_service(*extract_service_args(opts))
-
-            if @service.instance_variable_get("@host") == "127.0.0.1"
-              @service.instance_variable_set("@host", 'localhost')
-            end
-
-            @service.start
-
-            url = @service.uri
+            super
           end
-
-          caps = create_capabilities(opts)
-
-          remote_opts = {
-            :url                  => url,
-            :desired_capabilities => caps
-          }
-
-          remote_opts.merge!(:http_client => http_client) if http_client
-          super(remote_opts)
         end
 
-        def browser
-          :edge
+        def send_keys_to_active_element(key)
+          execute :send_keys_to_active_element, {}, {value: key}
         end
 
-        def driver_extensions
-          [
-            DriverExtensions::TakesScreenshot,
-            DriverExtensions::HasInputDevices
-          ]
+        def window_handle
+          execute :get_current_window_handle
         end
 
-        def capabilities
-          @capabilities ||= Remote::Capabilities.edge
-        end
+        def window_size(handle = :current)
+          data = execute :get_window_size, window_handle: handle
 
-        def quit
-          super
-        ensure
-          @service.stop if @service
+          Dimension.new data['width'], data['height']
         end
 
-        private
-
-        def create_capabilities(opts)
-          caps               = opts.delete(:desired_capabilities) { Remote::W3CCapabilities.edge }
-          page_load_strategy = opts.delete(:page_load_strategy) || "normal"
-
-          unless opts.empty?
-            raise ArgumentError, "unknown option#{'s' if opts.size != 1}: #{opts.inspect}"
-          end
+        def resize_window(width, height, handle = :current)
+          execute :set_window_size, {window_handle: handle},
+                  {width: width,
+                   height: height}
+        end
 
-          caps['page_load_strategy'] = page_load_strategy
+        def window_position(handle = :current)
+          data = execute :get_window_position, window_handle: handle
 
-          caps
+          Point.new data['x'], data['y']
         end
 
-        def extract_service_args(opts)
-          args = []
-
-          if opts.has_key?(:service_log_path)
-            args << "--log-path=#{opts.delete(:service_log_path)}"
-          end
+        def reposition_window(x, y, handle = :current)
+          execute :set_window_position, {window_handle: handle},
+                  {x: x, y: y}
+        end
 
-          args
+        def maximize_window(handle = :current)
+          execute :maximize_window, window_handle: handle
         end
 
       end # Bridge