diff --git a/Rakefile b/Rakefile index ab581256dc247..ad32c78b8797f 100644 --- a/Rakefile +++ b/Rakefile @@ -99,7 +99,7 @@ JAVA_RELEASE_TARGETS = %w[ //java/src/org/openqa/selenium/chrome:chrome.publish //java/src/org/openqa/selenium/chromium:chromium.publish //java/src/org/openqa/selenium/devtools/v119:v119.publish - //java/src/org/openqa/selenium/devtools/v117:v117.publish + //java/src/org/openqa/selenium/devtools/v120:v120.publish //java/src/org/openqa/selenium/devtools/v118:v118.publish //java/src/org/openqa/selenium/devtools/v85:v85.publish //java/src/org/openqa/selenium/edge:edge.publish diff --git a/common/devtools/chromium/v117/BUILD.bazel b/common/devtools/chromium/v120/BUILD.bazel similarity index 100% rename from common/devtools/chromium/v117/BUILD.bazel rename to common/devtools/chromium/v120/BUILD.bazel diff --git a/common/devtools/chromium/v117/browser_protocol.pdl b/common/devtools/chromium/v120/browser_protocol.pdl similarity index 97% rename from common/devtools/chromium/v117/browser_protocol.pdl rename to common/devtools/chromium/v120/browser_protocol.pdl index a2d52be0a8702..d845d8867c1c0 100644 --- a/common/devtools/chromium/v117/browser_protocol.pdl +++ b/common/devtools/chromium/v120/browser_protocol.pdl @@ -498,6 +498,7 @@ experimental domain Audits WarnAttributeValueExceedsMaxSize WarnDomainNonASCII WarnThirdPartyPhaseout + WarnCrossSiteRedirectDowngradeChangesInclusion type CookieOperation extends string enum @@ -770,6 +771,15 @@ experimental domain Audits properties array of string trackingSites + # This issue warns about third-party sites that are accessing cookies on the + # current page, and have been permitted due to having a global metadata grant. + # Note that in this context 'site' means eTLD+1. For example, if the URL + # `https://example.test:80/web_page` was accessing cookies, the site reported + # would be `example.test`. + type CookieDeprecationMetadataIssueDetails extends object + properties + array of string allowedSites + type ClientHintIssueReason extends string enum # Items in the accept-ch meta tag allow list must be valid origins. @@ -817,6 +827,8 @@ experimental domain Audits IdTokenHttpNotFound IdTokenNoResponse IdTokenInvalidResponse + IdTokenIdpErrorResponse + IdTokenCrossSiteIdpErrorResponse IdTokenInvalidRequest IdTokenInvalidContentType ErrorIdToken @@ -824,6 +836,7 @@ experimental domain Audits RpPageNotVisible SilentMediationFailure ThirdPartyCookiesBlocked + NotSignedInWithIdp type FederatedAuthUserInfoRequestIssueDetails extends object properties @@ -874,6 +887,24 @@ experimental domain Audits # Contains additional info when the failure was due to a request. optional FailedRequestInfo failedRequestInfo + type PropertyRuleIssueReason extends string + enum + InvalidSyntax + InvalidInitialValue + InvalidInherits + InvalidName + + # This issue warns about errors in property rules that lead to property + # registrations being ignored. + type PropertyRuleIssueDetails extends object + properties + # Source code position of the property rule. + SourceCodeLocation sourceCodeLocation + # Reason why the property rule was discarded. + PropertyRuleIssueReason propertyRuleIssueReason + # The value of the property rule property that failed to parse + optional string propertyValue + # A unique identifier for the type of issue. Each type may use one of the # optional fields in InspectorIssueDetails to convey more specific # information about the kind of issue. @@ -896,8 +927,10 @@ experimental domain Audits ClientHintIssue FederatedAuthRequestIssue BounceTrackingIssue + CookieDeprecationMetadataIssue StylesheetLoadingIssue FederatedAuthUserInfoRequestIssue + PropertyRuleIssue # This struct holds a list of optional fields with additional information # specific to the kind of issue. When adding a new issue code, please also @@ -920,7 +953,9 @@ experimental domain Audits optional ClientHintIssueDetails clientHintIssueDetails optional FederatedAuthRequestIssueDetails federatedAuthRequestIssueDetails optional BounceTrackingIssueDetails bounceTrackingIssueDetails + optional CookieDeprecationMetadataIssueDetails cookieDeprecationMetadataIssueDetails optional StylesheetLoadingIssueDetails stylesheetLoadingIssueDetails + optional PropertyRuleIssueDetails propertyRuleIssueDetails optional FederatedAuthUserInfoRequestIssueDetails federatedAuthUserInfoRequestIssueDetails # A unique id for a DevTools inspector issue. Allows other entities (e.g. @@ -1002,14 +1037,61 @@ experimental domain Autofill properties # address field name, for example GIVEN_NAME. string name - # address field name, for example Jon Doe. + # address field value, for example Jon Doe. string value + # A list of address fields. + type AddressFields extends object + properties + array of AddressField fields + type Address extends object properties - # fields and values defining a test address. + # fields and values defining an address. array of AddressField fields + # Defines how an address can be displayed like in chrome://settings/addresses. + # Address UI is a two dimensional array, each inner array is an "address information line", and when rendered in a UI surface should be displayed as such. + # The following address UI for instance: + # [[{name: "GIVE_NAME", value: "Jon"}, {name: "FAMILY_NAME", value: "Doe"}], [{name: "CITY", value: "Munich"}, {name: "ZIP", value: "81456"}]] + # should allow the receiver to render: + # Jon Doe + # Munich 81456 + type AddressUI extends object + properties + # A two dimension array containing the repesentation of values from an address profile. + array of AddressFields addressFields + + # Specified whether a filled field was done so by using the html autocomplete attribute or autofill heuristics. + type FillingStrategy extends string + enum + autocompleteAttribute + autofillInferred + + type FilledField extends object + properties + # The type of the field, e.g text, password etc. + string htmlType + # the html id + string id + # the html name + string name + # the field value + string value + # The actual field type, e.g FAMILY_NAME + string autofillType + # The filling strategy + FillingStrategy fillingStrategy + + # Emitted when an address form is filled. + event addressFormFilled + parameters + # Information about the fields that were filled + array of FilledField filledFields + # An UI representation of the address used to fill the form. + # Consists of a 2D array where each child represents an address/profile line. + AddressUI addressUi + # Trigger autofill on a form identified by the fieldId. # If the field and related form cannot be autofilled, returns an error. command trigger @@ -1027,6 +1109,11 @@ experimental domain Autofill parameters array of Address addresses + # Disables autofill domain notifications. + command disable + + # Enables autofill domain notifications. + command enable # Defines events for background web platform features. experimental domain BackgroundService @@ -1830,6 +1917,28 @@ experimental domain CSS # List of keyframes. array of CSSKeyframeRule keyframes + # Representation of a custom property registration through CSS.registerProperty + type CSSPropertyRegistration extends object + properties + string propertyName + optional Value initialValue + boolean inherits + string syntax + + + # CSS property at-rule representation. + type CSSPropertyRule extends object + properties + # The css style sheet identifier (absent for user agent stylesheet and user-specified + # stylesheet rules) this rule came from. + optional StyleSheetId styleSheetId + # Parent stylesheet's origin. + StyleSheetOrigin origin + # Associated property name. + Value propertyName + # Associated style declaration. + CSSStyle style + # CSS keyframe rule representation. type CSSKeyframeRule extends object properties @@ -1957,6 +2066,10 @@ experimental domain CSS optional array of CSSKeyframesRule cssKeyframesRules # A list of CSS position fallbacks matching this node. optional array of CSSPositionFallbackRule cssPositionFallbackRules + # A list of CSS at-property rules matching this node. + optional array of CSSPropertyRule cssPropertyRules + # A list of CSS property registrations matching this node. + optional array of CSSPropertyRegistration cssPropertyRegistrations # Id of the first parent element that does not have display: contents. experimental optional DOM.NodeId parentLayoutNodeId @@ -2017,6 +2130,16 @@ experimental domain CSS string propertyName string value + # Modifies the property rule property name. + command setPropertyRulePropertyName + parameters + StyleSheetId styleSheetId + SourceRange range + string propertyName + returns + # The resulting key text after modification. + Value propertyName + # Modifies the keyframe rule key text. command setKeyframeKey parameters @@ -3160,7 +3283,6 @@ domain DOM # execution will stop on these operations as if there was a regular breakpoint set. domain DOMDebugger depends on DOM - depends on Debugger depends on Runtime # DOM breakpoint type. @@ -3232,7 +3354,8 @@ domain DOMDebugger experimental optional string targetName # Removes breakpoint on particular native event. - experimental command removeInstrumentationBreakpoint + experimental deprecated command removeInstrumentationBreakpoint + redirect EventBreakpoints parameters # Instrumentation name to stop on. string eventName @@ -3267,7 +3390,8 @@ domain DOMDebugger experimental optional string targetName # Sets breakpoint on particular native event. - experimental command setInstrumentationBreakpoint + experimental deprecated command setInstrumentationBreakpoint + redirect EventBreakpoints parameters # Instrumentation name to stop on. string eventName @@ -3278,10 +3402,9 @@ domain DOMDebugger # Resource URL substring. All XHRs having this substring in the URL will get stopped upon. string url -# EventBreakpoints permits setting breakpoints on particular operations and -# events in targets that run JavaScript but do not have a DOM. -# JavaScript execution will stop on these operations as if there was a regular -# breakpoint set. +# EventBreakpoints permits setting JavaScript breakpoints on operations and events +# occurring in native code invoked from JavaScript. Once breakpoint is hit, it is +# reported through Debugger domain, similarly to regular breakpoints being hit. experimental domain EventBreakpoints # Sets breakpoint on particular native event. command setInstrumentationBreakpoint @@ -3295,6 +3418,9 @@ experimental domain EventBreakpoints # Instrumentation name to stop on. string eventName + # Removes all breakpoints + command disable + # This domain facilitates obtaining document snapshots with DOM, layout, and style information. experimental domain DOMSnapshot depends on CSS @@ -3811,6 +3937,49 @@ domain Emulation optional string bitness optional boolean wow64 + # Used to specify sensor types to emulate. + # See https://w3c.github.io/sensors/#automation for more information. + experimental type SensorType extends string + enum + absolute-orientation + accelerometer + ambient-light + gravity + gyroscope + linear-acceleration + magnetometer + proximity + relative-orientation + + experimental type SensorMetadata extends object + properties + optional boolean available + optional number minimumFrequency + optional number maximumFrequency + + experimental type SensorReadingSingle extends object + properties + number value + + experimental type SensorReadingXYZ extends object + properties + number x + number y + number z + + experimental type SensorReadingQuaternion extends object + properties + number x + number y + number z + number w + + experimental type SensorReading extends object + properties + optional SensorReadingSingle single + optional SensorReadingXYZ xyz + optional SensorReadingQuaternion quaternion + # Tells whether emulation is supported. command canEmulate returns @@ -3940,6 +4109,30 @@ domain Emulation # Mock accuracy optional number accuracy + experimental command getOverriddenSensorInformation + parameters + SensorType type + returns + number requestedSamplingFrequency + + # Overrides a platform sensor of a given type. If |enabled| is true, calls to + # Sensor.start() will use a virtual sensor as backend rather than fetching + # data from a real hardware sensor. Otherwise, existing virtual + # sensor-backend Sensor objects will fire an error event and new calls to + # Sensor.start() will attempt to use a real sensor instead. + experimental command setSensorOverrideEnabled + parameters + boolean enabled + SensorType type + optional SensorMetadata metadata + + # Updates the sensor readings reported by a sensor type previously overriden + # by setSensorOverrideEnabled. + experimental command setSensorOverrideReadings + parameters + SensorType type + SensorReading reading + # Overrides the Idle state. experimental command setIdleOverride parameters @@ -4387,9 +4580,9 @@ domain Input # The normalized tangential pressure, which has a range of [-1,1] (default: 0). experimental optional number tangentialPressure # The plane angle between the Y-Z plane and the plane containing both the stylus axis and the Y axis, in degrees of the range [-90,90], a positive tiltX is to the right (default: 0) - experimental optional integer tiltX + optional number tiltX # The plane angle between the X-Z plane and the plane containing both the stylus axis and the X axis, in degrees of the range [-90,90], a positive tiltY is towards the user (default: 0). - experimental optional integer tiltY + optional number tiltY # The clockwise rotation of a pen stylus around its own major axis, in degrees in the range [0,359] (default: 0). experimental optional integer twist # Identifier used to track touch sources between events, must be unique within an event. @@ -4555,9 +4748,9 @@ domain Input # The normalized tangential pressure, which has a range of [-1,1] (default: 0). experimental optional number tangentialPressure # The plane angle between the Y-Z plane and the plane containing both the stylus axis and the Y axis, in degrees of the range [-90,90], a positive tiltX is to the right (default: 0). - experimental optional integer tiltX + optional number tiltX # The plane angle between the X-Z plane and the plane containing both the stylus axis and the X axis, in degrees of the range [-90,90], a positive tiltY is towards the user (default: 0). - experimental optional integer tiltY + optional number tiltY # The clockwise rotation of a pen stylus around its own major axis, in degrees in the range [0,359] (default: 0). experimental optional integer twist # X delta in CSS pixels for mouse wheel event (default: 0). @@ -5648,6 +5841,8 @@ domain Network SameSiteNoneInsecure # The cookie was not stored due to user preferences. UserPreferences + # The cookie was blocked due to third-party cookie phaseout. + ThirdPartyPhaseout # The cookie was blocked by third-party cookie blocking between sites in # the same First-Party Set. ThirdPartyBlockedInFirstPartySet @@ -5693,6 +5888,8 @@ domain Network # character if it appears in the middle of the cookie name, value, an # attribute name, or an attribute value. DisallowedCharacter + # Cookie contains no content or only whitespace. + NoCookieContent # Types of reasons why a cookie may not be sent with a request. experimental type CookieBlockedReason extends string @@ -5719,6 +5916,8 @@ domain Network SameSiteNoneInsecure # The cookie was not sent due to user preferences. UserPreferences + # The cookie was blocked due to third-party cookie phaseout. + ThirdPartyPhaseout # The cookie was blocked by third-party cookie blocking between sites in # the same First-Party Set. ThirdPartyBlockedInFirstPartySet @@ -6993,6 +7192,16 @@ experimental domain Overlay # The content box highlight outline color (default: transparent). optional DOM.RGBA outlineColor + # Configuration for Window Controls Overlay + type WindowControlsOverlayConfig extends object + properties + # Whether the title bar CSS should be shown when emulating the Window Controls Overlay. + boolean showCSS + # Seleted platforms to show the overlay. + string selectedPlatform + # The theme color defined in app manifest. + string themeColor + type ContainerQueryHighlightConfig extends object properties # A descriptor for the highlight appearance of container query containers. @@ -7243,6 +7452,12 @@ experimental domain Overlay # An array of node identifiers and descriptors for the highlight appearance. array of IsolatedElementHighlightConfig isolatedElementHighlightConfigs + # Show Window Controls Overlay for PWA + command setShowWindowControlsOverlay + parameters + # Window Controls Overlay data, null means hide Window Controls Overlay + optional WindowControlsOverlayConfig windowControlsOverlayConfig + # Fired when the node should be inspected. This happens after call to `setInspectMode` or when # user manually inspects an element. event inspectNodeRequested @@ -7352,6 +7567,7 @@ domain Page ch-ect ch-prefers-color-scheme ch-prefers-reduced-motion + ch-prefers-reduced-transparency ch-rtt ch-save-data ch-ua @@ -8672,6 +8888,17 @@ domain Page PageSupportNeeded Circumstantial + experimental type BackForwardCacheBlockingDetails extends object + properties + # Url of the file where blockage happened. Optional because of tests. + optional string url + # Function name where blockage happened. Optional because of anonymous functions and tests. + optional string function + # Line number in the script (0-based). + integer lineNumber + # Column number in the script (0-based). + integer columnNumber + experimental type BackForwardCacheNotRestoredExplanation extends object properties # Type of the reason @@ -8683,6 +8910,7 @@ domain Page # - EmbedderExtensionSentMessageToCachedFrame: the extension ID. # optional string context + optional array of BackForwardCacheBlockingDetails details experimental type BackForwardCacheNotRestoredExplanationTree extends object properties @@ -9242,11 +9470,14 @@ experimental domain Storage loaded bid win + additionalBid + additionalBidWin + clear # Ad advertising element inside an interest group. type InterestGroupAd extends object properties - string renderUrl + string renderURL optional string metadata # The full details of an interest group. @@ -9256,10 +9487,10 @@ experimental domain Storage string name Network.TimeSinceEpoch expirationTime string joiningOrigin - optional string biddingUrl - optional string biddingWasmHelperUrl - optional string updateUrl - optional string trustedBiddingSignalsUrl + optional string biddingLogicURL + optional string biddingWasmHelperURL + optional string updateURL + optional string trustedBiddingSignalsURL array of string trustedBiddingSignalsKeys optional string userBiddingSignals array of InterestGroupAd ads @@ -9691,15 +9922,26 @@ experimental domain Storage string key UnsignedInt128AsBase16 value + experimental type AttributionReportingEventReportWindows extends object + properties + # duration in seconds + integer start + # duration in seconds + array of integer ends + + experimental type AttributionReportingTriggerDataMatching extends string + enum + exact + modulus + experimental type AttributionReportingSourceRegistration extends object properties Network.TimeSinceEpoch time # duration in seconds - optional integer expiry - # duration in seconds - optional integer eventReportWindow + integer expiry + AttributionReportingEventReportWindows eventReportWindows # duration in seconds - optional integer aggregatableReportWindow + integer aggregatableReportWindow AttributionReportingSourceType type string sourceOrigin string reportingOrigin @@ -9709,6 +9951,7 @@ experimental domain Storage array of AttributionReportingFilterDataEntry filterData array of AttributionReportingAggregationKeysEntry aggregationKeys optional UnsignedInt64AsBase10 debugKey + AttributionReportingTriggerDataMatching triggerDataMatching experimental type AttributionReportingSourceRegistrationResult extends string enum @@ -11196,7 +11439,6 @@ experimental domain Preload LowEndDevice InvalidSchemeRedirect InvalidSchemeNavigation - InProgressNavigation NavigationRequestBlockedByCsp MainFrameNavigation MojoBinderPolicy @@ -11208,7 +11450,6 @@ experimental domain Preload NavigationBadHttpStatus ClientCertRequested NavigationRequestNetworkError - MaxNumOfRunningPrerendersExceeded CancelAllHostsForTesting DidFailLoad Stop @@ -11220,11 +11461,8 @@ experimental domain Preload MixedContent TriggerBackgrounded MemoryLimitExceeded - # Prerenders can be cancelled when Chrome uses excessive memory. This is - # recorded when it fails to get the memory usage. - FailToGetMemoryUsage DataSaverEnabled - HasEffectiveUrl + TriggerUrlHasEffectiveUrl ActivatedBeforeStarted InactivePageRestriction StartFailed @@ -11253,21 +11491,14 @@ experimental domain Preload MemoryPressureOnTrigger MemoryPressureAfterTriggered PrerenderingDisabledByDevTools - ResourceLoadBlockedByClient SpeculationRuleRemoved ActivatedWithAuxiliaryBrowsingContexts - - # Fired when a prerender attempt is completed. - event prerenderAttemptCompleted - parameters - PreloadingAttemptKey key - # The frame id of the frame initiating prerendering. - Page.FrameId initiatingFrameId - string prerenderingUrl - PrerenderFinalStatus finalStatus - # This is used to give users more information about the name of the API call - # that is incompatible with prerender and has caused the cancellation of the attempt - optional string disallowedApiMethod + MaxNumOfRunningEagerPrerendersExceeded + MaxNumOfRunningNonEagerPrerendersExceeded + MaxNumOfRunningEmbedderPrerendersExceeded + PrerenderingUrlHasEffectiveUrl + RedirectedPrerenderingUrlHasEffectiveUrl + ActivationUrlHasEffectiveUrl # Fired when a preload enabled state is updated. event preloadEnabledStateUpdated @@ -11372,6 +11603,7 @@ experimental domain FedCm enum AccountChooser AutoReauthn + ConfirmIdpLogin # Corresponds to IdentityRequestAccount type Account extends object @@ -11382,7 +11614,7 @@ experimental domain FedCm string givenName string pictureUrl string idpConfigUrl - string idpSigninUrl + string idpLoginUrl LoginState loginState # These two are only set if the loginState is signUp optional string termsOfServiceUrl @@ -11412,6 +11644,12 @@ experimental domain FedCm string dialogId integer accountIndex + # Only valid if the dialog type is ConfirmIdpLogin. Acts as if the user had + # clicked the continue button. + command confirmIdpLogin + parameters + string dialogId + command dismissDialog parameters string dialogId diff --git a/common/devtools/chromium/v117/js_protocol.pdl b/common/devtools/chromium/v120/js_protocol.pdl similarity index 98% rename from common/devtools/chromium/v117/js_protocol.pdl rename to common/devtools/chromium/v120/js_protocol.pdl index ed6226308c266..4754f17c5b02d 100644 --- a/common/devtools/chromium/v117/js_protocol.pdl +++ b/common/devtools/chromium/v120/js_protocol.pdl @@ -1014,8 +1014,7 @@ domain Runtime # Unique script identifier. type ScriptId extends string - # Represents options for serialization. Overrides `generatePreview`, `returnByValue` and - # `generateWebDriverValue`. + # Represents options for serialization. Overrides `generatePreview` and `returnByValue`. type SerializationOptions extends object properties enum serialization @@ -1027,8 +1026,7 @@ domain Runtime # `returnByValue: true`. Overrides `returnByValue`. json # Only remote object id is put in the result. Same bahaviour as if no - # `serializationOptions`, `generatePreview`, `returnByValue` nor `generateWebDriverValue` - # are provided. + # `serializationOptions`, `generatePreview` nor `returnByValue` are provided. idOnly # Deep serialization depth. Default is full depth. Respected only in `deep` serialization mode. @@ -1066,6 +1064,7 @@ domain Runtime arraybuffer node window + generator optional any value optional string objectId # Set if value reference met more then once during serialization. In such @@ -1125,8 +1124,6 @@ domain Runtime optional UnserializableValue unserializableValue # String representation of the object. optional string description - # Deprecated. Use `deepSerializedValue` instead. WebDriver BiDi representation of the value. - deprecated optional DeepSerializedValue webDriverValue # Deep serialized value. experimental optional DeepSerializedValue deepSerializedValue # Unique object identifier (for non-primitive values). @@ -1442,13 +1439,8 @@ domain Runtime # boundaries). # This is mutually exclusive with `executionContextId`. experimental optional string uniqueContextId - # Deprecated. Use `serializationOptions: {serialization:"deep"}` instead. - # Whether the result should contain `webDriverValue`, serialized according to - # https://w3c.github.io/webdriver-bidi. This is mutually exclusive with `returnByValue`, but - # resulting `objectId` is still provided. - deprecated optional boolean generateWebDriverValue # Specifies the result serialization. If provided, overrides - # `generatePreview`, `returnByValue` and `generateWebDriverValue`. + # `generatePreview` and `returnByValue`. experimental optional SerializationOptions serializationOptions returns @@ -1536,14 +1528,8 @@ domain Runtime # boundaries). # This is mutually exclusive with `contextId`. experimental optional string uniqueContextId - # Deprecated. Use `serializationOptions: {serialization:"deep"}` instead. - # Whether the result should contain `webDriverValue`, serialized - # according to - # https://w3c.github.io/webdriver-bidi. This is mutually exclusive with `returnByValue`, but - # resulting `objectId` is still provided. - deprecated optional boolean generateWebDriverValue # Specifies the result serialization. If provided, overrides - # `generatePreview`, `returnByValue` and `generateWebDriverValue`. + # `generatePreview` and `returnByValue`. experimental optional SerializationOptions serializationOptions returns # Evaluation result. diff --git a/dotnet/selenium-dotnet-version.bzl b/dotnet/selenium-dotnet-version.bzl index 46e071f17d9aa..7198fb4c536da 100644 --- a/dotnet/selenium-dotnet-version.bzl +++ b/dotnet/selenium-dotnet-version.bzl @@ -7,7 +7,7 @@ SUPPORTED_NET_STANDARD_VERSIONS = ["netstandard2.0"] SUPPORTED_DEVTOOLS_VERSIONS = [ "v85", "v119", - "v117", + "v120", "v118", ] diff --git a/dotnet/src/webdriver/DevTools/DevToolsDomains.cs b/dotnet/src/webdriver/DevTools/DevToolsDomains.cs index eb90121a099bc..bae33a070b225 100644 --- a/dotnet/src/webdriver/DevTools/DevToolsDomains.cs +++ b/dotnet/src/webdriver/DevTools/DevToolsDomains.cs @@ -38,7 +38,7 @@ public abstract class DevToolsDomains private static readonly Dictionary SupportedDevToolsVersions = new Dictionary() { { 118, typeof(V118.V118Domains) }, - { 117, typeof(V117.V117Domains) }, + { 120, typeof(V120.V120Domains) }, { 119, typeof(V119.V119Domains) }, { 85, typeof(V85.V85Domains) } }; diff --git a/dotnet/src/webdriver/DevTools/v117/V117Domains.cs b/dotnet/src/webdriver/DevTools/v120/V120Domains.cs similarity index 79% rename from dotnet/src/webdriver/DevTools/v117/V117Domains.cs rename to dotnet/src/webdriver/DevTools/v120/V120Domains.cs index 1b6bff458e95d..781d15025ff8b 100644 --- a/dotnet/src/webdriver/DevTools/v117/V117Domains.cs +++ b/dotnet/src/webdriver/DevTools/v120/V120Domains.cs @@ -1,4 +1,4 @@ -// +// // Licensed to the Software Freedom Conservancy (SFC) under one // or more contributor license agreements. See the NOTICE file // distributed with this work for additional information @@ -19,20 +19,20 @@ using System.Collections.Generic; using System.Text; -namespace OpenQA.Selenium.DevTools.V117 +namespace OpenQA.Selenium.DevTools.V120 { /// - /// Class containing the domain implementation for version 117 of the DevTools Protocol. + /// Class containing the domain implementation for version 120 of the DevTools Protocol. /// - public class V117Domains : DevToolsDomains + public class V120Domains : DevToolsDomains { private DevToolsSessionDomains domains; /// - /// Initializes a new instance of the V117Domains class. + /// Initializes a new instance of the V120Domains class. /// /// The DevToolsSession to use with this set of domains. - public V117Domains(DevToolsSession session) + public V120Domains(DevToolsSession session) { this.domains = new DevToolsSessionDomains(session); } @@ -40,7 +40,7 @@ public V117Domains(DevToolsSession session) /// /// Gets the DevTools Protocol version for which this class is valid. /// - public static int DevToolsVersion => 117; + public static int DevToolsVersion => 120; /// /// Gets the version-specific domains for the DevTools session. This value must be cast to a version specific type to be at all useful. @@ -50,21 +50,21 @@ public V117Domains(DevToolsSession session) /// /// Gets the object used for manipulating network information in the browser. /// - public override DevTools.Network Network => new V117Network(domains.Network, domains.Fetch); + public override DevTools.Network Network => new V120Network(domains.Network, domains.Fetch); /// /// Gets the object used for manipulating the browser's JavaScript execution. /// - public override JavaScript JavaScript => new V117JavaScript(domains.Runtime, domains.Page); + public override JavaScript JavaScript => new V120JavaScript(domains.Runtime, domains.Page); /// /// Gets the object used for manipulating DevTools Protocol targets. /// - public override DevTools.Target Target => new V117Target(domains.Target); + public override DevTools.Target Target => new V120Target(domains.Target); /// /// Gets the object used for manipulating the browser's logs. /// - public override DevTools.Log Log => new V117Log(domains.Log); + public override DevTools.Log Log => new V120Log(domains.Log); } } diff --git a/dotnet/src/webdriver/DevTools/v117/V117JavaScript.cs b/dotnet/src/webdriver/DevTools/v120/V120JavaScript.cs similarity index 94% rename from dotnet/src/webdriver/DevTools/v117/V117JavaScript.cs rename to dotnet/src/webdriver/DevTools/v120/V120JavaScript.cs index c76a6aa95cedf..01aa1d8eb649e 100644 --- a/dotnet/src/webdriver/DevTools/v117/V117JavaScript.cs +++ b/dotnet/src/webdriver/DevTools/v120/V120JavaScript.cs @@ -1,4 +1,4 @@ -// +// // Licensed to the Software Freedom Conservancy (SFC) under one // or more contributor license agreements. See the NOTICE file // distributed with this work for additional information @@ -18,25 +18,25 @@ using System; using System.Collections.Generic; using System.Threading.Tasks; -using OpenQA.Selenium.DevTools.V117.Page; -using OpenQA.Selenium.DevTools.V117.Runtime; +using OpenQA.Selenium.DevTools.V120.Page; +using OpenQA.Selenium.DevTools.V120.Runtime; -namespace OpenQA.Selenium.DevTools.V117 +namespace OpenQA.Selenium.DevTools.V120 { /// - /// Class containing the JavaScript implementation for version 117 of the DevTools Protocol. + /// Class containing the JavaScript implementation for version 120 of the DevTools Protocol. /// - public class V117JavaScript : JavaScript + public class V120JavaScript : JavaScript { private RuntimeAdapter runtime; private PageAdapter page; /// - /// Initializes a new instance of the class. + /// Initializes a new instance of the class. /// /// The DevTools Protocol adapter for the Runtime domain. /// The DevTools Protocol adapter for the Page domain. - public V117JavaScript(RuntimeAdapter runtime, PageAdapter page) + public V120JavaScript(RuntimeAdapter runtime, PageAdapter page) { this.runtime = runtime; this.page = page; diff --git a/dotnet/src/webdriver/DevTools/v117/V117Log.cs b/dotnet/src/webdriver/DevTools/v120/V120Log.cs similarity index 89% rename from dotnet/src/webdriver/DevTools/v117/V117Log.cs rename to dotnet/src/webdriver/DevTools/v120/V120Log.cs index 78b8b51b538a2..d87e91e08bc34 100644 --- a/dotnet/src/webdriver/DevTools/v117/V117Log.cs +++ b/dotnet/src/webdriver/DevTools/v120/V120Log.cs @@ -1,4 +1,4 @@ -// +// // Licensed to the Software Freedom Conservancy (SFC) under one // or more contributor license agreements. See the NOTICE file // distributed with this work for additional information @@ -20,22 +20,22 @@ using System.Text; using System.Threading; using System.Threading.Tasks; -using OpenQA.Selenium.DevTools.V117.Log; +using OpenQA.Selenium.DevTools.V120.Log; -namespace OpenQA.Selenium.DevTools.V117 +namespace OpenQA.Selenium.DevTools.V120 { /// - /// Class containing the browser's log as referenced by version 117 of the DevTools Protocol. + /// Class containing the browser's log as referenced by version 120 of the DevTools Protocol. /// - public class V117Log : DevTools.Log + public class V120Log : DevTools.Log { private LogAdapter adapter; /// - /// Initializes a new instance of the class. + /// Initializes a new instance of the class. /// /// The adapter for the Log domain. - public V117Log(LogAdapter adapter) + public V120Log(LogAdapter adapter) { this.adapter = adapter; this.adapter.EntryAdded += OnAdapterEntryAdded; diff --git a/dotnet/src/webdriver/DevTools/v117/V117Network.cs b/dotnet/src/webdriver/DevTools/v120/V120Network.cs similarity index 95% rename from dotnet/src/webdriver/DevTools/v117/V117Network.cs rename to dotnet/src/webdriver/DevTools/v120/V120Network.cs index 7214892a3c720..e16c27f680222 100644 --- a/dotnet/src/webdriver/DevTools/v117/V117Network.cs +++ b/dotnet/src/webdriver/DevTools/v120/V120Network.cs @@ -1,4 +1,4 @@ -// +// // Licensed to the Software Freedom Conservancy (SFC) under one // or more contributor license agreements. See the NOTICE file // distributed with this work for additional information @@ -20,25 +20,25 @@ using System.Collections.Generic; using System.Text; using System.Threading.Tasks; -using OpenQA.Selenium.DevTools.V117.Fetch; -using OpenQA.Selenium.DevTools.V117.Network; +using OpenQA.Selenium.DevTools.V120.Fetch; +using OpenQA.Selenium.DevTools.V120.Network; -namespace OpenQA.Selenium.DevTools.V117 +namespace OpenQA.Selenium.DevTools.V120 { /// - /// Class providing functionality for manipulating network calls using version 117 of the DevTools Protocol + /// Class providing functionality for manipulating network calls using version 120 of the DevTools Protocol /// - public class V117Network : DevTools.Network + public class V120Network : DevTools.Network { private FetchAdapter fetch; private NetworkAdapter network; /// - /// Initializes a new instance of the class. + /// Initializes a new instance of the class. /// /// The adapter for the Network domain. /// The adapter for the Fetch domain. - public V117Network(NetworkAdapter network, FetchAdapter fetch) + public V120Network(NetworkAdapter network, FetchAdapter fetch) { this.network = network; this.fetch = fetch; @@ -216,9 +216,9 @@ public override async Task ContinueWithAuth(string requestId, string userName, s await fetch.ContinueWithAuth(new ContinueWithAuthCommandSettings() { RequestId = requestId, - AuthChallengeResponse = new V117.Fetch.AuthChallengeResponse() + AuthChallengeResponse = new V120.Fetch.AuthChallengeResponse() { - Response = V117.Fetch.AuthChallengeResponseResponseValues.ProvideCredentials, + Response = V120.Fetch.AuthChallengeResponseResponseValues.ProvideCredentials, Username = userName, Password = password } @@ -235,9 +235,9 @@ public override async Task CancelAuth(string requestId) await fetch.ContinueWithAuth(new ContinueWithAuthCommandSettings() { RequestId = requestId, - AuthChallengeResponse = new OpenQA.Selenium.DevTools.V117.Fetch.AuthChallengeResponse() + AuthChallengeResponse = new OpenQA.Selenium.DevTools.V120.Fetch.AuthChallengeResponse() { - Response = V117.Fetch.AuthChallengeResponseResponseValues.CancelAuth + Response = V120.Fetch.AuthChallengeResponseResponseValues.CancelAuth } }).ConfigureAwait(false); } diff --git a/dotnet/src/webdriver/DevTools/v117/V117Target.cs b/dotnet/src/webdriver/DevTools/v120/V120Target.cs similarity index 94% rename from dotnet/src/webdriver/DevTools/v117/V117Target.cs rename to dotnet/src/webdriver/DevTools/v120/V120Target.cs index 37b3a801ff51f..edee8120130cf 100644 --- a/dotnet/src/webdriver/DevTools/v117/V117Target.cs +++ b/dotnet/src/webdriver/DevTools/v120/V120Target.cs @@ -1,4 +1,4 @@ -// +// // Licensed to the Software Freedom Conservancy (SFC) under one // or more contributor license agreements. See the NOTICE file // distributed with this work for additional information @@ -21,22 +21,22 @@ using System.Collections.ObjectModel; using System.Text; using System.Threading.Tasks; -using OpenQA.Selenium.DevTools.V117.Target; +using OpenQA.Selenium.DevTools.V120.Target; -namespace OpenQA.Selenium.DevTools.V117 +namespace OpenQA.Selenium.DevTools.V120 { /// - /// Class providing functionality for manipulating targets for version 117 of the DevTools Protocol + /// Class providing functionality for manipulating targets for version 120 of the DevTools Protocol /// - public class V117Target : DevTools.Target + public class V120Target : DevTools.Target { private TargetAdapter adapter; /// - /// Initializes a new instance of the class. + /// Initializes a new instance of the class. /// /// The adapter for the Target domain. - public V117Target(TargetAdapter adapter) + public V120Target(TargetAdapter adapter) { this.adapter = adapter; adapter.DetachedFromTarget += OnDetachedFromTarget; diff --git a/dotnet/src/webdriver/WebDriver.csproj.prebuild.cmd b/dotnet/src/webdriver/WebDriver.csproj.prebuild.cmd index b38e8c9fc0f96..8a69551715de1 100644 --- a/dotnet/src/webdriver/WebDriver.csproj.prebuild.cmd +++ b/dotnet/src/webdriver/WebDriver.csproj.prebuild.cmd @@ -34,10 +34,10 @@ if not exist "%1..\..\..\bazel-bin\dotnet\src\webdriver\cdp\v119\DevToolsSessio popd ) -if not exist "%1..\..\..\bazel-bin\dotnet\src\webdriver\cdp\v117\DevToolsSessionDomains.cs" ( - echo Generating CDP code for version 117 +if not exist "%1..\..\..\bazel-bin\dotnet\src\webdriver\cdp\v120\DevToolsSessionDomains.cs" ( + echo Generating CDP code for version 120 pushd "%1..\..\.." - bazel build //dotnet/src/webdriver/cdp:generate-v117 + bazel build //dotnet/src/webdriver/cdp:generate-v120 popd ) diff --git a/dotnet/src/webdriver/WebDriver.csproj.prebuild.sh b/dotnet/src/webdriver/WebDriver.csproj.prebuild.sh index 288687eaf7cca..182766c5fc7b1 100755 --- a/dotnet/src/webdriver/WebDriver.csproj.prebuild.sh +++ b/dotnet/src/webdriver/WebDriver.csproj.prebuild.sh @@ -29,10 +29,10 @@ then bazel build //dotnet/src/webdriver/cdp:generate-v119 fi -if [[ ! -f "$1../../../bazel-bin/dotnet/src/webdriver/cdp/v117/DevToolsSessionDomains.cs" ]] +if [[ ! -f "$1../../../bazel-bin/dotnet/src/webdriver/cdp/v120/DevToolsSessionDomains.cs" ]] then - echo "Generating CDP code for version 117" - bazel build //dotnet/src/webdriver/cdp:generate-v117 + echo "Generating CDP code for version 120" + bazel build //dotnet/src/webdriver/cdp:generate-v120 fi if [[ ! -f "$1../../../bazel-bin/dotnet/src/webdriver/cdp/v118/DevToolsSessionDomains.cs" ]] diff --git a/dotnet/test/common/CustomDriverConfigs/StableChannelChromeDriver.cs b/dotnet/test/common/CustomDriverConfigs/StableChannelChromeDriver.cs index a03b389e93911..714acee8974ba 100644 --- a/dotnet/test/common/CustomDriverConfigs/StableChannelChromeDriver.cs +++ b/dotnet/test/common/CustomDriverConfigs/StableChannelChromeDriver.cs @@ -20,7 +20,7 @@ public StableChannelChromeDriver(ChromeDriverService service, ChromeOptions opti public static ChromeOptions DefaultOptions { - get { return new ChromeOptions() { BrowserVersion = "119" }; } + get { return new ChromeOptions() { BrowserVersion = "120" }; } } } } diff --git a/dotnet/test/common/DevTools/DevToolsConsoleTest.cs b/dotnet/test/common/DevTools/DevToolsConsoleTest.cs index cfeaf8c930c19..c04c1f0802211 100644 --- a/dotnet/test/common/DevTools/DevToolsConsoleTest.cs +++ b/dotnet/test/common/DevTools/DevToolsConsoleTest.cs @@ -6,7 +6,7 @@ namespace OpenQA.Selenium.DevTools { - using CurrentCdpVersion = V119; + using CurrentCdpVersion = V120; [TestFixture] public class DevToolsConsoleTest : DevToolsTestFixture diff --git a/dotnet/test/common/DevTools/DevToolsLogTest.cs b/dotnet/test/common/DevTools/DevToolsLogTest.cs index 1eeca91cb12bb..d2a09f91842a1 100644 --- a/dotnet/test/common/DevTools/DevToolsLogTest.cs +++ b/dotnet/test/common/DevTools/DevToolsLogTest.cs @@ -6,7 +6,7 @@ namespace OpenQA.Selenium.DevTools { - using CurrentCdpVersion = V119; + using CurrentCdpVersion = V120; [TestFixture] public class DevToolsLogTest : DevToolsTestFixture diff --git a/dotnet/test/common/DevTools/DevToolsNetworkTest.cs b/dotnet/test/common/DevTools/DevToolsNetworkTest.cs index 5834203e54d50..3d49113e14d58 100644 --- a/dotnet/test/common/DevTools/DevToolsNetworkTest.cs +++ b/dotnet/test/common/DevTools/DevToolsNetworkTest.cs @@ -6,7 +6,7 @@ namespace OpenQA.Selenium.DevTools { - using CurrentCdpVersion = V119; + using CurrentCdpVersion = V120; [TestFixture] public class DevToolsNetworkTest : DevToolsTestFixture diff --git a/dotnet/test/common/DevTools/DevToolsPerformanceTest.cs b/dotnet/test/common/DevTools/DevToolsPerformanceTest.cs index a0c1a5fb5bf17..341b74e2105d4 100644 --- a/dotnet/test/common/DevTools/DevToolsPerformanceTest.cs +++ b/dotnet/test/common/DevTools/DevToolsPerformanceTest.cs @@ -3,7 +3,7 @@ namespace OpenQA.Selenium.DevTools { - using CurrentCdpVersion = V119; + using CurrentCdpVersion = V120; [TestFixture] public class DevToolsPerformanceTest : DevToolsTestFixture diff --git a/dotnet/test/common/DevTools/DevToolsProfilerTest.cs b/dotnet/test/common/DevTools/DevToolsProfilerTest.cs index c6415f093c646..636e342e3e47c 100644 --- a/dotnet/test/common/DevTools/DevToolsProfilerTest.cs +++ b/dotnet/test/common/DevTools/DevToolsProfilerTest.cs @@ -5,7 +5,7 @@ namespace OpenQA.Selenium.DevTools { - using CurrentCdpVersion = V119; + using CurrentCdpVersion = V120; [TestFixture] public class DevToolsProfilerTest : DevToolsTestFixture diff --git a/dotnet/test/common/DevTools/DevToolsSecurityTest.cs b/dotnet/test/common/DevTools/DevToolsSecurityTest.cs index f041bcea713e2..f77fb33589405 100644 --- a/dotnet/test/common/DevTools/DevToolsSecurityTest.cs +++ b/dotnet/test/common/DevTools/DevToolsSecurityTest.cs @@ -6,7 +6,7 @@ namespace OpenQA.Selenium.DevTools { - using CurrentCdpVersion = V119; + using CurrentCdpVersion = V120; [TestFixture] public class DevToolsSecurityTest : DevToolsTestFixture diff --git a/dotnet/test/common/DevTools/DevToolsTargetTest.cs b/dotnet/test/common/DevTools/DevToolsTargetTest.cs index e165cd64bb1f3..00a7909573a40 100644 --- a/dotnet/test/common/DevTools/DevToolsTargetTest.cs +++ b/dotnet/test/common/DevTools/DevToolsTargetTest.cs @@ -6,7 +6,7 @@ namespace OpenQA.Selenium.DevTools { - using CurrentCdpVersion = V119; + using CurrentCdpVersion = V120; [TestFixture] public class DevToolsTargetTest : DevToolsTestFixture diff --git a/java/src/org/openqa/selenium/devtools/v117/BUILD.bazel b/java/src/org/openqa/selenium/devtools/v120/BUILD.bazel similarity index 98% rename from java/src/org/openqa/selenium/devtools/v117/BUILD.bazel rename to java/src/org/openqa/selenium/devtools/v120/BUILD.bazel index 7ec1d9489812f..de423298215d3 100644 --- a/java/src/org/openqa/selenium/devtools/v117/BUILD.bazel +++ b/java/src/org/openqa/selenium/devtools/v120/BUILD.bazel @@ -2,7 +2,7 @@ load("//common:defs.bzl", "copy_file") load("//java:defs.bzl", "java_export", "java_library") load("//java:version.bzl", "SE_VERSION") -cdp_version = "v117" +cdp_version = "v120" java_export( name = cdp_version, diff --git a/java/src/org/openqa/selenium/devtools/v117/v117CdpInfo.java b/java/src/org/openqa/selenium/devtools/v120/v120CdpInfo.java similarity index 86% rename from java/src/org/openqa/selenium/devtools/v117/v117CdpInfo.java rename to java/src/org/openqa/selenium/devtools/v120/v120CdpInfo.java index e508716940b68..6d43aba2f4bb7 100644 --- a/java/src/org/openqa/selenium/devtools/v117/v117CdpInfo.java +++ b/java/src/org/openqa/selenium/devtools/v120/v120CdpInfo.java @@ -15,15 +15,15 @@ // specific language governing permissions and limitations // under the License. -package org.openqa.selenium.devtools.v117; +package org.openqa.selenium.devtools.v120; import com.google.auto.service.AutoService; import org.openqa.selenium.devtools.CdpInfo; @AutoService(CdpInfo.class) -public class v117CdpInfo extends CdpInfo { +public class v120CdpInfo extends CdpInfo { - public v117CdpInfo() { - super(117, v117Domains::new); + public v120CdpInfo() { + super(120, v120Domains::new); } } diff --git a/java/src/org/openqa/selenium/devtools/v117/v117Domains.java b/java/src/org/openqa/selenium/devtools/v120/v120Domains.java similarity index 77% rename from java/src/org/openqa/selenium/devtools/v117/v117Domains.java rename to java/src/org/openqa/selenium/devtools/v120/v120Domains.java index 4afd2d5aaccd4..84d207fb3f565 100644 --- a/java/src/org/openqa/selenium/devtools/v117/v117Domains.java +++ b/java/src/org/openqa/selenium/devtools/v120/v120Domains.java @@ -15,7 +15,7 @@ // specific language governing permissions and limitations // under the License. -package org.openqa.selenium.devtools.v117; +package org.openqa.selenium.devtools.v120; import org.openqa.selenium.devtools.DevTools; import org.openqa.selenium.devtools.idealized.Domains; @@ -26,21 +26,21 @@ import org.openqa.selenium.devtools.idealized.target.Target; import org.openqa.selenium.internal.Require; -public class v117Domains implements Domains { +public class v120Domains implements Domains { - private final v117Javascript js; - private final v117Events events; - private final v117Log log; - private final v117Network network; - private final v117Target target; + private final v120Javascript js; + private final v120Events events; + private final v120Log log; + private final v120Network network; + private final v120Target target; - public v117Domains(DevTools devtools) { + public v120Domains(DevTools devtools) { Require.nonNull("DevTools", devtools); - events = new v117Events(devtools); - js = new v117Javascript(devtools); - log = new v117Log(); - network = new v117Network(devtools); - target = new v117Target(); + events = new v120Events(devtools); + js = new v120Javascript(devtools); + log = new v120Log(); + network = new v120Network(devtools); + target = new v120Target(); } @Override diff --git a/java/src/org/openqa/selenium/devtools/v117/v117Events.java b/java/src/org/openqa/selenium/devtools/v120/v120Events.java similarity index 86% rename from java/src/org/openqa/selenium/devtools/v117/v117Events.java rename to java/src/org/openqa/selenium/devtools/v120/v120Events.java index a76cbd637dc1e..3262c64a61c52 100644 --- a/java/src/org/openqa/selenium/devtools/v117/v117Events.java +++ b/java/src/org/openqa/selenium/devtools/v120/v120Events.java @@ -15,7 +15,7 @@ // specific language governing permissions and limitations // under the License. -package org.openqa.selenium.devtools.v117; +package org.openqa.selenium.devtools.v120; import java.time.Instant; import java.util.List; @@ -28,15 +28,15 @@ import org.openqa.selenium.devtools.events.ConsoleEvent; import org.openqa.selenium.devtools.idealized.Events; import org.openqa.selenium.devtools.idealized.runtime.model.RemoteObject; -import org.openqa.selenium.devtools.v117.runtime.Runtime; -import org.openqa.selenium.devtools.v117.runtime.model.ConsoleAPICalled; -import org.openqa.selenium.devtools.v117.runtime.model.ExceptionDetails; -import org.openqa.selenium.devtools.v117.runtime.model.ExceptionThrown; -import org.openqa.selenium.devtools.v117.runtime.model.StackTrace; +import org.openqa.selenium.devtools.v120.runtime.Runtime; +import org.openqa.selenium.devtools.v120.runtime.model.ConsoleAPICalled; +import org.openqa.selenium.devtools.v120.runtime.model.ExceptionDetails; +import org.openqa.selenium.devtools.v120.runtime.model.ExceptionThrown; +import org.openqa.selenium.devtools.v120.runtime.model.StackTrace; -public class v117Events extends Events { +public class v120Events extends Events { - public v117Events(DevTools devtools) { + public v120Events(DevTools devtools) { super(devtools); } @@ -77,7 +77,7 @@ protected ConsoleEvent toConsoleEvent(ConsoleAPICalled event) { protected JavascriptException toJsException(ExceptionThrown event) { ExceptionDetails details = event.getExceptionDetails(); Optional maybeTrace = details.getStackTrace(); - Optional maybeException = + Optional maybeException = details.getException(); String message = diff --git a/java/src/org/openqa/selenium/devtools/v117/v117Javascript.java b/java/src/org/openqa/selenium/devtools/v120/v120Javascript.java similarity index 85% rename from java/src/org/openqa/selenium/devtools/v117/v117Javascript.java rename to java/src/org/openqa/selenium/devtools/v120/v120Javascript.java index f1a1a730e78e0..781c0b5d5a21a 100644 --- a/java/src/org/openqa/selenium/devtools/v117/v117Javascript.java +++ b/java/src/org/openqa/selenium/devtools/v120/v120Javascript.java @@ -15,21 +15,21 @@ // specific language governing permissions and limitations // under the License. -package org.openqa.selenium.devtools.v117; +package org.openqa.selenium.devtools.v120; import java.util.Optional; import org.openqa.selenium.devtools.Command; import org.openqa.selenium.devtools.DevTools; import org.openqa.selenium.devtools.Event; import org.openqa.selenium.devtools.idealized.Javascript; -import org.openqa.selenium.devtools.v117.page.Page; -import org.openqa.selenium.devtools.v117.page.model.ScriptIdentifier; -import org.openqa.selenium.devtools.v117.runtime.Runtime; -import org.openqa.selenium.devtools.v117.runtime.model.BindingCalled; +import org.openqa.selenium.devtools.v120.page.Page; +import org.openqa.selenium.devtools.v120.page.model.ScriptIdentifier; +import org.openqa.selenium.devtools.v120.runtime.Runtime; +import org.openqa.selenium.devtools.v120.runtime.model.BindingCalled; -public class v117Javascript extends Javascript { +public class v120Javascript extends Javascript { - public v117Javascript(DevTools devtools) { + public v120Javascript(DevTools devtools) { super(devtools); } diff --git a/java/src/org/openqa/selenium/devtools/v117/v117Log.java b/java/src/org/openqa/selenium/devtools/v120/v120Log.java similarity index 89% rename from java/src/org/openqa/selenium/devtools/v117/v117Log.java rename to java/src/org/openqa/selenium/devtools/v120/v120Log.java index abe69f5c3c290..563eaee11fdfc 100644 --- a/java/src/org/openqa/selenium/devtools/v117/v117Log.java +++ b/java/src/org/openqa/selenium/devtools/v120/v120Log.java @@ -15,19 +15,19 @@ // specific language governing permissions and limitations // under the License. -package org.openqa.selenium.devtools.v117; +package org.openqa.selenium.devtools.v120; import java.util.function.Function; import java.util.logging.Level; import org.openqa.selenium.devtools.Command; import org.openqa.selenium.devtools.ConverterFunctions; import org.openqa.selenium.devtools.Event; -import org.openqa.selenium.devtools.v117.log.Log; -import org.openqa.selenium.devtools.v117.log.model.LogEntry; -import org.openqa.selenium.devtools.v117.runtime.model.Timestamp; +import org.openqa.selenium.devtools.v120.log.Log; +import org.openqa.selenium.devtools.v120.log.model.LogEntry; +import org.openqa.selenium.devtools.v120.runtime.model.Timestamp; import org.openqa.selenium.json.JsonInput; -public class v117Log implements org.openqa.selenium.devtools.idealized.log.Log { +public class v120Log implements org.openqa.selenium.devtools.idealized.log.Log { @Override public Command enable() { diff --git a/java/src/org/openqa/selenium/devtools/v117/v117Network.java b/java/src/org/openqa/selenium/devtools/v120/v120Network.java similarity index 92% rename from java/src/org/openqa/selenium/devtools/v117/v117Network.java rename to java/src/org/openqa/selenium/devtools/v120/v120Network.java index b3840beef2cae..e7202df1d62c9 100644 --- a/java/src/org/openqa/selenium/devtools/v117/v117Network.java +++ b/java/src/org/openqa/selenium/devtools/v120/v120Network.java @@ -15,7 +15,7 @@ // specific language governing permissions and limitations // under the License. -package org.openqa.selenium.devtools.v117; +package org.openqa.selenium.devtools.v120; import static java.net.HttpURLConnection.HTTP_OK; @@ -30,35 +30,35 @@ import org.openqa.selenium.devtools.DevToolsException; import org.openqa.selenium.devtools.Event; import org.openqa.selenium.devtools.idealized.Network; -import org.openqa.selenium.devtools.v117.fetch.Fetch; -import org.openqa.selenium.devtools.v117.fetch.model.*; -import org.openqa.selenium.devtools.v117.network.model.Request; +import org.openqa.selenium.devtools.v120.fetch.Fetch; +import org.openqa.selenium.devtools.v120.fetch.model.*; +import org.openqa.selenium.devtools.v120.network.model.Request; import org.openqa.selenium.internal.Either; import org.openqa.selenium.remote.http.HttpRequest; import org.openqa.selenium.remote.http.HttpResponse; -public class v117Network extends Network { +public class v120Network extends Network { - private static final Logger LOG = Logger.getLogger(v117Network.class.getName()); + private static final Logger LOG = Logger.getLogger(v120Network.class.getName()); - public v117Network(DevTools devTools) { + public v120Network(DevTools devTools) { super(devTools); } @Override protected Command setUserAgentOverride(UserAgent userAgent) { - return org.openqa.selenium.devtools.v117.network.Network.setUserAgentOverride( + return org.openqa.selenium.devtools.v120.network.Network.setUserAgentOverride( userAgent.userAgent(), userAgent.acceptLanguage(), userAgent.platform(), Optional.empty()); } @Override protected Command enableNetworkCaching() { - return org.openqa.selenium.devtools.v117.network.Network.setCacheDisabled(false); + return org.openqa.selenium.devtools.v120.network.Network.setCacheDisabled(false); } @Override protected Command disableNetworkCaching() { - return org.openqa.selenium.devtools.v117.network.Network.setCacheDisabled(true); + return org.openqa.selenium.devtools.v120.network.Network.setCacheDisabled(true); } @Override diff --git a/java/src/org/openqa/selenium/devtools/v117/v117Target.java b/java/src/org/openqa/selenium/devtools/v120/v120Target.java similarity index 83% rename from java/src/org/openqa/selenium/devtools/v117/v117Target.java rename to java/src/org/openqa/selenium/devtools/v120/v120Target.java index f4d3c579e2cb8..06f87dfe9ebd0 100644 --- a/java/src/org/openqa/selenium/devtools/v117/v117Target.java +++ b/java/src/org/openqa/selenium/devtools/v120/v120Target.java @@ -15,7 +15,7 @@ // specific language governing permissions and limitations // under the License. -package org.openqa.selenium.devtools.v117; +package org.openqa.selenium.devtools.v120; import java.util.List; import java.util.Map; @@ -28,21 +28,21 @@ import org.openqa.selenium.devtools.idealized.browser.model.BrowserContextID; import org.openqa.selenium.devtools.idealized.target.model.SessionID; import org.openqa.selenium.devtools.idealized.target.model.TargetID; -import org.openqa.selenium.devtools.v117.target.Target; -import org.openqa.selenium.devtools.v117.target.model.TargetInfo; +import org.openqa.selenium.devtools.v120.target.Target; +import org.openqa.selenium.devtools.v120.target.model.TargetInfo; import org.openqa.selenium.json.JsonInput; import org.openqa.selenium.json.TypeToken; -public class v117Target implements org.openqa.selenium.devtools.idealized.target.Target { +public class v120Target implements org.openqa.selenium.devtools.idealized.target.Target { @Override public Command detachFromTarget( Optional sessionId, Optional targetId) { return Target.detachFromTarget( sessionId.map( - id -> new org.openqa.selenium.devtools.v117.target.model.SessionID(id.toString())), + id -> new org.openqa.selenium.devtools.v120.target.model.SessionID(id.toString())), targetId.map( - id -> new org.openqa.selenium.devtools.v117.target.model.TargetID(id.toString()))); + id -> new org.openqa.selenium.devtools.v120.target.model.TargetID(id.toString()))); } @Override @@ -74,19 +74,19 @@ public Command detachFromTarget( @Override public Command attachToTarget(TargetID targetId) { - Function mapper = + Function mapper = ConverterFunctions.map( - "sessionId", org.openqa.selenium.devtools.v117.target.model.SessionID.class); + "sessionId", org.openqa.selenium.devtools.v120.target.model.SessionID.class); return new Command<>( "Target.attachToTarget", Map.of( "targetId", - new org.openqa.selenium.devtools.v117.target.model.TargetID(targetId.toString()), + new org.openqa.selenium.devtools.v120.target.model.TargetID(targetId.toString()), "flatten", true), input -> { - org.openqa.selenium.devtools.v117.target.model.SessionID id = mapper.apply(input); + org.openqa.selenium.devtools.v120.target.model.SessionID id = mapper.apply(input); return new SessionID(id.toString()); }); } @@ -101,9 +101,9 @@ public Event detached() { return new Event<>( "Target.detachedFromTarget", input -> { - Function converter = + Function converter = ConverterFunctions.map( - "targetId", org.openqa.selenium.devtools.v117.target.model.TargetID.class); + "targetId", org.openqa.selenium.devtools.v120.target.model.TargetID.class); return new TargetID(converter.apply(input).toString()); }); } diff --git a/java/src/org/openqa/selenium/devtools/versions.bzl b/java/src/org/openqa/selenium/devtools/versions.bzl index 3291ed0f90a5f..ecb520a870372 100644 --- a/java/src/org/openqa/selenium/devtools/versions.bzl +++ b/java/src/org/openqa/selenium/devtools/versions.bzl @@ -1,7 +1,7 @@ CDP_VERSIONS = [ "v85", # Required by Firefox "v119", - "v117", + "v120", "v118", ] diff --git a/javascript/node/selenium-webdriver/BUILD.bazel b/javascript/node/selenium-webdriver/BUILD.bazel index 2fe8a8a8ffcf1..3b9514fb08b72 100644 --- a/javascript/node/selenium-webdriver/BUILD.bazel +++ b/javascript/node/selenium-webdriver/BUILD.bazel @@ -5,7 +5,7 @@ load("//common:defs.bzl", "copy_file") BROWSER_VERSIONS = [ "v85", "v119", - "v117", + "v120", "v118", ] diff --git a/py/BUILD.bazel b/py/BUILD.bazel index ee9fa931a6241..08ac55cf3ebbe 100644 --- a/py/BUILD.bazel +++ b/py/BUILD.bazel @@ -24,7 +24,7 @@ SE_VERSION = "4.15.2" BROWSER_VERSIONS = [ "v85", "v119", - "v117", + "v120", "v118", ] diff --git a/rb/lib/selenium/devtools/BUILD.bazel b/rb/lib/selenium/devtools/BUILD.bazel index a3ffa4921c910..faa5a251c367e 100644 --- a/rb/lib/selenium/devtools/BUILD.bazel +++ b/rb/lib/selenium/devtools/BUILD.bazel @@ -6,7 +6,7 @@ package(default_visibility = ["//rb:__subpackages__"]) CDP_VERSIONS = [ "v85", "v119", - "v117", + "v120", "v118", ] diff --git a/rb/lib/selenium/devtools/version.rb b/rb/lib/selenium/devtools/version.rb index bd83fee98b5ec..0942bc8334c6f 100644 --- a/rb/lib/selenium/devtools/version.rb +++ b/rb/lib/selenium/devtools/version.rb @@ -19,6 +19,6 @@ module Selenium module DevTools - VERSION = '0.119.0' + VERSION = '0.120.0' end # DevTools end # Selenium