Separated "fixtures" and "files"

Author: JamesMessinger

test/specs/files.spec.js

@@ -1,27 +1,28 @@
 "use strict";
 
-const { check, files } = require("../utils");
+const { check, files, fixtures } = require("../utils");
 const { chaiExec, expect } = require("../utils/chai");
 
 describe.skip("bump [files...]", () => {
 
   it("should replace the version number in non-manifest files", () => {
     files.create("package.json", { version: "1.2.3" });
-    files.copy("LICENSE");
-    files.copy("README.md");
-    files.copy("script1.js");
-    files.copy("script2.js");
+    files.create("LICENSE", fixtures.license);
+    files.create("README.md", fixtures.readme);
+    files.create("script1.js", fixtures.script1);
+    files.create("script2.js", fixtures.script2);
+    files.create("subdir/deep/script1.js", fixtures.script1);
+    files.create("subdir/deep/script2.js", fixtures.script2);
 
-    let bump = chaiExec("--major --grep LICENSE README.* *.js");
+    let bump = chaiExec("major LICENSE README.* *.js");
 
     expect(bump).to.have.stderr("");
     expect(bump).to.have.exitCode(0);
 
     bump.should.have.stdout(
-      `${check} Updated package.json to 2.0.0\n` +
+      `${check} Updated LICENSE to 2.0.0\n` +
       `${check} Updated README.md to 2.0.0\n` +
-      `${check} Updated script1.js to 2.0.0\n` +
-      `${check} Updated LICENSE to 2.0.0\n`
+      `${check} Updated script1.js to 2.0.0\n`
     );
 
     expect(files.json("package.json").version).to.equal("2.0.0");
@@ -34,12 +35,12 @@ describe.skip("bump [files...]", () => {
 
   it("should not replace other version numbers in non-manifest files", () => {
     files.create("package.json", { version: "1.2.3" });
-    files.copy("LICENSE");
-    files.copy("README.md");
-    files.copy("script1.js");
-    files.copy("script2.js");
+    files.create("LICENSE", fixtures.license);
+    files.create("README.md", fixtures.readme);
+    files.create("script1.js", fixtures.script1);
+    files.create("script2.js", fixtures.script2);
 
-    let bump = chaiExec("--major --grep LICENSE README.* *.js");
+    let bump = chaiExec("major LICENSE README.* *.js");
 
     expect(bump).to.have.stderr("");
     expect(bump).to.have.exitCode(0);
@@ -57,12 +58,56 @@ describe.skip("bump [files...]", () => {
 
   it("should not not modify non-manifest files that don't contain the old version number", () => {
     files.create("package.json", { version: "4.5.6" });
-    files.copy("LICENSE");
-    files.copy("README.md");
-    files.copy("script1.js");
-    files.copy("script2.js");
+    files.create("LICENSE", fixtures.license);
+    files.create("README.md", fixtures.readme);
+    files.create("script1.js", fixtures.script1);
+    files.create("script2.js", fixtures.script2);
+
+    let bump = chaiExec("major LICENSE README.* *.js");
+
+    expect(bump).to.have.stderr("");
+    expect(bump).to.have.exitCode(0);
+
+    bump.should.have.stdout(
+      `${check} Updated package.json to 5.0.0\n`
+    );
+
+    expect(files.json("package.json").version).to.equal("5.0.0");
+    expect(files.text("LICENSE")).to.match(/MyApp v1.2.3 Copyright/);
+    expect(files.text("README.md")).to.match(/version 5.6.7 and v8.9.10 should not be changed/);
+    expect(files.text("README.md")).to.match(/version 1.2.3 and v1.2.3 should both get updated/);
+    expect(files.text("script1.js")).to.match(/make sure v1.2.3 gets replaced correctly/);
+    expect(files.text("script1.js")).to.match(/let version = "1.2.3";/);
+    expect(files.text("script1.js")).to.match(/let version = "1.2.3";/);
+    expect(files.text("script2.js")).to.match(/version 3.2.1 and v8.9.10 don't match the old version number/);
+  });
+
+  it("should error if an explicitly-specified file doesn't exist", () => {
+    files.create("package.json", { version: "4.5.6" });
+
+    let bump = chaiExec("major LICENSE README.* *.js");
+
+    expect(bump).to.have.stderr("");
+    expect(bump).to.have.exitCode(0);
+
+    bump.should.have.stdout(
+      `${check} Updated package.json to 5.0.0\n`
+    );
+
+    expect(files.json("package.json").version).to.equal("5.0.0");
+    expect(files.text("LICENSE")).to.match(/MyApp v1.2.3 Copyright/);
+    expect(files.text("README.md")).to.match(/version 5.6.7 and v8.9.10 should not be changed/);
+    expect(files.text("README.md")).to.match(/version 1.2.3 and v1.2.3 should both get updated/);
+    expect(files.text("script1.js")).to.match(/make sure v1.2.3 gets replaced correctly/);
+    expect(files.text("script1.js")).to.match(/let version = "1.2.3";/);
+    expect(files.text("script1.js")).to.match(/let version = "1.2.3";/);
+    expect(files.text("script2.js")).to.match(/version 3.2.1 and v8.9.10 don't match the old version number/);
+  });
+
+  it("should error if a glob pattern doesn't match any files", () => {
+    files.create("package.json", { version: "4.5.6" });
 
-    let bump = chaiExec("--major --grep LICENSE README.* *.js");
+    let bump = chaiExec("major README.* *.js");
 
     expect(bump).to.have.stderr("");
     expect(bump).to.have.exitCode(0);

test/utils/files.js

@@ -4,7 +4,6 @@ const fs = require("fs");
 const path = require("path");
 const mkdirp = require("mkdirp");
 
-const filesDir = path.resolve("test", "fixtures", "files");
 const tempDir = path.resolve("test", ".tmp");
 
 const files = module.exports = {
@@ -26,16 +25,6 @@ const files = module.exports = {
     fs.writeFileSync(filePath, contents);
   },
 
-  /**
-   * Copies a file from the "test/fixtures/files" directory to the "test/.tmp" directory.
-   *
-   * @param {string} name - The name of the file to copy (e.g. "README.md", "script1.js")
-   */
-  copy (name) {
-    let contents = fs.readFileSync(path.join(filesDir, name), "utf8");
-    files.create(name, contents);
-  },
-
   /**
    * Reads a file in the "test/.tmp" directory, and returns its contents as a string.
    *

test/utils/fixtures.js

@@ -0,0 +1,13 @@
+"use strict";
+
+const fs = require("fs");
+const path = require("path");
+
+const filesDir = path.resolve("test", "fixtures", "files");
+
+module.exports = {
+  license: fs.readFileSync(path.join(filesDir, "LICENSE"), "utf8"),
+  readme: fs.readFileSync(path.join(filesDir, "README.md"), "utf8"),
+  script1: fs.readFileSync(path.join(filesDir, "script1.js"), "utf8"),
+  script2: fs.readFileSync(path.join(filesDir, "script2.js"), "utf8"),
+};

test/utils/index.js

@@ -3,5 +3,6 @@
 module.exports = {
   check: require("./check"),
   files: require("./files"),
+  fixtures: require("./fixtures"),
   mocks: require("./mocks"),
 };