[rb] implement w3c window rect and minimize commands

Author: lmtierney

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

@@ -82,6 +82,34 @@ def position
         @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
+
       #
       # Equivalent to #size=, but accepts width and height arguments.
       #
@@ -115,6 +143,14 @@ def maximize
         @bridge.maximize_window
       end
 
+      #
+      # Minimize the current window
+      #
+
+      def minimize
+        @bridge.minimize_window
+      end
+
       #
       # Make current window full screen
       #

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

@@ -60,6 +60,32 @@ def quit
           @service.stop if @service
         end
 
+        # Firefox doesn't implement rect yet
+        def resize_window(width, height, handle = :current)
+          unless handle == :current
+            raise Error::WebDriverError, 'Switch to desired window before changing its size'
+          end
+          execute :set_window_size, {}, {width: width, height: height}
+        end
+
+        def window_size(handle = :current)
+          unless handle == :current
+            raise Error::UnsupportedOperationError, 'Switch to desired window before getting its size'
+          end
+          data = execute :get_window_size
+
+          Dimension.new data['width'], data['height']
+        end
+
+        def reposition_window(x, y)
+          execute :set_window_position, {}, {x: x, y: y}
+        end
+
+        def window_position
+          data = execute :get_window_position
+          Point.new data['x'], data['y']
+        end
+
         private
 
         def create_capabilities(opts)

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

@@ -234,39 +234,51 @@ def resize_window(width, height, handle = :current)
           unless handle == :current
             raise Error::WebDriverError, 'Switch to desired window before changing its size'
           end
-          execute :set_window_size, {}, {width: width,
-                                       height: height}
+          execute :set_window_rect, {}, {width: width, height: height}
         end
 
-        def maximize_window(handle = :current)
+        def window_size(handle = :current)
           unless handle == :current
-            raise Error::UnsupportedOperationError, 'Switch to desired window before changing its size'
+            raise Error::UnsupportedOperationError, 'Switch to desired window before getting its size'
           end
-          execute :maximize_window
+          data = execute :get_window_rect
+
+          Dimension.new data['width'], data['height']
         end
 
-        def full_screen_window
-          execute :fullscreen_window
+        def minimize_window
+          execute :minimize_window
         end
 
-        def window_size(handle = :current)
+        def maximize_window(handle = :current)
           unless handle == :current
-            raise Error::UnsupportedOperationError, 'Switch to desired window before getting its size'
+            raise Error::UnsupportedOperationError, 'Switch to desired window before changing its size'
           end
-          data = execute :get_window_size
+          execute :maximize_window
+        end
 
-          Dimension.new data['width'], data['height']
+        def full_screen_window
+          execute :fullscreen_window
         end
 
         def reposition_window(x, y)
-          execute :set_window_position, {}, {x: x, y: y}
+          execute :set_window_rect, {}, {x: x, y: y}
         end
 
         def window_position
-          data = execute :get_window_position
+          data = execute :get_window_rect
           Point.new data['x'], data['y']
         end
 
+        def set_window_rect(width: nil, height: nil, x: nil, y: nil)
+          execute :set_window_rect, {}, {width: width, height: height, x: x, y: y}
+        end
+
+        def window_rect
+          data = execute :get_window_rect
+          Rectangle.new data['x'], data['y'], data['width'], data['height']
+        end
+
         def screenshot
           execute :take_screenshot
         end

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

@@ -54,11 +54,14 @@ class W3CBridge
             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],
+            minimize_window: [:post, 'session/:session_id/window/minimize'.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],
             set_window_position: [:post, 'session/:session_id/window/position'.freeze],
             get_window_position: [:get, 'session/:session_id/window/position'.freeze],
+            set_window_rect: [:post, 'session/:session_id/window/rect'.freeze],
+            get_window_rect: [:get, 'session/:session_id/window/rect'.freeze],
             switch_to_frame: [:post, 'session/:session_id/frame'.freeze],
             switch_to_parent_frame: [:post, 'session/:session_id/frame/parent'.freeze],