Fix tests

Author: benjie

__tests__/helpers.ts

@@ -266,14 +266,16 @@ export const makeMigrations = (commitMessage?: string) => {
     commitMessage ? `\n--! Message: ${commitMessage}` : ``
   }\n\n${MIGRATION_NOTRX_TEXT.trim()}\n`;
 
+  const MIGRATION_INCLUDED_FIXTURE = "select 42;\n";
+
   const MIGRATION_INCLUDE_TEXT = `--!include foo.sql`;
-  const MIGRATION_INCLUDE_COMPILED = `${MIGRATION_INCLUDE_TEXT}\n${MIGRATION_1_TEXT}\n${MIGRATION_INCLUDE_TEXT}`;
+  const MIGRATION_INCLUDE_COMPILED = `--! Included foo.sql\n${MIGRATION_INCLUDED_FIXTURE.trim()}\n--! EndIncluded foo.sql\n`;
   const MIGRATION_INCLUDE_HASH = createHash("sha1")
     .update(`${MIGRATION_INCLUDE_COMPILED.trim()}` + "\n")
     .digest("hex");
   const MIGRATION_INCLUDE_COMMITTED = `--! Previous: -\n--! Hash: sha1:${MIGRATION_INCLUDE_HASH}${
     commitMessage ? `\n--! Message: ${commitMessage}` : ``
-  }\n\n${MIGRATION_INCLUDE_COMPILED}\n`;
+  }\n\n${MIGRATION_INCLUDE_COMPILED.trim()}\n`;
 
   const MIGRATION_MULTIFILE_FILES = {
     "migrations/links/two.sql": "select 2;",
@@ -320,6 +322,7 @@ select 3;
     MIGRATION_INCLUDE_TEXT,
     MIGRATION_INCLUDE_HASH,
     MIGRATION_INCLUDE_COMMITTED,
+    MIGRATION_INCLUDED_FIXTURE,
     MIGRATION_MULTIFILE_TEXT,
     MIGRATION_MULTIFILE_HASH,
     MIGRATION_MULTIFILE_COMMITTED,

__tests__/uncommit.test.ts

@@ -59,6 +59,7 @@ describe.each([[undefined], ["My Commit Message"]])(
       MIGRATION_INCLUDE_COMMITTED,
       MIGRATION_MULTIFILE_COMMITTED,
       MIGRATION_MULTIFILE_FILES,
+      MIGRATION_INCLUDED_FIXTURE,
     } = makeMigrations(commitMessage);
 
     it("rolls back migration", async () => {
@@ -95,7 +96,7 @@ describe.each([[undefined], ["My Commit Message"]])(
         [`migrations/committed/000001${commitMessageSlug}.sql`]:
           MIGRATION_INCLUDE_COMMITTED,
         "migrations/current.sql": "-- JUST A COMMENT\n",
-        "migrations/fixtures/foo.sql": MIGRATION_1_TEXT,
+        "migrations/fixtures/foo.sql": MIGRATION_INCLUDED_FIXTURE,
       });
       await migrate(settings);
       await uncommit(settings);

src/commands/uncommit.ts

@@ -42,10 +42,10 @@ export async function _uncommit(parsedSettings: ParsedSettings): Promise<void> {
   const contents = await fsp.readFile(lastMigrationFilepath, "utf8");
   const { headers, body } = parseMigrationText(lastMigrationFilepath, contents);
 
-  // Replace included migrations with their `--! include` equivalent
+  // Replace included migrations with their `--!include` equivalent
   const decompiledBody = body.replace(
     /^--! Included (?<filename>\S+)$[\s\S]*?^--! EndIncluded \k<filename>$/gm,
-    (_, filename) => `--! include ${filename}`,
+    (_, filename) => `--!include ${filename}`,
   );
 
   // Drop Hash, Previous and AllowInvalidHash from headers; then write out