Merge pull request #152 from rubycdp/refactor-page-resize

Author: Mifrill

lib/ferrum/page.rb

@@ -92,15 +92,12 @@ def close
     end
 
     def resize(width: nil, height: nil, fullscreen: false)
-      result = @browser.command("Browser.getWindowForTarget", targetId: @target_id)
-      @window_id, @bounds = result.values_at("windowId", "bounds")
-
       if fullscreen
         width, height = document_size
-        @browser.command("Browser.setWindowBounds", windowId: @window_id, bounds: { windowState: "fullscreen" })
+        set_window_bounds(windowState: "fullscreen")
       else
-        @browser.command("Browser.setWindowBounds", windowId: @window_id, bounds: { windowState: "normal" })
-        @browser.command("Browser.setWindowBounds", windowId: @window_id, bounds: { width: width, height: height, windowState: "normal" })
+        set_window_bounds(windowState: "normal")
+        set_window_bounds(width: width, height: height)
       end
 
       command("Emulation.setDeviceMetricsOverride", slowmoable: true,
@@ -140,6 +137,14 @@ def bypass_csp(value = true)
       enabled
     end
 
+    def window_id
+      @browser.command("Browser.getWindowForTarget", targetId: @target_id)["windowId"]
+    end
+
+    def set_window_bounds(bounds = {})
+      @browser.command("Browser.setWindowBounds", windowId: window_id, bounds: bounds)
+    end
+
     def command(method, wait: 0, slowmoable: false, **params)
       iteration = @event.reset if wait > 0
       sleep(@browser.slowmo) if slowmoable && @browser.slowmo > 0

spec/browser_spec.rb

@@ -116,6 +116,13 @@ module Ferrum
         let(:path) { "/ferrum/custom_html_size_100%" }
         let(:viewport_size) { [1272, 1008] }
       end
+
+      it "resizes to 'normal' from 'fullscreen' window state" do
+        browser.go_to(path)
+        browser.resize(fullscreen: true)
+        browser.resize(width: 200, height: 400)
+        expect(browser.viewport_size).to eq([200, 400])
+      end
     end
 
     it "allows the page to be scrolled" do