Fix tests
authorCarl Lerche + Yehuda Katz <engineering@tilde.io>
Fri, 13 Jun 2014 21:19:06 +0000 (14:19 -0700)
committerTim Carey-Smith <tim@spork.in>
Fri, 13 Jun 2014 21:19:06 +0000 (14:19 -0700)
tests/support/mod.rs
tests/test_cargo_compile_git_deps.rs

index ac2326ae1205ce6a954bc82eaf69875dd5a458ae..a7cde6a6553d334a45d2122a307fb2d2e7344066 100644 (file)
@@ -64,14 +64,6 @@ impl ProjectBuilder {
         }
     }
 
-    pub fn join<T: Str>(&self, name: &str, path: T) -> ProjectBuilder {
-        ProjectBuilder {
-            name: name.as_slice().to_str(),
-            root: self.root.join(path.as_slice()).clone(),
-            files: vec!()
-        }
-    }
-
     pub fn root(&self) -> Path {
       self.root.clone()
     }
index 2574a3631767ae44a0bd7222bd27efec79eb7a2b..03675ac567a5a0005d6d0eecd1fdc836507951fe 100644 (file)
@@ -67,8 +67,8 @@ test!(cargo_compile_simple_git_dep {
 
     assert_that(project.cargo_process("cargo-compile"),
         execs()
-        .with_stdout(format!("Compiling dep1 v0.5.0 (file:{})\nCompiling foo v0.5.0 (file:{})\n",
-                             git_root.display(), root.display()))
+        .with_stdout(format!("Updating git repository `file:{}`\nCompiling dep1 v0.5.0 (file:{})\nCompiling foo v0.5.0 (file:{})\n",
+                             git_root.display(), git_root.display(), root.display()))
         .with_stderr(""));
 
     assert_that(&project.root().join("target/foo"), existing_file());