chore: fix tests & clippy

vercel · Jun 6, 2024 · 880b670 · 880b670
1 parent cb033cf
commit 880b670
Show file tree

Hide file tree

Showing 4 changed files with 5 additions and 7 deletions.
diff --git a/crates/turborepo-lib/src/shim.rs b/crates/turborepo-lib/src/shim.rs
@@ -606,13 +606,8 @@ fn run_correct_turbo(
             shim_args.invocation_dir.as_path(),
         );
         debug!("Running command as global turbo");
-        let should_warn_on_global =
-            env::var(TURBO_GLOBAL_WARNING_DISABLED).map_or(true, |disable| {
-                match disable.as_str() {
-                    "1" | "true" => false,
-                    _ => true,
-                }
-            });
+        let should_warn_on_global = env::var(TURBO_GLOBAL_WARNING_DISABLED)
+            .map_or(true, |disable| !matches!(disable.as_str(), "1" | "true"));
         if should_warn_on_global {
             eprintln!("No locally installed `turbo` found. Using version: {version}.");
         }

diff --git a/turborepo-tests/helpers/setup.sh b/turborepo-tests/helpers/setup.sh
@@ -11,4 +11,5 @@ fi
 
 # disable the first-run telemetry message
 export TURBO_TELEMETRY_MESSAGE_DISABLED=1
+export TURBO=${MONOREPO_ROOT_DIR}/target/debug/turbo${EXT}
 TURBO=${MONOREPO_ROOT_DIR}/target/debug/turbo${EXT}
diff --git a/turborepo-tests/integration/tests/prune/resolutions.t b/turborepo-tests/integration/tests/prune/resolutions.t
@@ -1,6 +1,7 @@
 Setup
   $ . ${TESTDIR}/../../../helpers/setup.sh
   $ . ${TESTDIR}/../../../helpers/copy_fixture.sh $(pwd) berry_resolutions ${TESTDIR}/../../fixtures
+  $ export TURBO_GLOBAL_WARNING_DISABLED=1
 
 Prune a
 We expect to no longer have the non-resolved is-odd descriptor and

diff --git a/turborepo-tests/integration/tests/prune/yarn-pnp.t b/turborepo-tests/integration/tests/prune/yarn-pnp.t
@@ -1,6 +1,7 @@
 Setup
   $ . ${TESTDIR}/../../../helpers/setup.sh
   $ . ${TESTDIR}/../../../helpers/copy_fixture.sh $(pwd) berry_resolutions ${TESTDIR}/../../fixtures
+  $ export TURBO_GLOBAL_WARNING_DISABLED=1
 Remove linker override
   $ rm .yarnrc.yml
 Prune the project