set_window_state implemented

Author: Augustin Gottlieb

rb/lib/selenium/webdriver/bidi/browser.rb

@@ -58,7 +58,7 @@ def windows
         end
 
         def window
-          @window ||= windows.find(&:active?)
+          @window ||= windows.find(&:active?) || windows.first
         end
       end # Browser
     end # BiDi

rb/lib/selenium/webdriver/bidi/browser/window.rb

@@ -40,12 +40,6 @@ def active?
             @active
           end
 
-          # Set the client window state
-          # @param state [String, Symbol] One of: "fullscreen", "maximized", "minimized", "normal"
-          # @param width [Integer, nil] Width in pixels (only for "normal" state)
-          # @param height [Integer, nil] Height in pixels (only for "normal" state)
-          # @param x [Integer, nil] X position (only for "normal" state)
-          # @param y [Integer, nil] Y position (only for "normal" state)
           def set_state(state:, width: nil, height: nil, x: nil, y: nil)
             params = {clientWindow: @handle, state: state.to_s, width: width, height: height, x: x, y: y}.compact
 
@@ -54,19 +48,6 @@ def set_state(state:, width: nil, height: nil, x: nil, y: nil)
             response
           end
 
-          private
-
-          def update_attributes(state:, width:, height:, x:, y:)
-            @state = state.to_sym
-            @width = width.to_i if width
-            @height = height.to_i if height
-            @x = x.to_i if x
-            @y = y.to_i if y
-          end
-
-          public
-
-          # Convenience methods for common state changes
           def maximize
             set_state(state: 'maximized')
           end
@@ -82,6 +63,16 @@ def fullscreen
           def resize(width:, height:, x: nil, y: nil)
             set_state(state: 'normal', width: width, height: height, x: x, y: y)
           end
+
+          private
+
+          def update_attributes(state:, width:, height:, x:, y:)
+            @state = state.to_sym
+            @width = width.to_i if width
+            @height = height.to_i if height
+            @x = x.to_i if x
+            @y = y.to_i if y
+          end
         end # Window
       end # Browser
     end # BiDi

rb/sig/lib/selenium/webdriver/bidi/browser.rbs

@@ -2,17 +2,20 @@ module Selenium
   module WebDriver
     class BiDi
       class Browser
-        Window: Selenium::WebDriver::BiDi::Browser::Window
-
         @bidi: BiDi
+        @window: Window?
 
         def initialize: (BiDi bidi) -> void
 
         def create_user_context: () -> Hash[String, String]
 
-        def user_contexts: () -> Array[Hash[String, String]]
+        def user_contexts: () -> Hash[String, Array[Hash[String, String]]]
+
+        def remove_user_context: (String user_context) -> Hash[untyped, untyped]
+
+        def windows: () -> Array[Window]
 
-        def remove_user_context: (String user_context) -> Hash[nil, nil]
+        def window: () -> Window?
       end
     end
   end

rb/sig/lib/selenium/webdriver/bidi/browser/window.rbs

@@ -0,0 +1,45 @@
+module Selenium
+  module WebDriver
+    class BiDi
+      class Browser
+        class Window
+          attr_reader handle: String
+          attr_reader active: bool
+          attr_reader state: Symbol
+
+          attr_accessor height: Integer
+          attr_accessor width: Integer
+          attr_accessor x: Integer
+          attr_accessor y: Integer
+
+          @bidi: BiDi
+          @handle: String
+          @active: bool
+          @state: Symbol
+          @height: Integer
+          @width: Integer
+          @x: Integer
+          @y: Integer
+
+          def initialize: (BiDi bidi, handle: String, active: bool, height: Integer, width: Integer, x: Integer, y: Integer, state: String) -> void
+
+          def active?: () -> bool
+
+          def set_state: (state: String | Symbol, ?width: Integer?, ?height: Integer?, ?x: Integer?, ?y: Integer?) -> Hash[untyped, untyped]
+
+          def maximize: () -> Hash[untyped, untyped]
+
+          def minimize: () -> Hash[untyped, untyped]
+
+          def fullscreen: () -> Hash[untyped, untyped]
+
+          def resize: (width: Integer, height: Integer, ?x: Integer?, ?y: Integer?) -> Hash[untyped, untyped]
+
+          private
+
+          def update_attributes: (state: String | Symbol, width: Integer?, height: Integer?, x: Integer?, y: Integer?) -> void
+        end
+      end
+    end
+  end
+end

rb/spec/integration/selenium/webdriver/bidi/browser_spec.rb

@@ -74,29 +74,49 @@ class BiDi
           expect(active_window).to be_a(Selenium::WebDriver::BiDi::Browser::Window)
         end
 
-        it 'set window state' do
+        # Skip all browsers until browser.setClientWindowState is implemented
+        it 'maximizes window', except: {browser: %i[chrome edge firefox]} do
           browser = described_class.new(bidi)
           window = browser.window
 
-          # Test maximize
           window.maximize
           expect(window.state).to eq(:maximized)
+        end
+
+        # Skip all browsers until browser.setClientWindowState is implemented
+        it 'minimizes window', except: {browser: %i[chrome edge firefox]} do
+          browser = described_class.new(bidi)
+          window = browser.window
 
-          # Test minimize
           window.minimize
           expect(window.state).to eq(:minimized)
+        end
+
+        # Skip all browsers until browser.setClientWindowState is implemented
+        it 'sets window to fullscreen', except: {browser: %i[chrome edge firefox]} do
+          browser = described_class.new(bidi)
+          window = browser.window
 
-          # Test fullscreen
           window.fullscreen
           expect(window.state).to eq(:fullscreen)
+        end
+
+        # Skip all browsers until browser.setClientWindowState is implemented
+        it 'resizes window', except: {browser: %i[chrome edge firefox]} do
+          browser = described_class.new(bidi)
+          window = browser.window
 
-          # Test resize with normal state
           window.resize(width: 800, height: 600)
           expect(window.state).to eq(:normal)
           expect(window.width).to eq(800)
           expect(window.height).to eq(600)
+        end
+
+        # Skip all browsers until browser.setClientWindowState is implemented
+        it 'sets window state with position', except: {browser: %i[chrome edge firefox]} do
+          browser = described_class.new(bidi)
+          window = browser.window
 
-          # Test set_state with position
           window.set_state(state: 'normal', width: 1024, height: 768, x: 100, y: 50)
           expect(window.state).to eq(:normal)
           expect(window.width).to eq(1024)