Merge remote-tracking branch 'origin/trunk' into safari_service_test

Author: VietND96

py/test/selenium/webdriver/common/bidi_tests.py

@@ -18,7 +18,6 @@
 
 from selenium.webdriver.common.by import By
 from selenium.webdriver.common.log import Log
-from selenium.webdriver.support import expected_conditions as EC
 from selenium.webdriver.support.ui import WebDriverWait
 
 
@@ -76,8 +75,6 @@ async def test_collect_log_mutations(driver, pages):
             WebDriverWait(driver, 10).until(
                 lambda d: d.find_element(By.ID, "revealed").value_of_css_property("display") != "none"
             )
-            WebDriverWait(driver, 5).until(EC.visibility_of(driver.find_element(By.ID, "revealed")))
-
     assert event["attribute_name"] == "style"
     assert event["current_value"] == ""
     assert event["old_value"] == "display:none;"

py/test/selenium/webdriver/common/upload_tests.py

@@ -21,6 +21,8 @@
 
 from selenium.webdriver.common.by import By
 from selenium.webdriver.remote.webelement import WebElement
+from selenium.webdriver.support import expected_conditions as EC
+from selenium.webdriver.support.wait import WebDriverWait
 
 
 @pytest.fixture
@@ -39,9 +41,8 @@ def test_can_upload_file(driver, pages, get_local_path):
     driver.find_element(By.ID, "upload").send_keys(get_local_path("test_file.txt"))
     driver.find_element(By.ID, "go").click()
     driver.switch_to.frame(driver.find_element(By.ID, "upload_target"))
-    body = driver.find_element(By.CSS_SELECTOR, "body").text
 
-    assert "test_file.txt" in body
+    WebDriverWait(driver, 10).until(EC.text_to_be_present_in_element((By.CSS_SELECTOR, "body"), "test_file.txt"))
 
 
 def test_can_upload_two_files(driver, pages, get_local_path):
@@ -50,10 +51,9 @@ def test_can_upload_two_files(driver, pages, get_local_path):
     driver.find_element(By.ID, "upload").send_keys(two_file_paths)
     driver.find_element(By.ID, "go").click()
     driver.switch_to.frame(driver.find_element(By.ID, "upload_target"))
-    body = driver.find_element(By.CSS_SELECTOR, "body").text
 
-    assert "test_file.txt" in body
-    assert "test_file2.txt" in body
+    WebDriverWait(driver, 10).until(EC.text_to_be_present_in_element((By.CSS_SELECTOR, "body"), "test_file.txt"))
+    WebDriverWait(driver, 10).until(EC.text_to_be_present_in_element((By.CSS_SELECTOR, "body"), "test_file2.txt"))
 
 
 @pytest.mark.xfail_firefox