fix tests

fauna · Dec 11, 2024 · 6b1b849 · 6b1b849
1 parent 3eded61
commit 6b1b849
Show file tree

Hide file tree

Showing 2 changed files with 26 additions and 19 deletions.
diff --git a/src/commands/schema/status.mjs b/src/commands/schema/status.mjs
@@ -49,6 +49,7 @@ async function doStatus(argv) {
     });
   }
 
+  // Output the status response
   logger.stdout(`Staged changes: ${chalk.bold(statusResponse.status)}`);
   if (statusResponse.pending_summary !== "") {
     logger.stdout(statusResponse.pending_summary);
@@ -58,21 +59,27 @@ async function doStatus(argv) {
     logger.stdout(statusResponse.diff.split("\n").join("\n  "));
   }
 
+  // Output the diff response
   if (!hasLocalSchema) {
     logger.stdout(
       `Local changes: ${chalk.bold(`no schema files found in '${absoluteDirPath}'`)}\n`,
     );
-  } else if (diffResponse.error) {
-    logger.stdout(`Local changes:`);
+    return;
+  }
+
+  if (diffResponse.error) {
     throw new CommandError(diffResponse.error.message);
-  } else if (diffResponse.diff === "") {
+  }
+
+  if (diffResponse.diff === "") {
     logger.stdout(`Local changes: ${chalk.bold("none")}\n`);
-  } else {
-    logger.stdout(`Local changes:\n`);
-    logger.stdout(`  ${diffResponse.diff.split("\n").join("\n  ")}`);
-    logger.stdout("(use `fauna schema diff` to display local changes)");
-    logger.stdout("(use `fauna schema push` to stage local changes)");
+    return;
   }
+
+  logger.stdout(`Local changes:\n`);
+  logger.stdout(`  ${diffResponse.diff.split("\n").join("\n  ")}`);
+  logger.stdout("(use `fauna schema diff` to display local changes)");
+  logger.stdout("(use `fauna schema push` to stage local changes)");
 }
 
 function buildStatusCommand(yargs) {

diff --git a/test/schema/status.mjs b/test/schema/status.mjs
@@ -99,12 +99,12 @@ describe("schema status", function () {
     await run(`schema status --secret "secret"`, container);
 
     expect(fetch).to.have.been.calledWith(
-      buildUrl("/schema/1/staged/status", { diff: "summary", color: "ansi" }),
+      buildUrl("/schema/1/staged/status", { format: "summary", color: "ansi" }),
       commonFetchParams,
     );
     expect(fetch).not.to.have.been.calledWith(
       buildUrl("/schema/1/validate", {
-        diff: "summary",
+        format: "summary",
         staged: "true",
         version: "0",
         color: "ansi",
@@ -140,12 +140,12 @@ describe("schema status", function () {
     await run(`schema status --secret "secret"`, container);
 
     expect(fetch).to.have.been.calledWith(
-      buildUrl("/schema/1/staged/status", { diff: "summary", color: "ansi" }),
+      buildUrl("/schema/1/staged/status", { format: "summary", color: "ansi" }),
       commonFetchParams,
     );
     expect(fetch).to.have.been.calledWith(
       buildUrl("/schema/1/diff", {
-        diff: "summary",
+        format: "summary",
         staged: "true",
         version: "0",
         color: "ansi",
@@ -184,12 +184,12 @@ describe("schema status", function () {
     await run(`schema status --secret "secret"`, container);
 
     expect(fetch).to.have.been.calledWith(
-      buildUrl("/schema/1/staged/status", { diff: "summary", color: "ansi" }),
+      buildUrl("/schema/1/staged/status", { format: "summary", color: "ansi" }),
       commonFetchParams,
     );
     expect(fetch).to.have.been.calledWith(
       buildUrl("/schema/1/diff", {
-        diff: "summary",
+        format: "summary",
         staged: "true",
         version: "0",
         color: "ansi",
@@ -233,13 +233,13 @@ describe("schema status", function () {
     await run(`schema status --secret "secret"`, container);
 
     expect(fetch).to.have.been.calledWith(
-      buildUrl("/schema/1/staged/status", { diff: "summary", color: "ansi" }),
+      buildUrl("/schema/1/staged/status", { format: "summary", color: "ansi" }),
       commonFetchParams,
     );
 
     expect(fetch).to.have.been.calledWith(
       buildUrl("/schema/1/diff", {
-        diff: "summary",
+        format: "summary",
         staged: "true",
         version: "0",
         color: "ansi",
@@ -281,12 +281,12 @@ describe("schema status", function () {
     await run(`schema status --secret "secret"`, container);
 
     expect(fetch).to.have.been.calledWith(
-      buildUrl("/schema/1/staged/status", { diff: "summary", color: "ansi" }),
+      buildUrl("/schema/1/staged/status", { format: "summary", color: "ansi" }),
       commonFetchParams,
     );
     expect(fetch).to.have.been.calledWith(
       buildUrl("/schema/1/diff", {
-        diff: "summary",
+        format: "summary",
         staged: "true",
         version: "0",
         color: "ansi",
@@ -325,7 +325,7 @@ describe("schema status", function () {
     await run(`schema status --no-color --secret "secret"`, container);
 
     expect(fetch).to.have.been.calledWith(
-      buildUrl("/schema/1/staged/status", { diff: "summary" }),
+      buildUrl("/schema/1/staged/status", { format: "summary" }),
       commonFetchParams,
     );
     expect(logger.stderr).not.to.have.been.called;