switch to url_contains

Author: philimon-reset

modules/browser_object_navigation.py

@@ -1,8 +1,7 @@
 import logging
 
 from selenium.common.exceptions import TimeoutException
-from selenium.webdriver import Firefox
-from selenium.webdriver import ActionChains
+from selenium.webdriver import ActionChains, Firefox
 from selenium.webdriver.common.by import By
 from selenium.webdriver.common.keys import Keys
 from selenium.webdriver.remote.webelement import WebElement

modules/page_base.py

@@ -443,6 +443,7 @@ def element_attribute_contains(
 
     def url_contains(self, url_part: str) -> Page:
         """Expect helper: wait until driver URL contains given text or timeout"""
+        self.context_id = self.driver.CONTEXT_CONTENT
         self.expect(EC.url_contains(url_part))
         return self
 

modules/util.py

@@ -6,6 +6,7 @@
 import re
 from os import remove
 from random import shuffle
+from time import sleep
 from typing import List, Literal, Union
 from urllib.parse import urlparse, urlunparse
 
@@ -562,12 +563,7 @@ def select_file_opening_option(self, option: str = "handleInternally"):
             self.driver.switch_to.window(self.driver.window_handles[-1])
             self.driver.find_element(By.ID, option).click()
             confirm_button = self.driver.find_element(By.ID, "unknownContentTypeWindow")
-            self.wait.until_not(
-                EC.element_attribute_to_include(
-                    (By.CSS_SELECTOR, ".dialog-button-box > button:nth-child(6)"),
-                    "disabled",
-                )
-            )
+            sleep(2)
             confirm_button.send_keys(Keys.ENTER)
 
     def get_all_colors_in_element(self, selector: tuple) -> set:

tests/pdf_viewer/test_download_triggered_on_content_disposition_attachment.py

@@ -49,8 +49,8 @@ def test_download_panel_triggered_on_content_disposition_attachment(
     sleep(3)
     browser_actions.select_file_opening_option()
 
-
     tabs.wait_for_num_tabs(2)
     tabs.switch_to_new_tab()
     ## url_contains isn't working for some reason.
-    assert driver.current_url.endswith(".pdf"), f"New tab should be a pdf file."
+    # assert driver.current_url.endswith(".pdf"), f"New tab should be a pdf file."
+    nav.url_contains(".pdf")