Fix completed migration listing

Fixes #4951
knex · Mar 14, 2022 · 67fe54f · 67fe54f
1 parent 1ce659f
commit 67fe54f
Show file tree

Hide file tree

Showing 2 changed files with 18 additions and 15 deletions.
diff --git a/bin/utils/migrationsLister.js b/bin/utils/migrationsLister.js
@@ -6,15 +6,15 @@ function listMigrations(completed, newMigrations) {
   let message = '';
 
   if (completed.length === 0) {
-    message += color.red('No Completed Migration files Found. \n');
+    message += color.red('No Completed Migration files Found.\n');
   } else {
     message = color.green(
       `Found ${completed.length} Completed Migration file/files.\n`
     );
 
     for (let i = 0; i < completed.length; i++) {
       const file = completed[i];
-      message += color.cyan(`${file} \n`);
+      message += color.cyan(`${file.name}\n`);
     }
   }
 
@@ -27,7 +27,7 @@ function listMigrations(completed, newMigrations) {
 
     for (let i = 0; i < newMigrations.length; i++) {
       const file = newMigrations[i];
-      message += color.cyan(`${file.file} \n`);
+      message += color.cyan(`${file.file}\n`);
     }
   }
 

diff --git a/test/jake/jakelib/migrate-test.js b/test/jake/jakelib/migrate-test.js
@@ -8,6 +8,7 @@ const rimrafSync = require('rimraf').sync;
 const path = require('path');
 const sqlite3 = require('@vscode/sqlite3');
 const { assert } = require('chai');
+const color = require('colorette');
 const {
   assertExec,
   assertExecError,
@@ -657,19 +658,20 @@ test('migrate:list prints migrations both completed and pending', async (temp) =
   );
 
   const migrationsListResult = await assertExec(
-    `node ${KNEX} migrate:list \
+    `NO_COLOR= node ${KNEX} migrate:list \
       --client=sqlite3 \
       --connection=${temp}/db \
       --migrations-directory=${temp}/migrations`
   );
 
   assert.include(
     migrationsListResult.stdout,
-    `Found 1 Completed Migration file/files.`
-  );
-  assert.include(
-    migrationsListResult.stdout,
-    `Found 1 Pending Migration file/files.`
+    [
+      `Found 1 Completed Migration file/files.`,
+      migrationFile1,
+      `Found 1 Pending Migration file/files.`,
+      migrationFile2,
+    ].join('\n')
   );
 
   const migrationUp2Result = await assertExec(
@@ -686,19 +688,20 @@ test('migrate:list prints migrations both completed and pending', async (temp) =
   );
 
   const migrationsList2Result = await assertExec(
-    `node ${KNEX} migrate:list \
+    `NO_COLOR= node ${KNEX} migrate:list \
           --client=sqlite3 \
           --connection=${temp}/db \
           --migrations-directory=${temp}/migrations`
   );
 
   assert.include(
     migrationsList2Result.stdout,
-    `Found 2 Completed Migration file/files.`
-  );
-  assert.include(
-    migrationsList2Result.stdout,
-    `No Pending Migration files Found.`
+    [
+      `Found 2 Completed Migration file/files.`,
+      migrationFile1,
+      migrationFile2,
+      `No Pending Migration files Found.`,
+    ].join('\n')
   );
 });