Fix frame_to_be_available_and_switch_to_it() for string inputs (#10967)

mdmintz · symonk · diemol · web-flow · commit 6ad88d3825f9 · 2022-08-22T14:59:10.000+02:00
* Fix frame_to_be_available_and_switch_to_it() for string inputs

* Add new test for frame_to_be_available_and_switch_to_it()

* Version 4.4.4

* Update Python CHANGES for version 4.4.4

* Use `not isinstance(locator, str)` instead of `type(locator) is not str`

* Skip the version change for now

Co-authored-by: Simon K &lt;jackofspaces@gmail.com&gt;
Co-authored-by: Diego Molina &lt;diemol@users.noreply.github.com&gt;
diff --git a/py/CHANGES b/py/CHANGES
@@ -1,3 +1,6 @@
+Selenium (TBA next version)
+* Fix frame_to_be_available_and_switch_to_it() for string inputs (#10963)
+
 Selenium 4.4.3
 * Update explicit dependency for certifi to remove upper bound (#10956)
 
diff --git a/py/selenium/webdriver/support/expected_conditions.py b/py/selenium/webdriver/support/expected_conditions.py
@@ -252,7 +252,7 @@ def frame_to_be_available_and_switch_to_it(locator):
 
     def _predicate(driver):
         try:
-            if hasattr(locator, '__iter__'):
+            if hasattr(locator, '__iter__') and not isinstance(locator, str):
                 driver.switch_to.frame(driver.find_element(*locator))
             else:
                 driver.switch_to.frame(locator)
diff --git a/py/test/selenium/webdriver/common/frame_switching_tests.py b/py/test/selenium/webdriver/common/frame_switching_tests.py
@@ -351,6 +351,22 @@ def test_should_be_able_to_switch_to_the_top_if_the_frame_is_deleted_from_under_
     WebDriverWait(driver, 3).until(EC.presence_of_element_located((By.ID, "success")))
 
 
+def test_frame_to_be_available_and_switch_to_it_using_string_inputs(driver, pages):
+    # Similar to above test, but using `iframe = "iframe1"` instead of `iframe = 0`
+    pages.load("frame_switching_tests/deletingFrame.html")
+    iframe = "iframe1"
+    WebDriverWait(driver, 3).until(EC.frame_to_be_available_and_switch_to_it(iframe))
+    # we should be in the frame now
+    killIframe = driver.find_element(By.ID, "killIframe")
+    killIframe.click()
+    driver.switch_to.default_content()
+
+    addIFrame = driver.find_element(By.ID, "addBackFrame")
+    addIFrame.click()
+    WebDriverWait(driver, 3).until(EC.frame_to_be_available_and_switch_to_it(iframe))
+    WebDriverWait(driver, 3).until(EC.presence_of_element_located((By.ID, "success")))
+
+
 def test_should_be_able_to_switch_to_the_top_if_the_frame_is_deleted_from_under_us_with_webelement(driver, pages):
     pages.load("frame_switching_tests/deletingFrame.html")
     iframe = driver.find_element(By.ID, "iframe1")
