From 3bd7ac7402c8963c392ac11aebefa4f6867f107a Mon Sep 17 00:00:00 2001
From: delta456 <swstkbaranwal@gmail.com>
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<Release>,
 }
 
 #[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<String>,
-    #[serde(rename = "ProductVersion", alias = "productVersion")]
+    #[serde(rename = "ProductVersion")]
     pub product_version: String,
-    #[serde(rename = "Artifacts", alias = "artifacts")]
+    #[serde(rename = "Artifacts")]
     pub artifacts: Vec<Artifact>,
-    #[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 20ed5e82acab81806a71a9d4a110f10f5ff179ba Mon Sep 17 00:00:00 2001
From: delta456 <swstkbaranwal@gmail.com>
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<Release>,
 }
 
 #[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<String>,
-    #[serde(rename = "ProductVersion")]
+    #[serde(rename = "ProductVersion", alias = "productVersion")]
     pub product_version: String,
-    #[serde(rename = "Artifacts")]
+    #[serde(rename = "Artifacts", alias = "artifacts")]
     pub artifacts: Vec<Artifact>,
-    #[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 22fc9310b29b0851d751ef4a5e1ebfe138c4c60d Mon Sep 17 00:00:00 2001
From: delta456 <swstkbaranwal@gmail.com>
Date: Wed, 26 Feb 2025 00:14:37 +0530
Subject: [PATCH 3/4] [py] expected_conditions: correct type annotation

---
 py/selenium/webdriver/support/expected_conditions.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/py/selenium/webdriver/support/expected_conditions.py b/py/selenium/webdriver/support/expected_conditions.py
index 9f6936eec27e5..6ea71694353a4 100644
--- a/py/selenium/webdriver/support/expected_conditions.py
+++ b/py/selenium/webdriver/support/expected_conditions.py
@@ -485,13 +485,13 @@ def _predicate(driver: WebDriverOrWebElement):
     return _predicate
 
 
-def frame_to_be_available_and_switch_to_it(locator: Union[Tuple[str, str], str]) -> Callable[[WebDriver], bool]:
+def frame_to_be_available_and_switch_to_it(locator: Union[Tuple[str, str], str, WebElement]) -> Callable[[WebDriver], bool]:
     """An expectation for checking whether the given frame is available to
     switch to.
 
     Parameters:
     ----------
-    locator : Union[Tuple[str, str], str]
+    locator : Union[Tuple[str, str], str, WebElement]
         Used to find the frame.
 
     Returns:

From c43acab8033385a9b5eae83221c7633eed806668 Mon Sep 17 00:00:00 2001
From: delta456 <swstkbaranwal@gmail.com>
Date: Wed, 26 Feb 2025 00:55:43 +0530
Subject: [PATCH 4/4] lint

---
 py/selenium/webdriver/support/expected_conditions.py | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/py/selenium/webdriver/support/expected_conditions.py b/py/selenium/webdriver/support/expected_conditions.py
index 6ea71694353a4..286bbbfbebc34 100644
--- a/py/selenium/webdriver/support/expected_conditions.py
+++ b/py/selenium/webdriver/support/expected_conditions.py
@@ -485,7 +485,9 @@ def _predicate(driver: WebDriverOrWebElement):
     return _predicate
 
 
-def frame_to_be_available_and_switch_to_it(locator: Union[Tuple[str, str], str, WebElement]) -> Callable[[WebDriver], bool]:
+def frame_to_be_available_and_switch_to_it(
+    locator: Union[Tuple[str, str], str, WebElement]
+) -> Callable[[WebDriver], bool]:
     """An expectation for checking whether the given frame is available to
     switch to.