Updated all the "git commit" tests for v5.0

Author: JamesMessinger

test/specs/git-commit.spec.js

@@ -3,12 +3,28 @@
 const { check, files, mocks, bump } = require("../utils");
 const { expect } = require("chai");
 
-describe.skip("bump --commit", () => {
+describe("bump --commit", () => {
+
+  it("should not commit by default", () => {
+    files.create("package.json", { version: "1.0.0" });
+
+    let cli = bump("major");
+
+    expect(cli).to.have.stderr("");
+    expect(cli).to.have.exitCode(0);
+
+    expect(cli).to.have.stdout(
+      `${check} Updated package.json to 2.0.0\n`
+    );
+
+    let git = mocks.git();
+    expect(git.length).to.equal(0);
+  });
 
   it("should commit the manifest file to git", () => {
     files.create("package.json", { version: "1.0.0" });
 
-    let cli = bump("--major --commit");
+    let cli = bump("major --commit");
 
     expect(cli).to.have.stderr("");
     expect(cli).to.have.exitCode(0);
@@ -20,37 +36,35 @@ describe.skip("bump --commit", () => {
 
     let git = mocks.git();
     expect(git.length).to.equal(1);
-
-    expect(git[0].cmd).to.equal('git commit package.json -m "release v2.0.0"');
+    expect(git[0]).to.equal('git commit --message "release v2.0.0" package.json');
   });
 
   it("should commit multiple manifest files to git", () => {
     files.create("package.json", { version: "1.0.0" });
     files.create("bower.json", { version: "1.0.0" });
     files.create("component.json", { version: "1.0.0" });
 
-    let cli = bump("--minor --commit");
+    let cli = bump("minor *.json --commit");
 
     expect(cli).to.have.stderr("");
     expect(cli).to.have.exitCode(0);
 
     expect(cli).to.have.stdout(
-      `${check} Updated package.json to 1.1.0\n` +
       `${check} Updated bower.json to 1.1.0\n` +
       `${check} Updated component.json to 1.1.0\n` +
+      `${check} Updated package.json to 1.1.0\n` +
       `${check} Git commit\n`
     );
 
     let git = mocks.git();
     expect(git.length).to.equal(1);
-
-    expect(git[0].cmd).to.equal('git commit package.json bower.json component.json -m "release v1.1.0"');
+    expect(git[0]).to.equal('git commit --message "release v1.1.0" bower.json component.json package.json');
   });
 
   it("should commit all files to git", () => {
     files.create("package.json", { version: "1.0.0" });
 
-    let cli = bump("--minor --commit --all");
+    let cli = bump("minor --commit --all");
 
     expect(cli).to.have.stderr("");
     expect(cli).to.have.exitCode(0);
@@ -62,14 +76,13 @@ describe.skip("bump --commit", () => {
 
     let git = mocks.git();
     expect(git.length).to.equal(1);
-
-    expect(git[0].cmd).to.equal('git commit -a -m "release v1.1.0"');
+    expect(git[0]).to.equal('git commit --all --message "release v1.1.0"');
   });
 
   it("should commit without running pre-commit hooks", () => {
     files.create("package.json", { version: "1.0.0" });
 
-    let cli = bump("--minor --commit --all --no-verify");
+    let cli = bump("minor --commit --all --no-verify");
 
     expect(cli.stderr).to.be.empty;
     expect(cli).to.have.exitCode(0);
@@ -81,14 +94,49 @@ describe.skip("bump --commit", () => {
 
     let git = mocks.git();
     expect(git.length).to.equal(1);
+    expect(git[0]).to.equal('git commit --all --no-verify --message "release v1.1.0"');
+  });
+
+  it("should append the version number to the commit message", () => {
+    files.create("package.json", { version: "1.0.0" });
+
+    let cli = bump('patch --all --commit "this is release v"');
+
+    expect(cli).to.have.stderr("");
+    expect(cli).to.have.exitCode(0);
+
+    expect(cli).to.have.stdout(
+      `${check} Updated package.json to 1.0.1\n` +
+      `${check} Git commit\n`
+    );
+
+    let git = mocks.git();
+    expect(git.length).to.equal(1);
+    expect(git[0]).to.equal('git commit --all --message "this is release v1.0.1"');
+  });
+
+  it("should replace version number placeholders in the commit message", () => {
+    files.create("package.json", { version: "1.0.0" });
 
-    expect(git[0].cmd).to.equal('git commit --no-verify -a -m "release v1.1.0"');
+    let cli = bump('patch --all --commit "Releasing v%s. This is release v%s."');
+
+    expect(cli).to.have.stderr("");
+    expect(cli).to.have.exitCode(0);
+
+    expect(cli).to.have.stdout(
+      `${check} Updated package.json to 1.0.1\n` +
+      `${check} Git commit\n`
+    );
+
+    let git = mocks.git();
+    expect(git.length).to.equal(1);
+    expect(git[0]).to.equal('git commit --all --message "Releasing v1.0.1. This is release v1.0.1."');
   });
 
-  it("should commit the manifest files to git with a message", () => {
+  it("should accept an empty commit message", () => {
     files.create("package.json", { version: "1.0.0" });
 
-    let cli = bump("--patch --all --commit my-message");
+    let cli = bump(["patch", "--all", "--commit", ""]);
 
     expect(cli).to.have.stderr("");
     expect(cli).to.have.exitCode(0);
@@ -101,7 +149,7 @@ describe.skip("bump --commit", () => {
     let git = mocks.git();
     expect(git.length).to.equal(1);
 
-    expect(git[0].cmd).to.equal('git commit -a -m "v1.0.1 my-message"');
+    expect(git[0]).to.equal("git commit --all --message 1.0.1");
   });
 
 });