Merge pull request #1391 from kade-robertson/patch-1

fix: update chromedriver download URL, resolve test issues
rustwasm · Jun 25, 2024 · 2e4c661 · 2e4c661
2 parents 32aaecf + 68e2688
commit 2e4c661
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 2 deletions.
diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
@@ -30,6 +30,8 @@ jobs:
     steps:
       - uses: actions/checkout@v3
       - uses: nanasess/setup-chromedriver@master
+      - if: matrix.os == 'macos-latest'
+        run: brew install --cask firefox
       - uses: dtolnay/rust-toolchain@stable
         with:
           toolchain: ${{ matrix.rust }}

diff --git a/src/test/webdriver/chromedriver.rs b/src/test/webdriver/chromedriver.rs
@@ -156,7 +156,7 @@ fn fetch_chromedriver_version() -> Result<String> {
 
 fn assemble_chromedriver_url(chromedriver_version: &str, target: &str) -> String {
     format!(
-        "https://edgedl.me.gvt1.com/edgedl/chrome/chrome-for-testing/{version}/{target}/chromedriver-{target}.zip",
+        "https://storage.googleapis.com/chrome-for-testing-public/{version}/{target}/chromedriver-{target}.zip",
         version = chromedriver_version,
         target = target,
     )

diff --git a/tests/all/log_level.rs b/tests/all/log_level.rs
@@ -16,7 +16,9 @@ fn matches_info() -> impl Predicate<str> + PredicateReflection {
 }
 
 fn matches_cargo() -> impl Predicate<str> + PredicateReflection {
-    contains("Finished release [optimized] target(s) in ")
+    contains("Finished release [optimized] target(s) in ").or(contains(
+        "Finished `release` profile [optimized] target(s) in ",
+    ))
 }
 
 #[test]