Merge pull request #1173 from seleniumbase/fix-the-algorithm-for-iframe-detection

Fix the algorithm for detecting if the driver switched to a frame

Author: mdmintz

seleniumbase/__version__.py

@@ -1,2 +1,2 @@
 # seleniumbase package
-__version__ = "2.3.11"
+__version__ = "2.3.12"

seleniumbase/fixtures/js_utils.py

@@ -217,7 +217,7 @@ def is_in_frame(driver):
     Returns True if the driver has switched to a frame.
     Returns False if the driver was on default content.
     """
-    return driver.execute_script(
+    in_basic_frame = driver.execute_script(
         """
         var frame = window.frameElement;
         if (frame) {
@@ -228,6 +228,13 @@ def is_in_frame(driver):
         }
         """
     )
+    location_href = driver.execute_script("""return window.location.href;""")
+    in_external_frame = False
+    if driver.current_url != location_href:
+        in_external_frame = True
+    if in_basic_frame or in_external_frame:
+        return True
+    return False
 
 
 def safe_execute_script(driver, script):