From cd8ee977d517dd1b3edcf350682a212763333579 Mon Sep 17 00:00:00 2001 From: Jonas Scheffner Date: Mon, 4 Feb 2019 15:31:04 +0100 Subject: [PATCH 1/2] Use win32 chromedriver binaries for win64 systems, update chromedriver version to 2.45 and fix error message --- src/test/webdriver.rs | 6 +++--- tests/all/webdriver.rs | 3 ++- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/src/test/webdriver.rs b/src/test/webdriver.rs index 54e2968..e15ae80 100644 --- a/src/test/webdriver.rs +++ b/src/test/webdriver.rs @@ -31,14 +31,14 @@ pub fn install_chromedriver( "linux64" } else if target::MACOS && target::x86_64 { "mac64" - } else if target::WINDOWS && target::x86 { + } else if target::WINDOWS { "win32" } else { - bail!("geckodriver binaries are unavailable for this target") + bail!("chromedriver binaries are unavailable for this target") }; let url = format!( - "https://chromedriver.storage.googleapis.com/2.41/chromedriver_{}.zip", + "https://chromedriver.storage.googleapis.com/2.45/chromedriver_{}.zip", target ); match cache.download( diff --git a/tests/all/webdriver.rs b/tests/all/webdriver.rs index d5e8cf6..6223290 100644 --- a/tests/all/webdriver.rs +++ b/tests/all/webdriver.rs @@ -6,7 +6,8 @@ use wasm_pack::test::webdriver; #[cfg(any( all(target_os = "linux", target_arch = "x86_64"), all(target_os = "macos", target_arch = "x86_64"), - all(target_os = "windows", target_arch = "x86") + all(target_os = "windows", target_arch = "x86"), + all(target_os = "windows", target_arch = "x86_64") ))] fn can_install_chromedriver() { let fixture = fixture::js_hello_world(); From d80406173b20ad768bd39630fee9bd9477b71d15 Mon Sep 17 00:00:00 2001 From: Jonas Scheffner Date: Mon, 4 Feb 2019 17:33:06 +0100 Subject: [PATCH 2/2] Update chromedriver to v0.46 and geckodriver to v0.24.0 --- src/test/webdriver.rs | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/test/webdriver.rs b/src/test/webdriver.rs index e15ae80..1dfe1a1 100644 --- a/src/test/webdriver.rs +++ b/src/test/webdriver.rs @@ -38,7 +38,7 @@ pub fn install_chromedriver( }; let url = format!( - "https://chromedriver.storage.googleapis.com/2.45/chromedriver_{}.zip", + "https://chromedriver.storage.googleapis.com/2.46/chromedriver_{}.zip", target ); match cache.download( @@ -92,7 +92,7 @@ pub fn install_geckodriver( }; let url = format!( - "https://github.com/mozilla/geckodriver/releases/download/v0.21.0/geckodriver-v0.21.0-{}.{}", + "https://github.com/mozilla/geckodriver/releases/download/v0.24.0/geckodriver-v0.24.0-{}.{}", target, ext, );