WIP 03b3a

Author: anthonyshew

crates/turborepo-lib/src/turbo_json/mod.rs

@@ -800,14 +800,13 @@ mod tests {
     use turborepo_unescape::UnescapedString;
 
     use super::{
-        validate_extends, validate_no_package_task_syntax, validate_no_root_syntax_in_global_deps,
-        Pipeline, RawTaskDefinition, RawTurboJson, SpacesJson, Spanned, TaskName, TurboJson,
-        UIMode,
+        validate_no_root_syntax_in_global_deps, RawTaskDefinition, RawTurboJson, SpacesJson,
+        Spanned, TaskName, TurboJson, UIMode,
     };
     use crate::{
         boundaries::BoundariesConfig,
         cli::OutputLogsMode,
-        config::{Error, RootSyntaxInGlobalDepsError},
+        config::Error,
         task_graph::{TaskDefinition, TaskOutputs},
     };
 

crates/turborepo-scm/src/package_deps.rs

@@ -639,7 +639,7 @@ mod tests {
 
     #[test]
     fn test_root_relative_paths() -> Result<(), Error> {
-        let (tmp_dir, repo_root) = tmp_dir();
+        let (_, repo_root) = tmp_dir();
         setup_repository(&repo_root);
 
         // Create a package with some files
@@ -656,57 +656,58 @@ mod tests {
 
         commit_all(&repo_root);
 
-        let git = Git::new(&repo_root)?;
+        let scm = SCM::new(&repo_root);
+
         let pkg_path = AnchoredSystemPath::new("my-pkg")?;
 
         // Test with $TURBO_ROOT$ and root-relative path
-        let hashes = git.get_package_file_hashes(
+        let hashes = scm.get_package_file_hashes(
             &repo_root,
             pkg_path,
             &["$TURBO_ROOT$", "root-file.txt"],
-            false,
+            None,
         )?;
 
         assert!(
-            hashes.contains_key("root-file.txt"),
+            hashes.contains_key(&RelativeUnixPathBuf::new("root-file.txt").unwrap()),
             "Should include root file"
         );
         assert!(
-            !hashes.contains_key("my-pkg/pkg-file.txt"),
+            !hashes.contains_key(&RelativeUnixPathBuf::new("my-pkg/pkg-file.txt").unwrap()),
             "Should not include package file"
         );
 
         // Test with $TURBO_ROOT$ and package-relative path
-        let hashes = git.get_package_file_hashes(
+        let hashes = scm.get_package_file_hashes(
             &repo_root,
             pkg_path,
             &["$TURBO_ROOT$", "pkg-file.txt"],
-            false,
+            None,
         )?;
 
         assert!(
-            hashes.contains_key("my-pkg/pkg-file.txt"),
+            hashes.contains_key(&RelativeUnixPathBuf::new("my-pkg/pkg-file.txt").unwrap()),
             "Should include package file"
         );
         assert!(
-            !hashes.contains_key("root-file.txt"),
+            !hashes.contains_key(&RelativeUnixPathBuf::new("root-file.txt").unwrap()),
             "Should not include root file"
         );
 
         // Test with $TURBO_ROOT$ and both root and package paths
-        let hashes = git.get_package_file_hashes(
+        let hashes = scm.get_package_file_hashes(
             &repo_root,
             pkg_path,
             &["$TURBO_ROOT$", "root-file.txt", "pkg-file.txt"],
-            false,
+            None,
         )?;
 
         assert!(
-            hashes.contains_key("root-file.txt"),
+            hashes.contains_key(&RelativeUnixPathBuf::new("root-file.txt").unwrap()),
             "Should include root file"
         );
         assert!(
-            hashes.contains_key("my-pkg/pkg-file.txt"),
+            hashes.contains_key(&RelativeUnixPathBuf::new("my-pkg/pkg-file.txt").unwrap()),
             "Should include package file"
         );