Fix tests.

moonrepo · Dec 15, 2024 · 4d643a0 · 4d643a0
1 parent 92e94ef
commit 4d643a0
Show file tree

Hide file tree

Showing 9 changed files with 40 additions and 22 deletions.
diff --git a/crates/cli/tests/alias_test.rs b/crates/cli/tests/alias_test.rs
@@ -129,7 +129,8 @@ mod alias_global {
                     .arg("node")
                     .arg("example")
                     .arg("19.0.0")
-                    .arg("--global");
+                    .arg("--to")
+                    .arg("global");
             })
             .success();
 

diff --git a/crates/cli/tests/pin_test.rs b/crates/cli/tests/pin_test.rs
@@ -151,7 +151,11 @@ mod pin_global {
 
         sandbox
             .run_bin(|cmd| {
-                cmd.arg("pin").arg("--global").arg("node").arg("19.0.0");
+                cmd.arg("pin")
+                    .arg("--to")
+                    .arg("global")
+                    .arg("node")
+                    .arg("19.0.0");
             })
             .success();
 
@@ -174,7 +178,11 @@ mod pin_global {
 
         sandbox
             .run_bin(|cmd| {
-                cmd.arg("pin").arg("--global").arg("npm").arg("bundled");
+                cmd.arg("pin")
+                    .arg("--to")
+                    .arg("global")
+                    .arg("npm")
+                    .arg("bundled");
             })
             .success();
 
@@ -197,7 +205,11 @@ mod pin_global {
 
         sandbox
             .run_bin(|cmd| {
-                cmd.arg("pin").arg("--global").arg("npm").arg("1.2");
+                cmd.arg("pin")
+                    .arg("--to")
+                    .arg("global")
+                    .arg("npm")
+                    .arg("1.2");
             })
             .success();
 
@@ -221,7 +233,8 @@ mod pin_global {
         sandbox
             .run_bin(|cmd| {
                 cmd.arg("pin")
-                    .arg("--global")
+                    .arg("--to")
+                    .arg("global")
                     .arg("npm")
                     .arg("6")
                     .arg("--resolve");
@@ -244,7 +257,11 @@ mod pin_global {
 
         sandbox
             .run_bin(|cmd| {
-                cmd.arg("pin").arg("--global").arg("node").arg("20");
+                cmd.arg("pin")
+                    .arg("--to")
+                    .arg("global")
+                    .arg("node")
+                    .arg("20");
             })
             .success();
 

diff --git a/crates/cli/tests/plugin_add_test.rs b/crates/cli/tests/plugin_add_test.rs
@@ -66,7 +66,8 @@ mod plugin_add {
                     .arg("add")
                     .arg("id")
                     .arg("https://github.com/moonrepo/tools/releases/latest/download/example_plugin.wasm")
-                    .arg("--global");
+                    .arg("--to")
+                    .arg("global");
             })
             .success();
 

diff --git a/crates/cli/tests/plugin_remove_test.rs b/crates/cli/tests/plugin_remove_test.rs
@@ -67,7 +67,11 @@ mod plugin_remove {
 
         sandbox
             .run_bin(|cmd| {
-                cmd.arg("plugin").arg("remove").arg("id").arg("--global");
+                cmd.arg("plugin")
+                    .arg("remove")
+                    .arg("id")
+                    .arg("--from")
+                    .arg("global");
             })
             .success();
 

diff --git a/crates/cli/tests/plugin_search_test.rs b/crates/cli/tests/plugin_search_test.rs
@@ -32,7 +32,7 @@ mod plugin_search {
             .failure();
 
         assert.stderr(predicate::str::contains(
-            "No plugins available for query \"gibberish\"",
+            "no plugins found in the registry for the query gibberish",
         ));
     }
 

diff --git a/crates/cli/tests/run_test.rs b/crates/cli/tests/run_test.rs
@@ -190,9 +190,7 @@ mod run {
             })
             .success();
 
-        assert.stdout(predicate::str::contains(
-            "Node.js 19.0.0 has been installed",
-        ));
+        assert.stdout(predicate::str::contains("Node.js 19.0.0 installed"));
     }
 
     #[test]
@@ -211,9 +209,7 @@ mod run {
             })
             .success();
 
-        assert.stdout(predicate::str::contains(
-            "Node.js 19.0.0 has been installed",
-        ));
+        assert.stdout(predicate::str::contains("Node.js 19.0.0 installed"));
 
         env::remove_var("PROTO_AUTO_INSTALL");
     }
@@ -251,9 +247,7 @@ mod run {
             })
             .success();
 
-        assert.stdout(predicate::str::contains(
-            "Node.js 19.0.0 has been installed",
-        ));
+        assert.stdout(predicate::str::contains("Node.js 19.0.0 installed"));
 
         let assert = sandbox
             .run_bin(|cmd| {
@@ -265,7 +259,7 @@ mod run {
             })
             .success();
 
-        assert.stdout(predicate::str::contains("Node.js 19.0.0 has been installed").not());
+        assert.stdout(predicate::str::contains("Node.js 19.0.0 installed").not());
     }
 
     #[test]

diff --git a/crates/cli/tests/unalias_test.rs b/crates/cli/tests/unalias_test.rs
@@ -112,7 +112,8 @@ mod unalias_global {
                 cmd.arg("unalias")
                     .arg("node")
                     .arg("example")
-                    .arg("--global");
+                    .arg("--from")
+                    .arg("global");
             })
             .success();
 

diff --git a/crates/cli/tests/uninstall_test.rs b/crates/cli/tests/uninstall_test.rs
@@ -14,7 +14,7 @@ mod uninstall {
             cmd.arg("uninstall").arg("node").arg("19.0.0");
         });
 
-        assert.inner.stderr(predicate::str::contains(
+        assert.inner.stdout(predicate::str::contains(
             "Node.js 19.0.0 has not been installed locally",
         ));
     }

diff --git a/crates/cli/tests/unpin_test.rs b/crates/cli/tests/unpin_test.rs
@@ -88,7 +88,7 @@ mod unpin_global {
 
         sandbox
             .run_bin(|cmd| {
-                cmd.arg("unpin").arg("node").arg("--global");
+                cmd.arg("unpin").arg("node").arg("--from").arg("global");
             })
             .success();