Added support for safaridriver

Author: UebelAndre

.bazelci/presubmit.yml

@@ -1080,7 +1080,7 @@ tasks:
     name: Extensions wasm-bindgen
     working_directory: extensions/wasm_bindgen
     shell_commands:
-      - "bash ./test/bazelci_linux_setup.sh"
+      - "bash ./test/bazelci_unix_setup.sh"
     build_flags: *aspects_flags
     test_flags: *aspects_flags
     build_targets:
@@ -1105,6 +1105,8 @@ tasks:
     platform: macos_arm64
     name: Extensions wasm-bindgen
     working_directory: extensions/wasm_bindgen
+    shell_commands:
+      - "bash ./test/bazelci_unix_setup.sh"
     build_flags: *aspects_flags
     test_flags: *aspects_flags
     build_targets:

.bcr/extensions/wasm_bindgen/presubmit.yml

@@ -1,26 +1,14 @@
 bcr_test_module:
   module_path: ""
   matrix:
-    platform: ["macos_arm64", "windows"]
+    platform: ["macos_arm64", "ubuntu2004", "windows"]
     bazel: ["7.x", "8.x"]
   tasks:
     run_tests:
       name: "Run test module"
       platform: ${{ platform }}
       bazel: ${{ bazel }}
-      test_targets:
-        - "//..."
-bcr_test_module_linux:
-  module_path: ""
-  matrix:
-    platform: ["ubuntu2004"]
-    bazel: ["7.x", "8.x"]
-  tasks:
-    run_tests:
       shell_commands:
-        - "bash ./test/bazelci_linux_setup.sh"
-      name: "Run test module"
-      platform: ${{ platform }}
-      bazel: ${{ bazel }}
+        - "bash ./test/bazelci_unix_setup.sh"
       test_targets:
         - "//..."

extensions/wasm_bindgen/.bazelrc

@@ -8,6 +8,9 @@
 # TODO: https://github.com/bazelbuild/rules_rust/issues/3319
 common --deleted_packages=rules_js,rules_js/test
 
+# An alias for the test browser setting.
+common --flag_alias=test_browser=//settings:test_browser
+
 ###############################################################################
 
 # https://bazel.build/reference/command-line-reference#flag--enable_platform_specific_config
@@ -29,14 +32,8 @@ common --experimental_cc_shared_library
 ## Unique configuration groups
 ###############################################################################
 
-# Explicitly use firefox for browser tests.
-build:firefox --//settings:test_browser=firefox
-
-# Explicitly use chrome for browser tests
-build:chrome --//settings:test_browser=chrome
-
 # Default linux to run firefox
-build:linux --config=firefox
+build:linux --test_browser=firefox
 
 # Enable use of the nightly toolchains.
 build:nightly --@rules_rust//rust/toolchain/channel=nightly

extensions/wasm_bindgen/BUILD.bazel

@@ -27,10 +27,12 @@ rust_wasm_bindgen_toolchain(
     browser = select({
         "//settings:test_browser_chrome": "@chrome",
         "//settings:test_browser_firefox": "@firefox",
+        "//settings:test_browser_safari": None,
     }),
     browser_type = select({
         "//settings:test_browser_chrome": "chrome",
         "//settings:test_browser_firefox": "firefox",
+        "//settings:test_browser_safari": "safari",
     }),
     visibility = ["//visibility:public"],
     wasm_bindgen_cli = "//3rdparty:wasm_bindgen_cli",
@@ -39,10 +41,12 @@ rust_wasm_bindgen_toolchain(
     webdriver = select({
         "//settings:test_browser_chrome": "@chromedriver",
         "//settings:test_browser_firefox": "@geckodriver",
+        "//settings:test_browser_safari": "@safaridriver",
     }),
     webdriver_args = select({
         "//settings:test_browser_chrome": ["--verbose"],
         "//settings:test_browser_firefox": [],
+        "//settings:test_browser_safari": [],
     }),
     webdriver_json = "webdriver.json",
 )

extensions/wasm_bindgen/MODULE.bazel

@@ -66,6 +66,7 @@ use_repo(
     "rrwbd__wasmparser-0.214.0",
     "rrwbd__wasmprinter-0.214.0",
     "rules_rust_wasm_bindgen_cli",
+    "safaridriver",
 )
 
 register_toolchains(

extensions/wasm_bindgen/private/wasm_bindgen.bzl

@@ -282,6 +282,7 @@ For additional information, see the [Bazel toolchains documentation][toolchains]
             values = [
                 "firefox",
                 "chrome",
+                "safari",
             ],
         ),
         "wasm_bindgen_cli": attr.label(

extensions/wasm_bindgen/private/wasm_bindgen_test_wrapper.rs

@@ -10,11 +10,27 @@ use runfiles::{rlocation, Runfiles};
 
 fn write_webdriver_for_browser(
     original: &Path,
-    section: &str,
+    section: Option<&str>,
     args: &Vec<String>,
     browser: &Option<PathBuf>,
     output: &Path,
 ) {
+    // If no section is provided, simply copy the file and early return.
+    let section = match section {
+        Some(s) => s,
+        None => {
+            fs::copy(original, output).unwrap_or_else(|e| {
+                panic!(
+                    "Failed to copy webdriver config: {} -> {}\n{:?}",
+                    original.display(),
+                    output.display(),
+                    e
+                );
+            });
+            return;
+        }
+    };
+
     let content = fs::read_to_string(original).unwrap_or_else(|e| {
         panic!(
             "Failed to read webdriver.json at: {}\n{:?}",
@@ -135,7 +151,7 @@ fn main() {
 
             write_webdriver_for_browser(
                 &webdriver_json,
-                "goog:chromeOptions",
+                Some("goog:chromeOptions"),
                 &vec![format!("user-data-dir={}", user_data_dir.display())],
                 &browser,
                 &updated_webdriver_json,
@@ -151,7 +167,7 @@ fn main() {
 
             write_webdriver_for_browser(
                 &webdriver_json,
-                "moz:firefoxOptions",
+                Some("moz:firefoxOptions"),
                 &Vec::new(),
                 &browser,
                 &updated_webdriver_json,
@@ -161,13 +177,56 @@ fn main() {
             // and creating an additional one would result in errors.
             env.insert("MOZ_DISABLE_CONTENT_SANDBOX".to_string(), "1".to_string());
 
-            env.insert("GECKODRIVER_ARGS".to_string(), webdriver_args);
+            let mut args = Vec::new();
+
+            // Define a clean profile root that can be checked at the end of tests.
+            let profile_root = undeclared_test_outputs.join("profile_root");
+            fs::create_dir_all(&profile_root).unwrap_or_else(|e| {
+                panic!(
+                    "Failed to create directory: {}\n{:?}",
+                    profile_root.display(),
+                    e
+                )
+            });
+
+            // geckodriver directly accepts the profile root arg so it's tracked here
+            // as there's no way to write this info in a usable way to the `webdriver.json`.
+            args.push(format!("--profile-root={}", profile_root.display()));
+
+            // geckodriver explicitly accepts a browser flag so we pass that in addition
+            // to setting it in the webdriver.json config.
+            if let Some(browser) = browser {
+                args.push(format!("--binary={}", browser.display()));
+            }
+
+            // Ensure logs are always complete.
+            args.push("--log-no-truncate".to_string());
+
+            // Some arguments must be passed to geckodriver directly to ensure it's
+            // launched in an expected manner
+            env.insert(
+                "GECKODRIVER_ARGS".to_string(),
+                args.join(" ").trim().to_string(),
+            );
+        }
+        "safari" => {
+            write_webdriver_for_browser(
+                &webdriver_json,
+                None,
+                &Vec::new(),
+                &browser,
+                &updated_webdriver_json,
+            );
+
+            env.insert("SAFARIDRIVER_ARGS".to_string(), webdriver_args);
         }
         _ => {
             panic!("Unexpected browser type: {}", browser_type)
         }
     }
 
+    env.insert("RUST_LOG".to_string(), "debug".to_string());
+
     // Run the test
     let mut command = Command::new(test_runner);
     command.envs(env).arg(test_bin).args(env::args().skip(1));

extensions/wasm_bindgen/private/webdrivers/BUILD.bazel

@@ -1,10 +1,5 @@
 load("@bazel_skylib//:bzl_library.bzl", "bzl_library")
 
-exports_files([
-    "firefox",
-    "chrome",
-])
-
 bzl_library(
     name = "bzl_lib",
     srcs = glob(["*.bzl"]),