rb - update w3c commands and specs for window size & position

Author: titusfortner

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

@@ -274,14 +274,18 @@ def getCurrentWindowHandle
           execute :getWindowHandle
         end
 
-        # TODO - These Commands might require checking for being
-        # current window before performing
         def setWindowSize(width, height, handle = :current)
+          unless handle == :current
+            raise Error::WebDriverError, 'Switch to desired window before changing its size'
+          end
           execute :setWindowSize, {}, {:width  => width,
                                    :height => height}
         end
 
         def maximizeWindow(handle = :current)
+          unless handle == :current
+            raise Error::WebDriverError, 'Switch to desired window before changing its size'
+          end
           execute :maximizeWindow
         end
 
@@ -290,19 +294,20 @@ def fullscreenWindow
         end
 
         def getWindowSize(handle = :current)
+          unless handle == :current
+            raise Error::WebDriverError, 'Switch to desired window before getting its size'
+          end
           data = execute :getWindowSize
 
           Dimension.new data['width'], data['height']
         end
 
-        def setWindowPosition(x, y, handle = :current)
-          execute :setWindowPosition, :x => x, :y => y
+        def setWindowPosition(_x, _y, _handle = nil)
+          raise Error::WebDriverError::UnsupportedOperationError, 'The W3C standard does not currently support setting the Window Position'
         end
 
-        def getWindowPosition(handle = :current)
-          data = execute :getWindowPosition
-
-          Point.new data['x'], data['y']
+        def getWindowPosition(_handle = nil)
+          raise Error::WebDriverError::UnsupportedOperationError, 'The W3C standard does not currently support getting the Window Position'
         end
 
         def getScreenshot

rb/spec/integration/selenium/webdriver/window_spec.rb

@@ -24,87 +24,85 @@ module WebDriver
     describe Window do
       let(:window) { driver.manage.window }
 
-      compliant_on :browser => [:firefox, :chrome, :edge] do
-        it "gets the size of the current window" do
-          size = window.size
+      it "gets the size of the current window" do
+        size = window.size
 
-          expect(size).to be_kind_of(Dimension)
+        expect(size).to be_kind_of(Dimension)
 
-          expect(size.width).to be > 0
-          expect(size.height).to be > 0
-        end
+        expect(size.width).to be > 0
+        expect(size.height).to be > 0
+      end
 
-        it "sets the size of the current window" do
-          size = window.size
+      it "sets the size of the current window" do
+        size = window.size
 
-          target_width = size.width - 20
-          target_height = size.height - 20
+        target_width = size.width - 20
+        target_height = size.height - 20
 
-          window.size = Dimension.new(target_width, target_height)
+        window.size = Dimension.new(target_width, target_height)
 
-          new_size = window.size
-          expect(new_size.width).to eq(target_width)
-          expect(new_size.height).to eq(target_height)
-        end
+        new_size = window.size
+        expect(new_size.width).to eq(target_width)
+        expect(new_size.height).to eq(target_height)
+      end
 
-        # Marionette BUG -
-        # GET /session/2146a9d2-690a-4844-a5f4-e38b02d670c3/window/:window_handle/position
-        # did not match a known command
-        not_compliant_on({:driver => :marionette},
-                         {:driver => :remote, :browser => :firefox, :platform => :linux}) do
-          it "gets the position of the current window" do
-            pos = driver.manage.window.position
+      # Marionette BUG -
+      # GET /session/2146a9d2-690a-4844-a5f4-e38b02d670c3/window/:window_handle/position
+      # did not match a known command
+      not_compliant_on({:driver => :marionette},
+                       {:driver => :remote, :browser => :firefox, :platform => :linux}) do
+        it "gets the position of the current window" do
+          pos = driver.manage.window.position
 
-            expect(pos).to be_kind_of(Point)
+          expect(pos).to be_kind_of(Point)
 
-            expect(pos.x).to be >= 0
-            expect(pos.y).to be >= 0
-          end
+          expect(pos.x).to be >= 0
+          expect(pos.y).to be >= 0
         end
+      end
 
-        not_compliant_on :driver => [:remote, :marionette], :browser => :firefox, :platform => :linux do
-          it "sets the position of the current window" do
-            pos = window.position
+      not_compliant_on :driver => [:remote, :marionette], :browser => :firefox, :platform => :linux do
+        it "sets the position of the current window" do
+          pos = window.position
 
-            target_x = pos.x + 10
-            target_y = pos.y + 10
+          target_x = pos.x + 10
+          target_y = pos.y + 10
 
-            window.position = Point.new(target_x, target_y)
+          window.position = Point.new(target_x, target_y)
 
-            wait.until {window.position.x != pos.x && window.position.y != pos.y}
+          wait.until {window.position.x != pos.x && window.position.y != pos.y}
 
-            new_pos = window.position
-            expect(new_pos.x).to eq(target_x)
-            expect(new_pos.y).to eq(target_y)
-          end
+          new_pos = window.position
+          expect(new_pos.x).to eq(target_x)
+          expect(new_pos.y).to eq(target_y)
         end
       end
+    end
 
-      compliant_on({:browser => :ie},
-                   {:browser => :edge},
-                   {:browser => :firefox, :platform => [:windows, :macosx]}) do
-        it "can maximize the current window" do
-          window.size = old_size = Dimension.new(200, 200)
+    compliant_on({:browser => :ie},
+                 {:browser => :edge},
+                 {:browser => :firefox, :platform => [:windows, :macosx]}) do
+      it "can maximize the current window" do
+        window.size = old_size = Dimension.new(200, 200)
 
-          window.maximize
+        window.maximize
 
-          new_size = window.size
-          expect(new_size.width).to be > old_size.width
-          expect(new_size.height).to be > old_size.height
-        end
+        new_size = window.size
+        expect(new_size.width).to be > old_size.width
+        expect(new_size.height).to be > old_size.height
       end
+    end
 
-      compliant_on :browser => [:marionette, :edge] do
-        not_compliant_on :browser => [:marionette, :edge] do
-          it "can make window full screen" do
-            window.maximize
-            old_size = window.size
+    compliant_on :browser => [:marionette, :edge] do
+      not_compliant_on :browser => [:marionette, :edge] do
+        it "can make window full screen" do
+          window.maximize
+          old_size = window.size
 
-            window.full_screen
+          window.full_screen
 
-            new_size = window.size
-            expect(new_size.height).to be > old_size.height
-          end
+          new_size = window.size
+          expect(new_size.height).to be > old_size.height
         end
       end
     end