Merge branch 'main' into copilot/fix-safari-native-element-extension

Author: codingjoe

.github/workflows/ci.yml

@@ -74,4 +74,4 @@ jobs:
       - uses: codecov/codecov-action@v5
         with:
           token: ${{ secrets.CODECOV_TOKEN }}
-          flags: selenium
+          flags: selenium-${{ matrix.os }}

pyproject.toml

@@ -65,12 +65,19 @@ write_to = "s3file/_version.py"
 
 [tool.pytest.ini_options]
 minversion = "6.0"
-addopts = "--cov=s3file --tb=short -rxs"
+addopts = "--cov --cov-report=xml --cov-report=term --tb=short -rxs"
 testpaths = [
   "tests",
 ]
 DJANGO_SETTINGS_MODULE = "tests.testapp.settings"
 
+[tool.coverage.run]
+source = ["s3file"]
+
+[tool.coverage.report]
+show_missing = true
+skip_covered = true
+
 [tool.ruff]
 src = ["s3file", "tests"]
 line-length = 88

tests/test_forms.py

@@ -202,7 +202,7 @@ def test_file_insert(
         file_input = driver.find_element(By.XPATH, "//input[@type='file']")
         file_input.send_keys(upload_file)
         assert file_input.get_attribute("name") == ""
-        with wait_for_page_load(driver, timeout=10):
+        with wait_for_page_load(driver, timeout=30):
             file_input.submit()
         assert storage.exists(f"tmp/s3file/{request.node.name}.txt")
 
@@ -223,7 +223,7 @@ def test_file_update(
         file_input = driver.find_element(By.XPATH, "//input[@type='file']")
         file_input.send_keys(upload_file)
         assert file_input.get_attribute("name") == ""
-        with wait_for_page_load(driver, timeout=10):
+        with wait_for_page_load(driver, timeout=30):
             file_input.submit()
         assert storage.exists(f"tmp/s3file/{request.node.name}.txt")
 
@@ -240,7 +240,7 @@ def test_file_insert_submit_value(
         file_input.send_keys(upload_file)
         assert file_input.get_attribute("name") == ""
         save_button = driver.find_element(By.XPATH, "//button[@name='save_continue']")
-        with wait_for_page_load(driver, timeout=10):
+        with wait_for_page_load(driver, timeout=30):
             save_button.click()
         assert "save_continue" in driver.page_source
         assert "continue_value" in driver.page_source
@@ -254,7 +254,7 @@ def test_file_insert_submit_formaction(
         file_input.send_keys(upload_file)
         assert file_input.get_attribute("name") == ""
         save_button = driver.find_element(By.XPATH, "//button[@name='custom_save']")
-        with wait_for_page_load(driver, timeout=10):
+        with wait_for_page_load(driver, timeout=30):
             save_button.click()
         assert "custom_save" in driver.page_source
         assert "custom_target" in driver.page_source
@@ -275,7 +275,7 @@ def test_file_insert_change_event(
         file_input.send_keys(upload_file)
         file_input.send_keys(another_upload_file)
         save_button = driver.find_element(By.CSS_SELECTOR, "input[name=save]")
-        with wait_for_page_load(driver, timeout=10):
+        with wait_for_page_load(driver, timeout=30):
             save_button.click()
         assert "save" in driver.page_source
 
@@ -302,7 +302,7 @@ def test_multi_file(
         )
         file_input.send_keys(str(freeze_upload_folder / yet_another_upload_file))
         save_button = driver.find_element(By.XPATH, "//input[@name='save']")
-        with wait_for_page_load(driver, timeout=10):
+        with wait_for_page_load(driver, timeout=30):
             save_button.click()
         response = json.loads(driver.find_elements(By.CSS_SELECTOR, "pre")[0].text)
         assert response["FILES"] == {