Fix test cases

diesel-rs · Mar 4, 2020 · 46fe6dc · 46fe6dc
1 parent a3274db
commit 46fe6dc
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 7 deletions.
diff --git a/diesel_cli/src/main.rs b/diesel_cli/src/main.rs
@@ -199,12 +199,15 @@ fn migrations_dir(matches: &ArgMatches) -> Result<PathBuf, MigrationError> {
     let migrations_dir = migrations_dir_from_cli(matches)
         .or_else(|| env::var("MIGRATION_DIRECTORY").map(PathBuf::from).ok())
         .or_else(|| {
-            Some(
-                Config::read(matches)
-                    .unwrap_or_else(handle_error)
-                    .migrations_directory?
-                    .dir,
-            )
+            let mut project_root = find_project_root().ok()?;
+            let migrations_dir = Config::read(matches)
+                .unwrap_or_else(handle_error)
+                .migrations_directory?
+                .dir;
+
+            project_root.push(migrations_dir);
+
+            Some(project_root)
         });
 
     match migrations_dir {

diff --git a/diesel_cli/tests/migration_run.rs b/diesel_cli/tests/migration_run.rs
@@ -502,7 +502,8 @@ fn verify_schema_errors_if_schema_file_would_change() {
     assert!(
         result
             .stderr()
-            .contains("Command would result in changes to src/my_schema.rs"),
+            .contains("Command would result in changes to")
+            && result.stderr().contains("src/my_schema.rs"),
         "Unexpected stderr {}",
         result.stderr()
     );