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 065d16cd0a4ea5c5b4aa73de69d1bcc3cc9b311c Mon Sep 17 00:00:00 2001 From: delta456 Date: Thu, 13 Mar 2025 12:20:42 +0530 Subject: [PATCH 3/4] [py] fix doc for find_elements --- py/selenium/webdriver/remote/shadowroot.py | 2 +- py/selenium/webdriver/remote/webdriver.py | 2 +- py/selenium/webdriver/remote/webelement.py | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/py/selenium/webdriver/remote/shadowroot.py b/py/selenium/webdriver/remote/shadowroot.py index e78167356f6b5..3adb3d929721b 100644 --- a/py/selenium/webdriver/remote/shadowroot.py +++ b/py/selenium/webdriver/remote/shadowroot.py @@ -97,7 +97,7 @@ def find_elements(self, by: str = By.ID, value: str = None): Example: -------- - element = driver.find_element(By.ID, 'foo') + element = driver.find_elements(By.ID, 'foo') Returns: ------- diff --git a/py/selenium/webdriver/remote/webdriver.py b/py/selenium/webdriver/remote/webdriver.py index 1a83820b1bb63..db1bdbbfe0677 100644 --- a/py/selenium/webdriver/remote/webdriver.py +++ b/py/selenium/webdriver/remote/webdriver.py @@ -916,7 +916,7 @@ def find_elements(self, by=By.ID, value: Optional[str] = None) -> List[WebElemen Example: -------- - element = driver.find_element(By.ID, 'foo') + element = driver.find_elements(By.ID, 'foo') Returns: ------- diff --git a/py/selenium/webdriver/remote/webelement.py b/py/selenium/webdriver/remote/webelement.py index 5f5ddf2c8a80f..4ba5567ca989a 100644 --- a/py/selenium/webdriver/remote/webelement.py +++ b/py/selenium/webdriver/remote/webelement.py @@ -619,7 +619,7 @@ def find_elements(self, by=By.ID, value=None) -> List[WebElement]: Example: -------- - >>> element = driver.find_element(By.ID, 'foo') + >>> element = driver.find_elements(By.ID, 'foo') Returns: ------- From 3a11bc7295684ff0554800f57f79a53aaed7fbd6 Mon Sep 17 00:00:00 2001 From: delta456 Date: Tue, 18 Mar 2025 18:18:17 +0530 Subject: [PATCH 4/4] fix return type doc --- py/selenium/webdriver/remote/shadowroot.py | 2 +- py/selenium/webdriver/remote/webdriver.py | 2 +- py/selenium/webdriver/remote/webelement.py | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/py/selenium/webdriver/remote/shadowroot.py b/py/selenium/webdriver/remote/shadowroot.py index 3adb3d929721b..faeef52dc42ac 100644 --- a/py/selenium/webdriver/remote/shadowroot.py +++ b/py/selenium/webdriver/remote/shadowroot.py @@ -101,7 +101,7 @@ def find_elements(self, by: str = By.ID, value: str = None): Returns: ------- - WebElement + List[WebElement] list of `WebElements` matching locator strategy found on the page. """ if by == By.ID: diff --git a/py/selenium/webdriver/remote/webdriver.py b/py/selenium/webdriver/remote/webdriver.py index db1bdbbfe0677..f783623b2d125 100644 --- a/py/selenium/webdriver/remote/webdriver.py +++ b/py/selenium/webdriver/remote/webdriver.py @@ -920,7 +920,7 @@ def find_elements(self, by=By.ID, value: Optional[str] = None) -> List[WebElemen Returns: ------- - WebElement + List[WebElement] list of `WebElements` matching locator strategy found on the page. """ by, value = self.locator_converter.convert(by, value) diff --git a/py/selenium/webdriver/remote/webelement.py b/py/selenium/webdriver/remote/webelement.py index 4ba5567ca989a..56ed7a9435303 100644 --- a/py/selenium/webdriver/remote/webelement.py +++ b/py/selenium/webdriver/remote/webelement.py @@ -623,7 +623,7 @@ def find_elements(self, by=By.ID, value=None) -> List[WebElement]: Returns: ------- - WebElement + List[WebElement] list of `WebElements` matching locator strategy found on the page. """ by, value = self._parent.locator_converter.convert(by, value)