wasmer-pack-testing wasn't running "yarn jest" on MacOS/Linux

CHANGELOG.md

@@ -20,6 +20,8 @@ change, where applicable.
 - Fixed the "Releases" job in CI so `wasmer/wasmer-pack-cli` would be published
   and not just `wasmer/wasmer-pack`
   ([#124](https://github.com/wasmerio/wasmer-pack/pull/124))
+- Fixed the `wasmer-pack-testing` crate so it would run `jest` commands properly
+  on Linux/MacOS ([#125](https://github.com/wasmerio/wasmer-pack/pull/125))
 
 ## [0.7.0] - 2023-02-10
 

crates/testing/src/autodiscover.rs

@@ -250,14 +250,14 @@ fn run_pytest(crate_dir: &Path) -> Result<(), Error> {
     Ok(())
 }
 
-fn shell() -> Command {
+fn shell(command: impl AsRef<std::ffi::OsStr>) -> Command {
     if cfg!(target_os = "windows") {
         let mut cmd = Command::new("cmd");
-        cmd.arg("/C");
+        cmd.arg("/C").arg(command);
         cmd
     } else {
         let mut cmd = Command::new("sh");
-        cmd.arg("-c");
+        cmd.arg("-c").arg(command);
         cmd
     }
 }
@@ -273,10 +273,11 @@ fn setup_javascript(crate_dir: &Path, generated_bindings: &Path) -> Result<(), E
     let yarn_lock = crate_dir.join("yarn.lock");
 
     if yarn_lock.exists() {
-        //need to install dependencies for generated package as yarn link doesn't resolves the dependencies on it own
+        //need to install dependencies for generated package as yarn link
+        //doesn't resolves the dependencies on it own
 
-        let mut cmd = shell();
-        cmd.arg("yarn").current_dir(&package_path);
+        let mut cmd = shell("yarn");
+        cmd.current_dir(&package_path);
         tracing::info!(
             ?cmd,
             "Installing the Javascript Dependencies for generated package"
@@ -294,32 +295,11 @@ fn setup_javascript(crate_dir: &Path, generated_bindings: &Path) -> Result<(), E
             "Unable to install JavaScript Dependencies for generated package"
         );
 
-        let mut cmd = shell();
-        cmd.arg("yarn").current_dir(crate_dir);
-        tracing::info!(
-            ?cmd,
-            "Found `yarn-lock`. Installing the Javascript Dependencies"
-        );
-
-        let status = cmd
-            .stdin(Stdio::null())
-            .stdout(Stdio::inherit())
-            .stderr(Stdio::inherit())
-            .current_dir(crate_dir)
-            .status()
-            .context("Unable to run yarn. Is it installed?")?;
-        anyhow::ensure!(
-            status.success(),
-            "Unable to install JavaScript Dependencies"
-        );
         return Ok(());
     }
 
-    let mut cmd = shell();
-    cmd.arg("yarn")
-        .arg("init")
-        .arg("--yes")
-        .current_dir(crate_dir);
+    let mut cmd = shell("yarn init --yes");
+    cmd.current_dir(crate_dir);
     tracing::info!(?cmd, "Initializing the Javascript package");
 
     let status = cmd
@@ -336,12 +316,8 @@ fn setup_javascript(crate_dir: &Path, generated_bindings: &Path) -> Result<(), E
 
     // install jest to crate dir
 
-    let mut cmd = shell();
-    cmd.arg("yarn")
-        .arg("add")
-        .arg("--dev")
-        .arg("jest")
-        .current_dir(crate_dir);
+    let mut cmd = shell("yarn add --dev jest");
+    cmd.current_dir(crate_dir);
     tracing::info!(?cmd, "Installing the Jest testing library");
 
     let status = cmd
@@ -359,8 +335,8 @@ fn setup_javascript(crate_dir: &Path, generated_bindings: &Path) -> Result<(), E
     fs::write(&jest_config_file, JEST_CONFIG)?;
     anyhow::ensure!(crate_dir.join(&jest_config_file).exists());
 
-    let mut cmd = shell();
-    cmd.arg("yarn").current_dir(&package_path);
+    let mut cmd = shell("yarn");
+    cmd.current_dir(&package_path);
 
     tracing::info!(?cmd, "Installing dependencies for generated bindings");
     let status = cmd
@@ -375,8 +351,8 @@ fn setup_javascript(crate_dir: &Path, generated_bindings: &Path) -> Result<(), E
         "Unable to install dependencies for generated bindings"
     );
 
-    let mut cmd = shell();
-    cmd.arg("yarn").arg("link").current_dir(&package_path);
+    let mut cmd = shell("yarn link");
+    cmd.current_dir(&package_path);
 
     tracing::info!(?cmd, "Linking the generated bindings as a `Yarn link`");
     let status = cmd
@@ -391,11 +367,8 @@ fn setup_javascript(crate_dir: &Path, generated_bindings: &Path) -> Result<(), E
         "Unable to perform yarn link on generated bindings"
     );
 
-    let mut cmd = shell();
-    cmd.arg("yarn")
-        .arg("link")
-        .arg(&generated_package_name)
-        .current_dir(crate_dir);
+    let mut cmd = shell(format!("yarn link {generated_package_name}"));
+    cmd.current_dir(crate_dir);
 
     tracing::info!(?cmd, "Linking the testing package to generated bindings");
     let status = cmd
@@ -413,9 +386,8 @@ fn setup_javascript(crate_dir: &Path, generated_bindings: &Path) -> Result<(), E
 }
 
 fn run_jest(crate_dir: &Path) -> Result<(), Error> {
-    let mut cmd = shell();
-
-    cmd.current_dir(crate_dir).arg("yarn").arg("jest");
+    let mut cmd = shell("yarn jest");
+    cmd.current_dir(crate_dir);
     tracing::info!(?cmd, "Running the jest tests");
 
     let status = cmd

crates/wasm/index.test.ts

@@ -30,9 +30,9 @@ describe("wasmer-pack bindings", () => {
             "package/src/bindings/index.d.ts",
             "package/src/bindings/index.js",
             "package/src/bindings/wasmer-pack/intrinsics.js",
+            "package/src/bindings/wasmer-pack/wasmer-pack-wasm.wasm",
             "package/src/bindings/wasmer-pack/wasmer-pack.d.ts",
             "package/src/bindings/wasmer-pack/wasmer-pack.js",
-            "package/src/bindings/wasmer-pack/wasmer-pack.wasm",
             "package/src/index.d.ts",
             "package/src/index.js",
         ]);
@@ -44,10 +44,10 @@ describe("wasmer-pack bindings", () => {
             packageJsonFile.contents
         );
 
-        expect(JSON.parse(packageJson)).toEqual(
-            jasmine.objectContaining({
+        expect(JSON.parse(packageJson)).toMatchObject(
+            {
                 name: "@wasmer/wasmer-pack",
-            })
+            }
         );
     });
 });