Merge pull request #29 from leabstrait/new-tests

New test cases for migrations
halvardssm · May 23, 2020 · e525c1f · e525c1f
2 parents e8ab6eb + 2d0ba21
commit e525c1f
Show file tree

Hide file tree

Showing 4 changed files with 64 additions and 12 deletions.
diff --git a/cli/utils.ts b/cli/utils.ts
@@ -42,14 +42,14 @@ export const filterAndSortFiles = (
   files: Deno.DirEntry[],
   queryResult: string | undefined,
 ): Deno.DirEntry[] => {
-  return files.filter((file: Deno.DirEntry): boolean => {
-    if (!regexFileName.test(file.name)) return false;
+  return files
+    .filter((file: Deno.DirEntry): boolean => {
+      if (!regexFileName.test(file.name)) return false;
 
-    if (queryResult === undefined) return true;
+      if (queryResult === undefined) return true;
 
-    return parseInt(file.name.split("-")[0]) >
-      new Date(queryResult).getTime();
-  })
+      return file.name > queryResult;
+    })
     .sort((a, b) => parseInt(a?.name ?? "0") - parseInt(b?.name ?? "0"));
 };
 

diff --git a/tests/migration.test.ts b/tests/migration.test.ts
@@ -13,6 +13,8 @@ const strings = [
     solution: [
       "Database setup complete",
       "Migrated 1587937822648-test.ts",
+      "Migrated 1587937822649-apple.ts",
+      "Migrated 1587937822650-mango.ts",
       "Migration complete",
     ],
   },
@@ -22,19 +24,43 @@ const strings = [
     solution: ["Nothing to migrate"],
   },
   {
-    name: "Rollback",
+    name: "Rollback Mango",
     string: TYPE_ROLLBACK,
-    solution: ["Rolled back 1587937822648-test.ts"],
+    solution: ["Rolled back 1587937822650-mango.ts"],
   },
   {
-    name: "Rollback empty",
+    name: "Rollback Apple",
     string: TYPE_ROLLBACK,
-    solution: ["Nothing to rollback"],
+    solution: ["Rolled back 1587937822649-apple.ts"],
   },
   {
-    name: "Migrate",
+    name: "Migrate Apple and Mango",
     string: TYPE_MIGRATE,
-    solution: ["Migrated 1587937822648-test.ts", "Migration complete"],
+    solution: [
+      "Migrated 1587937822649-apple.ts",
+      "Migrated 1587937822650-mango.ts",
+      "Migration complete",
+    ],
+  },
+  {
+    name: "Rollback Mango",
+    string: TYPE_ROLLBACK,
+    solution: ["Rolled back 1587937822650-mango.ts"],
+  },
+  {
+    name: "Rollback Apple",
+    string: TYPE_ROLLBACK,
+    solution: ["Rolled back 1587937822649-apple.ts"],
+  },
+  {
+    name: "Rollback Test",
+    string: TYPE_ROLLBACK,
+    solution: ["Rolled back 1587937822648-test.ts"],
+  },
+  {
+    name: "Rollback empty",
+    string: TYPE_ROLLBACK,
+    solution: ["Nothing to rollback"],
   },
 ];
 

diff --git a/tests/migrations/1587937822649-apple.ts b/tests/migrations/1587937822649-apple.ts
@@ -0,0 +1,13 @@
+import { Schema } from "../../mod.ts";
+
+export const up = (scema: Schema): void => {
+  scema.create("apple", (table) => {
+    table.id();
+    table.string("col_1", 10);
+    table.timestamps();
+  });
+};
+
+export const down = (schema: Schema): void => {
+  schema.drop("apple");
+};
diff --git a/tests/migrations/1587937822650-mango.ts b/tests/migrations/1587937822650-mango.ts
@@ -0,0 +1,13 @@
+import { Schema } from "../../mod.ts";
+
+export const up = (scema: Schema): void => {
+  scema.create("mango", (table) => {
+    table.id();
+    table.string("col_1", 10);
+    table.timestamps();
+  });
+};
+
+export const down = (schema: Schema): void => {
+  schema.drop("mango");
+};