selenium-webdriver 4.51.0 → 4.52.0

data/lib/selenium/webdriver/atoms.rb

@@ -28,7 +28,10 @@ module Selenium
       private
 
       def read_atom(function)
-        File.read(File.expand_path("../atoms/#{function}.js", __FILE__))
+        file = "selenium/webdriver/atoms/#{function}.js"
+        lib = File.expand_path('../..', __dir__.to_s)
+        dir = [lib, *$LOAD_PATH].find { |path| File.exist?(File.expand_path(file, path)) }
+        File.read(File.expand_path(file, dir || lib))
       end
 
       def execute_atom(function_name, *)

data/lib/selenium/webdriver/bidi/protocol/bluetooth.rb

@@ -115,7 +115,7 @@ module Selenium
           # @see https://bluetooth.spec.whatwg.org/#cddl-type-bluetoothscanrecord
           ScanRecord = Serialization::Record.define(
             name: {wire_key: 'name', required: false, primitive: 'string'},
-            uuids: {wire_key: 'uuids', required: false, list: true},
+            uuids: {wire_key: 'uuids', required: false, list: true, primitive: 'string'},
             appearance: {wire_key: 'appearance', required: false, primitive: 'number'},
             manufacturer_data: {
               wire_key: 'manufacturerData',
@@ -181,7 +181,7 @@ module Selenium
             address: {wire_key: 'address', primitive: 'string'},
             name: {wire_key: 'name', primitive: 'string'},
             manufacturer_data: {wire_key: 'manufacturerData', ref: 'Bluetooth::BluetoothManufacturerData', list: true},
-            known_service_uuids: {wire_key: 'knownServiceUuids', list: true}
+            known_service_uuids: {wire_key: 'knownServiceUuids', list: true, primitive: 'string'}
           )
 
           # @api private
@@ -254,7 +254,7 @@ module Selenium
             characteristic_uuid: {wire_key: 'characteristicUuid', primitive: 'string'},
             type: {wire_key: 'type', enum: 'Bluetooth::SIMULATE_CHARACTERISTIC_RESPONSE_PARAMETERS_TYPE'},
             code: {wire_key: 'code', primitive: 'integer'},
-            data: {wire_key: 'data', required: false, list: true}
+            data: {wire_key: 'data', required: false, list: true, primitive: 'integer'}
           )
 
           # @api private
@@ -280,7 +280,7 @@ module Selenium
             descriptor_uuid: {wire_key: 'descriptorUuid', primitive: 'string'},
             type: {wire_key: 'type', enum: 'Bluetooth::SIMULATE_DESCRIPTOR_RESPONSE_PARAMETERS_TYPE'},
             code: {wire_key: 'code', primitive: 'integer'},
-            data: {wire_key: 'data', required: false, list: true}
+            data: {wire_key: 'data', required: false, list: true, primitive: 'integer'}
           )
 
           # @api private
@@ -309,7 +309,7 @@ module Selenium
             service_uuid: {wire_key: 'serviceUuid', primitive: 'string'},
             characteristic_uuid: {wire_key: 'characteristicUuid', primitive: 'string'},
             type: {wire_key: 'type', enum: 'Bluetooth::CHARACTERISTIC_EVENT_GENERATED_PARAMETERS_TYPE'},
-            data: {wire_key: 'data', required: false, list: true}
+            data: {wire_key: 'data', required: false, list: true, primitive: 'integer'}
           )
 
           # @api private
@@ -322,7 +322,7 @@ module Selenium
             characteristic_uuid: {wire_key: 'characteristicUuid', primitive: 'string'},
             descriptor_uuid: {wire_key: 'descriptorUuid', primitive: 'string'},
             type: {wire_key: 'type', enum: 'Bluetooth::DESCRIPTOR_EVENT_GENERATED_PARAMETERS_TYPE'},
-            data: {wire_key: 'data', required: false, list: true}
+            data: {wire_key: 'data', required: false, list: true, primitive: 'integer'}
           )
 
           EVENT_TYPES = {

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

@@ -47,11 +47,11 @@ module Selenium
           ClientWindowInfo = Serialization::Record.define(
             active: {wire_key: 'active', primitive: 'boolean'},
             client_window: {wire_key: 'clientWindow', primitive: 'string'},
-            height: {wire_key: 'height', primitive: 'integer'},
+            height: {wire_key: 'height', primitive: 'integer', min: 0, max: 9_007_199_254_740_991},
             state: {wire_key: 'state', enum: 'Browser::CLIENT_WINDOW_INFO_STATE'},
-            width: {wire_key: 'width', primitive: 'integer'},
-            x: {wire_key: 'x', primitive: 'integer'},
-            y: {wire_key: 'y', primitive: 'integer'}
+            width: {wire_key: 'width', primitive: 'integer', min: 0, max: 9_007_199_254_740_991},
+            x: {wire_key: 'x', primitive: 'integer', min: -9_007_199_254_740_991, max: 9_007_199_254_740_991},
+            y: {wire_key: 'y', primitive: 'integer', min: -9_007_199_254_740_991, max: 9_007_199_254_740_991}
           )
 
           # @api private
@@ -116,10 +116,22 @@ module Selenium
             ClientWindowRectState = Serialization::Record.define(
               state: {fixed: 'normal'},
               client_window: {wire_key: 'clientWindow', primitive: 'string'},
-              width: {wire_key: 'width', required: false, primitive: 'integer'},
-              height: {wire_key: 'height', required: false, primitive: 'integer'},
-              x: {wire_key: 'x', required: false, primitive: 'integer'},
-              y: {wire_key: 'y', required: false, primitive: 'integer'}
+              width: {wire_key: 'width', required: false, primitive: 'integer', min: 0, max: 9_007_199_254_740_991},
+              height: {wire_key: 'height', required: false, primitive: 'integer', min: 0, max: 9_007_199_254_740_991},
+              x: {
+                wire_key: 'x',
+                required: false,
+                primitive: 'integer',
+                min: -9_007_199_254_740_991,
+                max: 9_007_199_254_740_991
+              },
+              y: {
+                wire_key: 'y',
+                required: false,
+                primitive: 'integer',
+                min: -9_007_199_254_740_991,
+                max: 9_007_199_254_740_991
+              }
             )
 
             def self.normal(**) = Browser::SetClientWindowStateParameters::ClientWindowRectState.new(**)
@@ -130,7 +142,7 @@ module Selenium
           # @see https://w3c.github.io/webdriver-bidi/#cddl-type-browsersetdownloadbehaviorparameters
           SetDownloadBehaviorParameters = Serialization::Record.define(
             download_behavior: {wire_key: 'downloadBehavior', nullable: true, ref: 'Browser::DownloadBehavior'},
-            user_contexts: {wire_key: 'userContexts', required: false, list: true}
+            user_contexts: {wire_key: 'userContexts', required: false, list: true, primitive: 'string'}
           )
 
           # @api private

data/lib/selenium/webdriver/bidi/protocol/browsing_context.rb

@@ -81,6 +81,11 @@ module Selenium
             landscape: 'landscape'
           }.freeze
 
+          MOZ_SCOPE = {
+            chrome: 'chrome',
+            content: 'content'
+          }.freeze
+
           # @api private
           # @see https://www.selenium.dev/documentation/warnings/bidi-implementation/
           # @see https://w3c.github.io/webdriver-bidi/#cddl-type-browsingcontextbaseinfo
@@ -105,7 +110,8 @@ module Selenium
             url: {wire_key: 'url', primitive: 'string'},
             user_context: {wire_key: 'userContext', primitive: 'string'},
             parent: {wire_key: 'parent', required: false, nullable: true, primitive: 'string'},
-            extensible: true
+            moz_name: {wire_key: 'moz:name', required: false, primitive: 'string'},
+            moz_scope: {wire_key: 'moz:scope', required: false, enum: 'BrowsingContext::MOZ_SCOPE'}
           )
 
           # @api private
@@ -177,8 +183,12 @@ module Selenium
             type: {fixed: 'innerText'},
             value: {wire_key: 'value', primitive: 'string'},
             ignore_case: {wire_key: 'ignoreCase', required: false, primitive: 'boolean'},
-            match_type: {wire_key: 'matchType', required: false, enum: 'BrowsingContext::INNER_TEXT_LOCATOR_MATCH_TYPE'},
-            max_depth: {wire_key: 'maxDepth', required: false, primitive: 'integer'}
+            match_type: {
+              wire_key: 'matchType',
+              required: false,
+              enum: 'BrowsingContext::INNER_TEXT_LOCATOR_MATCH_TYPE'
+            },
+            max_depth: {wire_key: 'maxDepth', required: false, primitive: 'integer', min: 0, max: 9_007_199_254_740_991}
           )
 
           # @api private
@@ -195,7 +205,7 @@ module Selenium
           BaseNavigationInfo = Serialization::Record.define(
             context: {wire_key: 'context', primitive: 'string'},
             navigation: {wire_key: 'navigation', nullable: true, primitive: 'string'},
-            timestamp: {wire_key: 'timestamp', primitive: 'integer'},
+            timestamp: {wire_key: 'timestamp', primitive: 'integer', min: 0, max: 9_007_199_254_740_991},
             url: {wire_key: 'url', primitive: 'string'},
             user_context: {wire_key: 'userContext', required: false, primitive: 'string'}
           )
@@ -206,7 +216,7 @@ module Selenium
           NavigationInfo = Serialization::Record.define(
             context: {wire_key: 'context', primitive: 'string'},
             navigation: {wire_key: 'navigation', nullable: true, primitive: 'string'},
-            timestamp: {wire_key: 'timestamp', primitive: 'integer'},
+            timestamp: {wire_key: 'timestamp', primitive: 'integer', min: 0, max: 9_007_199_254_740_991},
             url: {wire_key: 'url', primitive: 'string'},
             user_context: {wire_key: 'userContext', required: false, primitive: 'string'}
           )
@@ -221,7 +231,11 @@ module Selenium
           # @see https://w3c.github.io/webdriver-bidi/#cddl-type-browsingcontextcapturescreenshotparameters
           CaptureScreenshotParameters = Serialization::Record.define(
             context: {wire_key: 'context', primitive: 'string'},
-            origin: {wire_key: 'origin', required: false, enum: 'BrowsingContext::CAPTURE_SCREENSHOT_PARAMETERS_ORIGIN'},
+            origin: {
+              wire_key: 'origin',
+              required: false,
+              enum: 'BrowsingContext::CAPTURE_SCREENSHOT_PARAMETERS_ORIGIN'
+            },
             format: {wire_key: 'format', required: false, ref: 'BrowsingContext::ImageFormat'},
             clip: {wire_key: 'clip', required: false, ref: 'BrowsingContext::ClipRectangle'},
             image_size: {wire_key: 'imageSize', required: false, ref: 'BrowsingContext::ImageSize'}
@@ -232,15 +246,27 @@ module Selenium
           # @see https://w3c.github.io/webdriver-bidi/#cddl-type-browsingcontextimageformat
           ImageFormat = Serialization::Record.define(
             type: {wire_key: 'type', primitive: 'string'},
-            quality: {wire_key: 'quality', required: false, primitive: 'number'}
+            quality: {wire_key: 'quality', required: false, primitive: 'number', min: 0, max: 1}
           )
 
           # @api private
           # @see https://www.selenium.dev/documentation/warnings/bidi-implementation/
           # @see https://w3c.github.io/webdriver-bidi/#cddl-type-browsingcontextimagesize
           ImageSize = Serialization::Record.define(
-            max_width: {wire_key: 'maxWidth', required: false, primitive: 'integer'},
-            max_height: {wire_key: 'maxHeight', required: false, primitive: 'integer'}
+            max_width: {
+              wire_key: 'maxWidth',
+              required: false,
+              primitive: 'integer',
+              min: 1,
+              max: 9_007_199_254_740_991
+            },
+            max_height: {
+              wire_key: 'maxHeight',
+              required: false,
+              primitive: 'integer',
+              min: 1,
+              max: 9_007_199_254_740_991
+            }
           )
 
           # @api private
@@ -312,9 +338,14 @@ module Selenium
           # @see https://www.selenium.dev/documentation/warnings/bidi-implementation/
           # @see https://w3c.github.io/webdriver-bidi/#cddl-type-browsingcontextgettreeparameters
           GetTreeParameters = Serialization::Record.define(
-            max_depth: {wire_key: 'maxDepth', required: false, primitive: 'integer'},
-            root: {wire_key: 'root', required: false, primitive: 'string'},
-            extensible: true
+            max_depth: {
+              wire_key: 'maxDepth',
+              required: false,
+              primitive: 'integer',
+              min: 0,
+              max: 9_007_199_254_740_991
+            },
+            root: {wire_key: 'root', required: false, primitive: 'string'}
           )
 
           # @api private
@@ -339,7 +370,13 @@ module Selenium
           LocateNodesParameters = Serialization::Record.define(
             context: {wire_key: 'context', primitive: 'string'},
             locator: {wire_key: 'locator', ref: 'BrowsingContext::Locator'},
-            max_node_count: {wire_key: 'maxNodeCount', required: false, primitive: 'integer'},
+            max_node_count: {
+              wire_key: 'maxNodeCount',
+              required: false,
+              primitive: 'integer',
+              min: 1,
+              max: 9_007_199_254_740_991
+            },
             serialization_options: {
               wire_key: 'serializationOptions',
               required: false,
@@ -385,8 +422,15 @@ module Selenium
               enum: 'BrowsingContext::PRINT_PARAMETERS_ORIENTATION'
             },
             page: {wire_key: 'page', required: false, ref: 'BrowsingContext::PrintPageParameters'},
-            page_ranges: {wire_key: 'pageRanges', required: false, list: true},
-            scale: {wire_key: 'scale', required: false, primitive: 'number'},
+            page_ranges: {
+              wire_key: 'pageRanges',
+              required: false,
+              list: true,
+              primitive: %w[integer string],
+              min: 0,
+              max: 9_007_199_254_740_991
+            },
+            scale: {wire_key: 'scale', required: false, primitive: 'number', min: 0.1, max: 2},
             shrink_to_fit: {wire_key: 'shrinkToFit', required: false, primitive: 'boolean'}
           )
 
@@ -394,18 +438,18 @@ module Selenium
           # @see https://www.selenium.dev/documentation/warnings/bidi-implementation/
           # @see https://w3c.github.io/webdriver-bidi/#cddl-type-browsingcontextprintmarginparameters
           PrintMarginParameters = Serialization::Record.define(
-            bottom: {wire_key: 'bottom', required: false, primitive: 'number'},
-            left: {wire_key: 'left', required: false, primitive: 'number'},
-            right: {wire_key: 'right', required: false, primitive: 'number'},
-            top: {wire_key: 'top', required: false, primitive: 'number'}
+            bottom: {wire_key: 'bottom', required: false, primitive: 'number', min: 0},
+            left: {wire_key: 'left', required: false, primitive: 'number', min: 0},
+            right: {wire_key: 'right', required: false, primitive: 'number', min: 0},
+            top: {wire_key: 'top', required: false, primitive: 'number', min: 0}
           )
 
           # @api private
           # @see https://www.selenium.dev/documentation/warnings/bidi-implementation/
           # @see https://w3c.github.io/webdriver-bidi/#cddl-type-browsingcontextprintpageparameters
           PrintPageParameters = Serialization::Record.define(
-            height: {wire_key: 'height', required: false, primitive: 'number'},
-            width: {wire_key: 'width', required: false, primitive: 'number'}
+            height: {wire_key: 'height', required: false, primitive: 'number', min: 0.0352},
+            width: {wire_key: 'width', required: false, primitive: 'number', min: 0.0352}
           )
 
           # @api private
@@ -427,8 +471,8 @@ module Selenium
           # @see https://w3c.github.io/webdriver-bidi/#cddl-type-browsingcontextsetbypasscspparameters
           SetBypassCSPParameters = Serialization::Record.define(
             bypass: {wire_key: 'bypass', nullable: true, const: true},
-            contexts: {wire_key: 'contexts', required: false, list: true},
-            user_contexts: {wire_key: 'userContexts', required: false, list: true}
+            contexts: {wire_key: 'contexts', required: false, list: true, primitive: 'string'},
+            user_contexts: {wire_key: 'userContexts', required: false, list: true, primitive: 'string'}
           )
 
           # @api private
@@ -437,16 +481,23 @@ module Selenium
           SetViewportParameters = Serialization::Record.define(
             context: {wire_key: 'context', required: false, primitive: 'string'},
             viewport: {wire_key: 'viewport', required: false, nullable: true, ref: 'BrowsingContext::Viewport'},
-            device_pixel_ratio: {wire_key: 'devicePixelRatio', required: false, nullable: true, primitive: 'number'},
-            user_contexts: {wire_key: 'userContexts', required: false, list: true}
+            device_pixel_ratio: {
+              wire_key: 'devicePixelRatio',
+              required: false,
+              nullable: true,
+              primitive: 'number',
+              min: 0,
+              exclusive_min: true
+            },
+            user_contexts: {wire_key: 'userContexts', required: false, list: true, primitive: 'string'}
           )
 
           # @api private
           # @see https://www.selenium.dev/documentation/warnings/bidi-implementation/
           # @see https://w3c.github.io/webdriver-bidi/#cddl-type-browsingcontextviewport
           Viewport = Serialization::Record.define(
-            width: {wire_key: 'width', primitive: 'integer'},
-            height: {wire_key: 'height', primitive: 'integer'}
+            width: {wire_key: 'width', primitive: 'integer', min: 0, max: 9_007_199_254_740_991},
+            height: {wire_key: 'height', primitive: 'integer', min: 0, max: 9_007_199_254_740_991}
           )
 
           # @api private
@@ -464,9 +515,15 @@ module Selenium
           # @see https://www.selenium.dev/documentation/warnings/bidi-implementation/
           # @see https://w3c.github.io/webdriver-bidi/#cddl-type-browsingcontextmediatrackconstraints
           MediaTrackConstraints = Serialization::Record.define(
-            width: {wire_key: 'width', required: false, primitive: 'integer'},
-            height: {wire_key: 'height', required: false, primitive: 'integer'},
-            frame_rate: {wire_key: 'frameRate', required: false, primitive: 'integer'}
+            width: {wire_key: 'width', required: false, primitive: 'integer', min: 0, max: 9_007_199_254_740_991},
+            height: {wire_key: 'height', required: false, primitive: 'integer', min: 0, max: 9_007_199_254_740_991},
+            frame_rate: {
+              wire_key: 'frameRate',
+              required: false,
+              primitive: 'integer',
+              min: 0,
+              max: 9_007_199_254_740_991
+            }
           )
 
           # @api private
@@ -497,7 +554,7 @@ module Selenium
           # @see https://w3c.github.io/webdriver-bidi/#cddl-type-browsingcontexttraversehistoryparameters
           TraverseHistoryParameters = Serialization::Record.define(
             context: {wire_key: 'context', primitive: 'string'},
-            delta: {wire_key: 'delta', primitive: 'integer'}
+            delta: {wire_key: 'delta', primitive: 'integer', min: -9_007_199_254_740_991, max: 9_007_199_254_740_991}
           )
 
           # @api private
@@ -505,7 +562,7 @@ module Selenium
           # @see https://w3c.github.io/webdriver-bidi/#cddl-type-browsingcontexthistoryupdatedparameters
           HistoryUpdatedParameters = Serialization::Record.define(
             context: {wire_key: 'context', primitive: 'string'},
-            timestamp: {wire_key: 'timestamp', primitive: 'integer'},
+            timestamp: {wire_key: 'timestamp', primitive: 'integer', min: 0, max: 9_007_199_254_740_991},
             url: {wire_key: 'url', primitive: 'string'},
             user_context: {wire_key: 'userContext', required: false, primitive: 'string'}
           )
@@ -518,7 +575,7 @@ module Selenium
             suggested_filename: {wire_key: 'suggestedFilename', primitive: 'string'},
             context: {wire_key: 'context', primitive: 'string'},
             navigation: {wire_key: 'navigation', nullable: true, primitive: 'string'},
-            timestamp: {wire_key: 'timestamp', primitive: 'integer'},
+            timestamp: {wire_key: 'timestamp', primitive: 'integer', min: 0, max: 9_007_199_254_740_991},
             url: {wire_key: 'url', primitive: 'string'},
             user_context: {wire_key: 'userContext', required: false, primitive: 'string'}
           )
@@ -541,7 +598,7 @@ module Selenium
               download: {wire_key: 'download', primitive: 'string'},
               context: {wire_key: 'context', primitive: 'string'},
               navigation: {wire_key: 'navigation', nullable: true, primitive: 'string'},
-              timestamp: {wire_key: 'timestamp', primitive: 'integer'},
+              timestamp: {wire_key: 'timestamp', primitive: 'integer', min: 0, max: 9_007_199_254_740_991},
               url: {wire_key: 'url', primitive: 'string'},
               user_context: {wire_key: 'userContext', required: false, primitive: 'string'}
             )
@@ -554,7 +611,7 @@ module Selenium
               filepath: {wire_key: 'filepath', nullable: true, primitive: 'string'},
               context: {wire_key: 'context', primitive: 'string'},
               navigation: {wire_key: 'navigation', nullable: true, primitive: 'string'},
-              timestamp: {wire_key: 'timestamp', primitive: 'integer'},
+              timestamp: {wire_key: 'timestamp', primitive: 'integer', min: 0, max: 9_007_199_254_740_991},
               url: {wire_key: 'url', primitive: 'string'},
               user_context: {wire_key: 'userContext', required: false, primitive: 'string'}
             )
@@ -851,14 +908,27 @@ module Selenium
           # moz: vendor variant of BrowsingContext, with browser-specific commands and params.
           # Construct Moz.new(source) for a matching session; other sessions use BrowsingContext.
           class Moz < BrowsingContext
+            # @api private
+            # @see https://www.selenium.dev/documentation/warnings/bidi-implementation/
+            # @see https://w3c.github.io/webdriver-bidi/#cddl-type-browsingcontextgettreeparameters
+            GetTreeParameters = Serialization::Record.define(
+              max_depth: {
+                wire_key: 'maxDepth',
+                required: false,
+                primitive: 'integer',
+                min: 0,
+                max: 9_007_199_254_740_991
+              },
+              root: {wire_key: 'root', required: false, primitive: 'string'},
+              scope: {wire_key: 'moz:scope', required: false, enum: 'BrowsingContext::MOZ_SCOPE'}
+            )
+
             # @api private
             # @see https://www.selenium.dev/documentation/warnings/bidi-implementation/
             # @see https://w3c.github.io/webdriver-bidi/#command-browsingContext-getTree
             def get_tree(max_depth: Serialization::UNSET, root: Serialization::UNSET, scope: Serialization::UNSET)
-              extensions = {
-                'moz:scope' => scope
-              }.reject { |_, value| Serialization::UNSET.equal?(value) }
-              params = GetTreeParameters.new(max_depth: max_depth, root: root, extensions: extensions)
+              Serialization.validate!('moz:scope', scope, BrowsingContext::MOZ_SCOPE)
+              params = GetTreeParameters.new(max_depth: max_depth, root: root, scope: scope)
               execute(cmd: 'browsingContext.getTree', params: params, result: BrowsingContext::GetTreeResult)
             end
           end