From 36e38632bf33d3524013111ea7082d1612cc9060 Mon Sep 17 00:00:00 2001 From: delta456 Date: Wed, 11 Dec 2024 23:19:36 +0530 Subject: [PATCH 1/4] Revert "add alias attr to all edge structs" This reverts commit f17dd08dd32998a310510f0abc44e5b484202a4d. --- rust/src/edge.rs | 30 +++++++++++++++--------------- 1 file changed, 15 insertions(+), 15 deletions(-) diff --git a/rust/src/edge.rs b/rust/src/edge.rs index 8b844dd718630..582a7f1717b38 100644 --- a/rust/src/edge.rs +++ b/rust/src/edge.rs @@ -555,42 +555,42 @@ impl SeleniumManager for EdgeManager { #[derive(Serialize, Deserialize, Debug)] pub struct EdgeProduct { - #[serde(rename = "Product", alias = "product")] + #[serde(rename = "Product")] pub product: String, - #[serde(rename = "Releases", alias = "releases")] + #[serde(rename = "Releases")] pub releases: Vec, } #[derive(Serialize, Deserialize, Debug)] pub struct Release { - #[serde(rename = "ReleaseId", alias = "releaseId")] + #[serde(rename = "ReleaseId")] pub release_id: u32, - #[serde(rename = "Platform", alias = "platform")] + #[serde(rename = "Platform")] pub platform: String, - #[serde(rename = "Architecture", alias = "architecture")] + #[serde(rename = "Architecture")] pub architecture: String, - #[serde(rename = "CVEs", alias = "cves")] + #[serde(rename = "CVEs")] pub cves: Vec, - #[serde(rename = "ProductVersion", alias = "productVersion")] + #[serde(rename = "ProductVersion")] pub product_version: String, - #[serde(rename = "Artifacts", alias = "artifacts")] + #[serde(rename = "Artifacts")] pub artifacts: Vec, - #[serde(rename = "PublishedTime", alias = "publishedTime")] + #[serde(rename = "PublishedTime")] pub published_time: String, - #[serde(rename = "ExpectedExpiryDate", alias = "expectedExpiryDate")] + #[serde(rename = "ExpectedExpiryDate")] pub expected_expiry_date: String, } #[derive(Serialize, Deserialize, Debug)] pub struct Artifact { - #[serde(rename = "ArtifactName", alias = "artifactName")] + #[serde(rename = "ArtifactName")] pub artifact_name: String, - #[serde(rename = "Location", alias = "location")] + #[serde(rename = "Location")] pub location: String, - #[serde(rename = "Hash", alias = "hash")] + #[serde(rename = "Hash")] pub hash: String, - #[serde(rename = "HashAlgorithm", alias = "hashAlgorithm")] + #[serde(rename = "HashAlgorithm")] pub hash_algorithm: String, - #[serde(rename = "SizeInBytes", alias = "sizeInBytes")] + #[serde(rename = "SizeInBytes")] pub size_in_bytes: u32, } From d52985d309726dbb0f3761359c51bc9f548b8e22 Mon Sep 17 00:00:00 2001 From: delta456 Date: Tue, 31 Dec 2024 17:40:08 +0530 Subject: [PATCH 2/4] Reapply "add alias attr to all edge structs" This reverts commit cc16e3fe18971d5ecb37e26a37bcda76cda7c48b. oops --- rust/src/edge.rs | 30 +++++++++++++++--------------- 1 file changed, 15 insertions(+), 15 deletions(-) diff --git a/rust/src/edge.rs b/rust/src/edge.rs index 582a7f1717b38..8b844dd718630 100644 --- a/rust/src/edge.rs +++ b/rust/src/edge.rs @@ -555,42 +555,42 @@ impl SeleniumManager for EdgeManager { #[derive(Serialize, Deserialize, Debug)] pub struct EdgeProduct { - #[serde(rename = "Product")] + #[serde(rename = "Product", alias = "product")] pub product: String, - #[serde(rename = "Releases")] + #[serde(rename = "Releases", alias = "releases")] pub releases: Vec, } #[derive(Serialize, Deserialize, Debug)] pub struct Release { - #[serde(rename = "ReleaseId")] + #[serde(rename = "ReleaseId", alias = "releaseId")] pub release_id: u32, - #[serde(rename = "Platform")] + #[serde(rename = "Platform", alias = "platform")] pub platform: String, - #[serde(rename = "Architecture")] + #[serde(rename = "Architecture", alias = "architecture")] pub architecture: String, - #[serde(rename = "CVEs")] + #[serde(rename = "CVEs", alias = "cves")] pub cves: Vec, - #[serde(rename = "ProductVersion")] + #[serde(rename = "ProductVersion", alias = "productVersion")] pub product_version: String, - #[serde(rename = "Artifacts")] + #[serde(rename = "Artifacts", alias = "artifacts")] pub artifacts: Vec, - #[serde(rename = "PublishedTime")] + #[serde(rename = "PublishedTime", alias = "publishedTime")] pub published_time: String, - #[serde(rename = "ExpectedExpiryDate")] + #[serde(rename = "ExpectedExpiryDate", alias = "expectedExpiryDate")] pub expected_expiry_date: String, } #[derive(Serialize, Deserialize, Debug)] pub struct Artifact { - #[serde(rename = "ArtifactName")] + #[serde(rename = "ArtifactName", alias = "artifactName")] pub artifact_name: String, - #[serde(rename = "Location")] + #[serde(rename = "Location", alias = "location")] pub location: String, - #[serde(rename = "Hash")] + #[serde(rename = "Hash", alias = "hash")] pub hash: String, - #[serde(rename = "HashAlgorithm")] + #[serde(rename = "HashAlgorithm", alias = "hashAlgorithm")] pub hash_algorithm: String, - #[serde(rename = "SizeInBytes")] + #[serde(rename = "SizeInBytes", alias = "sizeInBytes")] pub size_in_bytes: u32, } From 20b90cb3b606b1ca7f6fa3d115d90ac12246717d Mon Sep 17 00:00:00 2001 From: delta456 Date: Wed, 19 Mar 2025 14:13:48 +0530 Subject: [PATCH 3/4] [js] add ErrorCode for `DetachedShadowRootError` --- javascript/node/selenium-webdriver/lib/error.js | 2 ++ 1 file changed, 2 insertions(+) diff --git a/javascript/node/selenium-webdriver/lib/error.js b/javascript/node/selenium-webdriver/lib/error.js index fe60fcaa7ee54..4598200b63289 100644 --- a/javascript/node/selenium-webdriver/lib/error.js +++ b/javascript/node/selenium-webdriver/lib/error.js @@ -405,6 +405,7 @@ const ErrorCode = { NO_SUCH_COOKIE: 62, UNABLE_TO_CAPTURE_SCREEN: 63, ELEMENT_CLICK_INTERCEPTED: 64, + DETACHED_SHADOW_ROOT: 65, METHOD_NOT_ALLOWED: 405, } @@ -437,6 +438,7 @@ const LEGACY_ERROR_CODE_TO_TYPE = new Map([ [ErrorCode.NO_SUCH_COOKIE, NoSuchCookieError], [ErrorCode.UNABLE_TO_CAPTURE_SCREEN, UnableToCaptureScreenError], [ErrorCode.ELEMENT_CLICK_INTERCEPTED, ElementClickInterceptedError], + [ErrorCode.DETACHED_SHADOW_ROOT, DetachedShadowRootError], [ErrorCode.METHOD_NOT_ALLOWED, UnsupportedOperationError], ]) From f71ea715a65f3261b134c8ddc368007810e3a6e8 Mon Sep 17 00:00:00 2001 From: Delta456 Date: Thu, 20 Mar 2025 13:06:51 +0530 Subject: [PATCH 4/4] add test --- javascript/node/selenium-webdriver/test/lib/error_test.js | 2 ++ 1 file changed, 2 insertions(+) diff --git a/javascript/node/selenium-webdriver/test/lib/error_test.js b/javascript/node/selenium-webdriver/test/lib/error_test.js index a18f5537026c4..e31bd747ee1b8 100644 --- a/javascript/node/selenium-webdriver/test/lib/error_test.js +++ b/javascript/node/selenium-webdriver/test/lib/error_test.js @@ -139,6 +139,7 @@ describe('error', function () { test('unknown command', error.UnknownCommandError) test('unknown method', error.UnknownMethodError) test('unsupported operation', error.UnsupportedOperationError) + test('detached shadow root', error.DetachedShadowRootError) it('leaves remoteStacktrace empty if not in encoding', function () { assert.throws( @@ -230,6 +231,7 @@ describe('error', function () { test('UNABLE_TO_CAPTURE_SCREEN', error.UnableToCaptureScreenError) test('ELEMENT_CLICK_INTERCEPTED', error.ElementClickInterceptedError) test('METHOD_NOT_ALLOWED', error.UnsupportedOperationError) + test('DETACHED_SHADOW_ROOT', error.DetachedShadowRootError) describe('UnexpectedAlertOpenError', function () { it('includes alert text from the response object', function () {