fix schema status confirmation prompts

fauna · Oct 29, 2024 · 27e809f · 27e809f
1 parent 09bcb9b
commit 27e809f
Show file tree

Hide file tree

Showing 2 changed files with 58 additions and 4 deletions.
diff --git a/src/commands/schema/push.mjs b/src/commands/schema/push.mjs
@@ -11,6 +11,8 @@ async function doPush(argv) {
   const gatherFSL = container.resolve("gatherFSL");
   const fsl = reformatFSL(await gatherFSL(argv.dir));
 
+  const isStagedPush = !argv.active;
+
   if (!argv.input) {
     const params = new URLSearchParams({
       force: "true",
@@ -41,13 +43,13 @@ async function doPush(argv) {
       method: "POST",
     });
 
-    let message = "Accept and push changes?";
+    let message = isStagedPush ? "Stage the above changes?" : "Push the above changes?";
     if (response.diff) {
       logger.stdout(`Proposed diff:\n`);
       logger.stdout(response.diff);
     } else {
       logger.stdout("No logical changes.");
-      message = "Push file contents anyway?";
+      message = isStagedPush ? "Stage the file contents anyway?" : "Push the file contents anyway?";
     }
     const confirm = container.resolve("confirm");
     const confirmed = await confirm({

diff --git a/test/schema/push.mjs b/test/schema/push.mjs
@@ -95,6 +95,9 @@ describe("schema push", function () {
 
     expect(logger.stderr).to.not.be.called;
     expect(logger.stdout).to.have.been.calledWith("Proposed diff:\n");
+    expect(confirm).to.have.been.calledWith(
+      sinon.match.has("message", "Stage the above changes?"),
+    );
     expect(logger.stdout).to.have.been.calledWith(diffString);
   });
 
@@ -146,6 +149,9 @@ describe("schema push", function () {
 
     expect(logger.stderr).to.not.be.called;
     expect(logger.stdout).to.have.been.calledWith("Proposed diff:\n");
+    expect(confirm).to.have.been.calledWith(
+      sinon.match.has("message", "Push the above changes?"),
+    );
     expect(logger.stdout).to.have.been.calledWith(diffString);
   });
 
@@ -192,7 +198,7 @@ describe("schema push", function () {
     expect(gatherFSL).to.have.been.calledWith("/absolute/path/elsewhere");
   });
 
-  it("warns when attempting to push an empty diff", async function () {
+  it("warns when attempting to stage an empty diff", async function () {
     // user accepts the changes in the interactive prompt
     confirm.resolves(true);
 
@@ -234,7 +240,53 @@ describe("schema push", function () {
     expect(logger.stderr).to.not.be.called;
     expect(logger.stdout).to.have.been.calledWith("No logical changes.");
     expect(confirm).to.have.been.calledWith(
-      sinon.match.has("message", "Push file contents anyway?"),
+      sinon.match.has("message", "Stage the file contents anyway?"),
+    );
+  });
+
+  it("warns when attempting to push an empty diff", async function () {
+    // user accepts the changes in the interactive prompt
+    confirm.resolves(true);
+
+    fetch.onCall(0).resolves(
+      f({
+        // this is the version we provide when we mutate the resource
+        version: 1728675598430000,
+        // note: no diff
+      }),
+    );
+
+    await run(`schema push --secret "secret" --active`, container);
+
+    expect(fetch).to.have.been.calledWith(
+      buildUrl("/schema/1/validate", {
+        force: "true",
+        staged: "false",
+        color: "ansi",
+      }),
+      {
+        method: "POST",
+        headers: { AUTHORIZATION: "Bearer secret" },
+        body: reformatFSL(fsl),
+      },
+    );
+
+    expect(fetch).to.have.been.calledWith(
+      buildUrl("/schema/1/update", {
+        version: "1728675598430000",
+        staged: "false",
+      }),
+      {
+        method: "POST",
+        headers: { AUTHORIZATION: "Bearer secret" },
+        body: reformatFSL(fsl),
+      },
+    );
+
+    expect(logger.stderr).to.not.be.called;
+    expect(logger.stdout).to.have.been.calledWith("No logical changes.");
+    expect(confirm).to.have.been.calledWith(
+      sinon.match.has("message", "Push the file contents anyway?"),
     );
   });