@monorepolint/rules 0.5.0-alpha.82 → 0.5.0-alpha.85

package/lib/util/packageDependencyGraphService.js

@@ -10,13 +10,13 @@ const resolve_package_path_1 = tslib_1.__importDefault(require("resolve-package-
 /** Default implementation of the package dependency graph service. */
 class PackageDependencyGraphService {
     /** Construct a graph of package dependencies and return the root node. */
-    buildDependencyGraph(startPackageJsonPath, maxDepth) {
+    buildDependencyGraph(startPackageJsonPath, host, maxDepth) {
         const nodes = new Map();
         const visit = (packageJsonPath, currentDepth) => {
             if (nodes.has(packageJsonPath)) {
                 return nodes.get(packageJsonPath);
             }
-            const packageJson = require(packageJsonPath);
+            const packageJson = host.readJson(packageJsonPath);
             const node = {
                 packageJson,
                 dependencies: new Map(),
@@ -31,7 +31,7 @@ class PackageDependencyGraphService {
             if (maxDepth == null || nextDepth <= maxDepth) {
                 const dependencies = packageJson.dependencies != null ? Object.keys(packageJson.dependencies) : [];
                 for (const dependency of dependencies) {
-                    const dependencyPackageJsonPath = resolve_package_path_1.default(dependency, node.paths.rootDirectory);
+                    const dependencyPackageJsonPath = (0, resolve_package_path_1.default)(dependency, node.paths.rootDirectory);
                     if (dependencyPackageJsonPath == null) {
                         throw new Error(`Could not resolve ${dependency} from ${node.paths.rootDirectory}`);
                     }

package/lib/util/packageDependencyGraphService.js.map

@@ -1 +1 @@
-{"version":3,"file":"packageDependencyGraphService.js","sourceRoot":"","sources":["../../src/util/packageDependencyGraphService.ts"],"names":[],"mappings":";AAAA;;GAEG;;;;AAGH,wDAAwB;AACxB,wFAAsD;AA2BtD,sEAAsE;AACtE,MAAa,6BAA6B;IACxC,0EAA0E;IACnE,oBAAoB,CAAC,oBAA4B,EAAE,QAAiB;QACzE,MAAM,KAAK,GAAG,IAAI,GAAG,EAAuC,CAAC;QAE7D,MAAM,KAAK,GAAG,CAAC,eAAuB,EAAE,YAAoB,EAA+B,EAAE;YAC3F,IAAI,KAAK,CAAC,GAAG,CAAC,eAAe,CAAC,EAAE;gBAC9B,OAAO,KAAK,CAAC,GAAG,CAAC,eAAe,CAAE,CAAC;aACpC;YAED,MAAM,WAAW,GAAgB,OAAO,CAAC,eAAe,CAAC,CAAC;YAC1D,MAAM,IAAI,GAAgC;gBACxC,WAAW;gBACX,YAAY,EAAE,IAAI,GAAG,EAAuC;gBAC5D,KAAK,EAAE;oBACL,eAAe;oBACf,aAAa,EAAE,cAAI,CAAC,OAAO,CAAC,eAAe,CAAC;iBAC7C;aACF,CAAC;YAEF,4FAA4F;YAC5F,KAAK,CAAC,GAAG,CAAC,eAAe,EAAE,IAAI,CAAC,CAAC;YAEjC,MAAM,SAAS,GAAG,YAAY,GAAG,CAAC,CAAC;YACnC,IAAI,QAAQ,IAAI,IAAI,IAAI,SAAS,IAAI,QAAQ,EAAE;gBAC7C,MAAM,YAAY,GAAG,WAAW,CAAC,YAAY,IAAI,IAAI,CAAC,CAAC,CAAC,MAAM,CAAC,IAAI,CAAC,WAAW,CAAC,YAAY,CAAC,CAAC,CAAC,CAAC,EAAE,CAAC;gBACnG,KAAK,MAAM,UAAU,IAAI,YAAY,EAAE;oBACrC,MAAM,yBAAyB,GAAG,8BAAkB,CAAC,UAAU,EAAE,IAAI,CAAC,KAAK,CAAC,aAAa,CAAC,CAAC;oBAC3F,IAAI,yBAAyB,IAAI,IAAI,EAAE;wBACrC,MAAM,IAAI,KAAK,CAAC,qBAAqB,UAAU,SAAS,IAAI,CAAC,KAAK,CAAC,aAAa,EAAE,CAAC,CAAC;qBACrF;oBAED,IAAI,CAAC,YAAY,CAAC,GAAG,CAAC,UAAU,EAAE,KAAK,CAAC,yBAAyB,EAAE,SAAS,CAAC,CAAC,CAAC;iBAChF;aACF;YAED,OAAO,IAAI,CAAC;QACd,CAAC,CAAC;QAEF,OAAO,KAAK,CAAC,oBAAoB,EAAE,CAAC,CAAC,CAAC;IACxC,CAAC;IAED,4DAA4D;IACrD,CAAC,QAAQ,CACd,IAAiC,EACjC,IAAI,GAAG,EAAE,gBAAgB,EAAE,KAAK,EAAE;QAElC,MAAM,OAAO,GAAG,IAAI,GAAG,EAA+B,CAAC;QAEvD,QAAQ,CAAC,CAAC,KAAK,CACb,IAAiC,EACjC,aAA4C,EAAE;YAE9C,qFAAqF;YACrF,IAAI,CAAC,IAAI,CAAC,gBAAgB,IAAI,OAAO,CAAC,GAAG,CAAC,IAAI,CAAC,EAAE;gBAC/C,OAAO;aACR;YAED,yCAAyC;YACzC,IAAI,UAAU,CAAC,OAAO,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC,EAAE;gBACnC,OAAO;aACR;YAED,iBAAiB;YACjB,OAAO,CAAC,GAAG,CAAC,IAAI,CAAC,CAAC;YAClB,UAAU,GAAG,CAAC,GAAG,UAAU,EAAE,IAAI,CAAC,CAAC;YACnC,MAAM,EAAE,GAAG,IAAI,EAAE,UAAU,EAAE,CAAC;YAE9B,4CAA4C;YAC5C,KAAK,MAAM,UAAU,IAAI,IAAI,CAAC,YAAY,CAAC,MAAM,EAAE,EAAE;gBACnD,KAAK,CAAC,CAAC,KAAK,CAAC,UAAU,EAAE,UAAU,CAAC,CAAC;aACtC;QACH,CAAC;QAED,KAAK,CAAC,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC;IACrB,CAAC;CACF;AA5ED,sEA4EC"}
+{"version":3,"file":"packageDependencyGraphService.js","sourceRoot":"","sources":["../../src/util/packageDependencyGraphService.ts"],"names":[],"mappings":"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"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@monorepolint/rules",
-  "version": "0.5.0-alpha.82+e62a97b",
+  "version": "0.5.0-alpha.85+a81e29c",
   "author": "Eric L Anderson (https://github.com/ericanderson)",
   "contributors": [
     "Mac Lockard (https://github.com/maclockard)"
@@ -13,24 +13,23 @@
     "clean": "rm -rf build lib node_modules *.tgz tsconfig.tsbuildinfo",
     "compile:typescript": "../../node_modules/.bin/tsc",
     "jest": "../../node_modules/.bin/jest --config ../../jest.config.js",
-    "jest:watch": "../../node_modules/.bin/jest --config ../../jest.config.js --watch",
+    "jest:watch": "../../node_modules/.bin/jest --watch",
     "lint:typescript": "../../node_modules/.bin/tslint --config ../../tslint.json --project .",
     "test": "../../node_modules/.bin/jest --colors --passWithNoTests",
     "test:watch": "../../node_modules/.bin/jest --colors --passWithNoTests --watch"
   },
   "dependencies": {
-    "@monorepolint/core": "^0.5.0-alpha.82+e62a97b",
-    "@monorepolint/utils": "^0.5.0-alpha.82+e62a97b",
+    "@monorepolint/core": "^0.5.0-alpha.85+a81e29c",
+    "@monorepolint/utils": "^0.5.0-alpha.85+a81e29c",
     "globby": "^11.0.1",
     "jest-diff": "^26.0.1",
-    "minimatch": "^3.0.4",
     "resolve-package-path": "^3.1.0",
-    "runtypes": "^4.0.0",
-    "semver": "^7.3.2"
+    "runtypes": "^6.5.1",
+    "semver": "^7.3.2",
+    "tslib": "^2.3.1"
   },
   "devDependencies": {
     "@types/jest-diff": "^24.3.0",
-    "@types/minimatch": "^3.0.3",
     "@types/semver": "^7.2.0",
     "@types/tmp": "^0.2.0",
     "tmp": "^0.2.1"
@@ -38,5 +37,5 @@
   "publishConfig": {
     "access": "public"
   },
-  "gitHead": "e62a97b9af4cfedb4e538aa3a9cf652a3e6f2688"
+  "gitHead": "a81e29c6c64476756dcc3f9ae9248abe754ff1e9"
 }

package/src/__tests__/alphabeticalScripts.spec.ts

@@ -6,13 +6,10 @@
  */
 
 // tslint:disable:no-console
-import { createMockFiles, jsonToString } from "./utils";
-
-// done first since this also mocks 'fs'
-const mockFiles: Map<string, string> = createMockFiles();
-
-import { Failure, PackageContext } from "@monorepolint/core";
+import { AddErrorSpy, createTestingWorkspace, HOST_FACTORIES, jsonToString, TestingWorkspace } from "./utils";
+import { Context, Failure } from "@monorepolint/core";
 import { alphabeticalScripts } from "../alphabeticalScripts";
+import { createIncorrectOrderErrorMessage } from "../util/checkAlpha";
 
 const PACKAGE_SCRIPTS_SORTED = jsonToString({
   name: "foo-lib",
@@ -32,41 +29,43 @@ const PACKAGE_SCRIPTS_UNSORTED = jsonToString({
   },
 });
 
-describe("alphabeticalScripts", () => {
-  afterEach(() => {
-    mockFiles.clear();
-  });
-
+describe.each(HOST_FACTORIES)("alphabeticalScripts ($name)", (hostFactory) => {
   describe("fix: true", () => {
-    const context = new PackageContext(".", {
-      rules: [],
-      fix: true,
-      verbose: false,
-      silent: true,
-    });
-    const spy = jest.spyOn(context, "addError");
-
-    afterEach(() => {
-      spy.mockClear();
+    let workspace: TestingWorkspace;
+    let spy: AddErrorSpy;
+    let context: Context;
+
+    beforeEach(async () => {
+      workspace = await createTestingWorkspace({
+        fixFlag: true,
+        host: hostFactory.make(),
+      });
+      context = workspace.context; // minimizing delta
+
+      spy = jest.spyOn(workspace.context, "addError");
     });
 
     it("fixes unsorted scripts", () => {
-      mockFiles.set("package.json", PACKAGE_SCRIPTS_UNSORTED);
+      workspace.writeFile("package.json", PACKAGE_SCRIPTS_UNSORTED);
 
       alphabeticalScripts.check(context, undefined);
 
       expect(spy).toHaveBeenCalledTimes(1);
 
       const failure: Failure = spy.mock.calls[0][0];
-      expect(failure.file).toBe("package.json");
-      expect(failure.fixer).not.toBeUndefined();
-      expect(failure.message).toBe("Incorrect order of scripts in foo-lib's package.json");
-
-      expect(mockFiles.get("package.json")).toEqual(PACKAGE_SCRIPTS_SORTED);
+      expect(failure).toMatchObject(
+        workspace.failureMatcher({
+          file: "package.json",
+          hasFixer: true,
+          message: createIncorrectOrderErrorMessage("scripts", "foo-lib"),
+        })
+      );
+
+      expect(workspace.readFile("package.json")).toEqual(PACKAGE_SCRIPTS_SORTED);
     });
 
     it("does nothing if already sorted", () => {
-      mockFiles.set("package.json", PACKAGE_SCRIPTS_SORTED);
+      workspace.writeFile("package.json", PACKAGE_SCRIPTS_SORTED);
 
       alphabeticalScripts.check(context, undefined);
 

package/src/__tests__/bannedDependencies.spec.ts

@@ -5,6 +5,7 @@
  *
  */
 import { WorkspaceContext } from "@monorepolint/core";
+import { SimpleHost } from "@monorepolint/utils";
 import { writeFileSync } from "fs";
 import * as path from "path";
 import * as tmp from "tmp";
@@ -37,12 +38,16 @@ describe("bannedDependencies", () => {
   });
 
   function makeWorkspace() {
-    const workspaceContext = new WorkspaceContext(cwd!, {
-      rules: [],
-      fix: false,
-      verbose: false,
-      silent: true,
-    });
+    const workspaceContext = new WorkspaceContext(
+      cwd!,
+      {
+        rules: [],
+        fix: false,
+        verbose: false,
+        silent: true,
+      },
+      new SimpleHost()
+    );
 
     function checkAndSpy(options: Options) {
       const addErrorSpy = jest.spyOn(workspaceContext, "addError");
@@ -87,6 +92,75 @@ describe("bannedDependencies", () => {
     addErrorSpy3.mockReset();
   });
 
+  it("Flags banned dependencies correctly w legacy globs", async () => {
+    const { addFile, checkAndSpy } = makeWorkspace();
+    const rootPackageJson = jsonToString({
+      dependencies: {
+        aaa: "0.0.1",
+        ccc: "0.0.1",
+      },
+    });
+    addFile("./package.json", rootPackageJson);
+
+    const { addErrorSpy: addErrorSpy1 } = checkAndSpy({ bannedDependencies: ["c*c"] });
+    expect(addErrorSpy1).toHaveBeenCalledTimes(1);
+    addErrorSpy1.mockReset();
+
+    const { addErrorSpy: addErrorSpy2 } = checkAndSpy({ bannedDependencies: ["d*d"] });
+    expect(addErrorSpy2).toHaveBeenCalledTimes(0);
+    addErrorSpy2.mockReset();
+
+    const { addErrorSpy: addErrorSpy3 } = checkAndSpy({ bannedDependencies: ["c*c", "d*d"] });
+    expect(addErrorSpy3).toHaveBeenCalledTimes(1);
+    addErrorSpy3.mockReset();
+  });
+
+  it("Flags banned dependencies correctly w new globs", async () => {
+    const { addFile, checkAndSpy } = makeWorkspace();
+    const rootPackageJson = jsonToString({
+      dependencies: {
+        aaa: "0.0.1",
+        ccc: "0.0.1",
+      },
+    });
+    addFile("./package.json", rootPackageJson);
+
+    const { addErrorSpy: addErrorSpy1 } = checkAndSpy({ bannedDependencies: { glob: ["c*c"] } });
+    expect(addErrorSpy1).toHaveBeenCalledTimes(1);
+    addErrorSpy1.mockReset();
+
+    const { addErrorSpy: addErrorSpy2 } = checkAndSpy({ bannedDependencies: { glob: ["d*d"] } });
+    expect(addErrorSpy2).toHaveBeenCalledTimes(0);
+    addErrorSpy2.mockReset();
+
+    const { addErrorSpy: addErrorSpy3 } = checkAndSpy({ bannedDependencies: { glob: ["c*c", "d*d"] } });
+    expect(addErrorSpy3).toHaveBeenCalledTimes(1);
+    addErrorSpy3.mockReset();
+  });
+
+  it("Flags banned dependencies correctly w exact", async () => {
+    const { addFile, checkAndSpy } = makeWorkspace();
+    const rootPackageJson = jsonToString({
+      dependencies: {
+        aaa: "0.0.1",
+        ccc: "0.0.1",
+      },
+    });
+    addFile("./package.json", rootPackageJson);
+
+    const { addErrorSpy: addErrorSpy1 } = checkAndSpy({ bannedDependencies: { exact: ["ccc"] } });
+    expect(addErrorSpy1).toHaveBeenCalledTimes(1);
+    addErrorSpy1.mockReset();
+
+    const { addErrorSpy: addErrorSpy2 } = checkAndSpy({ bannedDependencies: { exact: ["ddd"] } });
+    expect(addErrorSpy2).toHaveBeenCalledTimes(0);
+    addErrorSpy2.mockReset();
+
+    const { addErrorSpy: addErrorSpy3 } = checkAndSpy({ bannedDependencies: { exact: ["ccc", "ddd"] } });
+    expect(addErrorSpy3).toHaveBeenCalledTimes(1);
+    addErrorSpy3.mockReset();
+  });
+
   it("Flags banned transitives correctly", async () => {
     const { addFile, checkAndSpy } = makeWorkspace();
     const rootPackageJson = jsonToString({

package/src/__tests__/consistentDependencies.spec.ts

@@ -5,6 +5,7 @@
  *
  */
 import { WorkspaceContext } from "@monorepolint/core";
+import { SimpleHost } from "@monorepolint/utils";
 import { readFileSync, writeFileSync } from "fs";
 import * as path from "path";
 import * as tmp from "tmp";
@@ -61,12 +62,16 @@ describe("consistentDependencies", () => {
     const dir: tmp.DirResult = tmp.dirSync({ unsafeCleanup: true });
     cleanupJobs.push(() => dir.removeCallback());
 
-    const workspaceContext = new WorkspaceContext(dir.name, {
-      rules: [],
-      fix,
-      verbose: false,
-      silent: true,
-    });
+    const workspaceContext = new WorkspaceContext(
+      dir.name,
+      {
+        rules: [],
+        fix,
+        verbose: false,
+        silent: true,
+      },
+      new SimpleHost()
+    );
 
     function checkAndSpy(q: string, opts?: Options) {
       const context = workspaceContext.createChildContext(path.resolve(dir.name, q));

package/src/__tests__/consistentVersions.spec.ts

@@ -6,7 +6,7 @@
  */
 
 import { WorkspaceContext } from "@monorepolint/core";
-import { PackageJson, readJson, writeJson } from "@monorepolint/utils";
+import { Host, PackageJson, SimpleHost } from "@monorepolint/utils";
 import * as path from "path";
 import * as tmp from "tmp";
 import { consistentVersions, Options } from "../consistentVersions";
@@ -35,29 +35,34 @@ describe("consistentVersions", () => {
   });
 
   function makeWorkspace(fix = false) {
-    const workspaceContext = new WorkspaceContext(cwd!, {
-      rules: [],
-      fix,
-      verbose: false,
-      silent: true,
-    });
+    const host: Host = new SimpleHost();
+    const workspaceContext = new WorkspaceContext(
+      cwd!,
+      {
+        rules: [],
+        fix,
+        verbose: false,
+        silent: true,
+      },
+      host
+    );
     const addErrorSpy = jest.spyOn(workspaceContext, "addError");
 
     function check(options: Options = { matchDependencyVersions: {} }) {
       consistentVersions.check(workspaceContext, options);
     }
 
-    return { addErrorSpy, check };
+    return { addErrorSpy, check, host };
   }
 
-  function addPackageJson(filePath: string, packageJson: PackageJson) {
+  function addPackageJson(host: Host, filePath: string, packageJson: PackageJson) {
     const dirPath = path.resolve(cwd!, path.dirname(filePath));
     const resolvedFilePath = path.resolve(cwd!, filePath);
 
     makeDirectoryRecursively(dirPath);
-    writeJson(resolvedFilePath, packageJson);
+    host.writeJson(resolvedFilePath, packageJson);
     return (): PackageJson => {
-      return readJson(resolvedFilePath);
+      return host.readJson(resolvedFilePath);
     };
   }
 
@@ -82,8 +87,8 @@ describe("consistentVersions", () => {
     });
 
     it("Does nothing when arguments are empty", async () => {
-      const { addErrorSpy, check } = makeWorkspace();
-      addPackageJson("./package.json", testPackageJson);
+      const { addErrorSpy, check, host } = makeWorkspace();
+      addPackageJson(host, "./package.json", testPackageJson);
 
       check();
       expect(addErrorSpy).toHaveBeenCalledTimes(0);
@@ -92,8 +97,8 @@ describe("consistentVersions", () => {
     });
 
     it("Fixes packages that have an incorrect dependency version", async () => {
-      const { addErrorSpy, check } = makeWorkspace(true);
-      const readTestPackageJson = addPackageJson("./package.json", testPackageJson);
+      const { addErrorSpy, check, host } = makeWorkspace(true);
+      const readTestPackageJson = addPackageJson(host, "./package.json", testPackageJson);
 
       const requiredGreatLibVersion = "1.2.3";
       expect(addErrorSpy).toHaveBeenCalledTimes(0);
@@ -105,8 +110,8 @@ describe("consistentVersions", () => {
     });
 
     it("Ignores packages that have a correct dependency version", async () => {
-      const { addErrorSpy, check } = makeWorkspace();
-      addPackageJson("./package.json", testPackageJson);
+      const { addErrorSpy, check, host } = makeWorkspace();
+      addPackageJson(host, "./package.json", testPackageJson);
 
       expect(addErrorSpy).toHaveBeenCalledTimes(0);
       check({
@@ -119,8 +124,8 @@ describe("consistentVersions", () => {
     });
 
     it("Fixes packages that have an incorrect devDependency version", async () => {
-      const { addErrorSpy, check } = makeWorkspace(true);
-      const readTestPackageJson = addPackageJson("./package.json", testPackageJson);
+      const { addErrorSpy, check, host } = makeWorkspace(true);
+      const readTestPackageJson = addPackageJson(host, "./package.json", testPackageJson);
 
       const requiredElseLibVersion = "1.2.3";
       expect(addErrorSpy).toHaveBeenCalledTimes(0);
@@ -130,8 +135,8 @@ describe("consistentVersions", () => {
     });
 
     it("Ignores packages that have a correct devDependency version", async () => {
-      const { addErrorSpy, check } = makeWorkspace();
-      addPackageJson("./package.json", testPackageJson);
+      const { addErrorSpy, check, host } = makeWorkspace();
+      addPackageJson(host, "./package.json", testPackageJson);
 
       expect(addErrorSpy).toHaveBeenCalledTimes(0);
       check({
@@ -144,8 +149,8 @@ describe("consistentVersions", () => {
     });
 
     it("Fixes packages that have an incorrect dependency and devDependency versions", async () => {
-      const { addErrorSpy, check } = makeWorkspace(true);
-      const readTestPackageJson = addPackageJson("./package.json", testPackageJson);
+      const { addErrorSpy, check, host } = makeWorkspace(true);
+      const readTestPackageJson = addPackageJson(host, "./package.json", testPackageJson);
 
       const requiredBothVersion = "1.2.3";
       expect(addErrorSpy).toHaveBeenCalledTimes(0);
@@ -177,8 +182,8 @@ describe("consistentVersions", () => {
     });
 
     it("Accepts a match when multiple versions are configured", async () => {
-      const { addErrorSpy, check } = makeWorkspace();
-      addPackageJson("./package.json", testPackageJson);
+      const { addErrorSpy, check, host } = makeWorkspace();
+      addPackageJson(host, "./package.json", testPackageJson);
 
       expect(addErrorSpy).toHaveBeenCalledTimes(0);
       check({ matchDependencyVersions: { greatLib: [testPackageJson.dependencies!.greatLib] } });
@@ -192,8 +197,8 @@ describe("consistentVersions", () => {
     });
 
     it("Errors when version does not match", async () => {
-      const { addErrorSpy, check } = makeWorkspace();
-      addPackageJson("./package.json", testPackageJson);
+      const { addErrorSpy, check, host } = makeWorkspace();
+      addPackageJson(host, "./package.json", testPackageJson);
 
       expect(addErrorSpy).toHaveBeenCalledTimes(0);
       check({ matchDependencyVersions: { greatLib: ["1", "2"] } });

package/src/__tests__/fileContents.spec.ts

@@ -6,41 +6,31 @@
  */
 
 // tslint:disable:no-console
-import { createMockFiles } from "./utils";
-
-// done first since this also mocks 'fs'
-const mockFiles: Map<string, string> = createMockFiles();
-
-import { Failure, PackageContext } from "@monorepolint/core";
-import * as path from "path";
+import { createTestingWorkspace, HOST_FACTORIES, TestingWorkspace } from "./utils";
+import { AddErrorOptions, Failure } from "@monorepolint/core";
 import { fileContents } from "../fileContents";
 
 const EXPECTED_FOO_FILE = "hello world";
 
-describe("fileContents", () => {
-  afterEach(() => {
-    mockFiles.clear();
-  });
-
+describe.each(HOST_FACTORIES)("fileContents ($name)", (hostFactory) => {
   describe("fix: true", () => {
-    const context = new PackageContext(".", {
-      rules: [],
-      fix: true,
-      verbose: false,
-      silent: true,
-    });
-    const spy = jest.spyOn(context, "addError");
+    let workspace: TestingWorkspace;
+    let spy: jest.SpyInstance<void, [AddErrorOptions]>;
+
+    beforeEach(async () => {
+      workspace = await createTestingWorkspace({
+        fixFlag: true,
+        host: hostFactory.make(),
+      });
+      workspace.writeFile("shared/foo-template.txt", EXPECTED_FOO_FILE);
 
-    afterEach(() => {
-      spy.mockClear();
+      spy = jest.spyOn(workspace.context, "addError");
     });
 
     it("fixes missing file", () => {
-      mockFiles.set(path.resolve(context.getWorkspaceContext().packageDir, "foo-template.txt"), EXPECTED_FOO_FILE);
-
-      fileContents.check(context, {
+      fileContents.check(workspace.context, {
         file: "foo.txt",
-        templateFile: "foo-template.txt",
+        templateFile: "shared/foo-template.txt",
         generator: undefined,
         template: undefined,
       });
@@ -48,20 +38,19 @@ describe("fileContents", () => {
       expect(spy).toHaveBeenCalledTimes(1);
 
       const failure: Failure = spy.mock.calls[0][0];
-      expect(failure.file).toBe("foo.txt");
-      expect(failure.fixer).not.toBeUndefined();
-      expect(failure.message).toBe("Expect file contents to match");
+      expect(failure).toMatchObject(
+        workspace.failureMatcher({
+          file: "foo.txt",
+          hasFixer: true,
+          message: "Expect file contents to match",
+        })
+      );
 
-      expect(mockFiles.get("foo.txt")).toEqual(EXPECTED_FOO_FILE);
+      expect(workspace.readFile("foo.txt")).toEqual(EXPECTED_FOO_FILE);
     });
 
     it("fixes missing nested file", () => {
-      mockFiles.set(
-        path.resolve(context.getWorkspaceContext().packageDir, "shared/foo-template.txt"),
-        EXPECTED_FOO_FILE
-      );
-
-      fileContents.check(context, {
+      fileContents.check(workspace.context, {
         file: "nested/foo.txt",
         templateFile: "shared/foo-template.txt",
         generator: undefined,
@@ -71,12 +60,15 @@ describe("fileContents", () => {
       expect(spy).toHaveBeenCalledTimes(1);
 
       const failure: Failure = spy.mock.calls[0][0];
-      expect(failure.file).toBe("nested/foo.txt");
-      expect(failure.fixer).not.toBeUndefined();
-      expect(failure.message).toBe("Expect file contents to match");
+      expect(failure).toMatchObject(
+        workspace.failureMatcher({
+          file: "nested/foo.txt",
+          hasFixer: true,
+          message: "Expect file contents to match",
+        })
+      );
 
-      expect(mockFiles.get("nested")).not.toBeUndefined();
-      expect(mockFiles.get("nested/foo.txt")).toEqual(EXPECTED_FOO_FILE);
+      expect(workspace.readFile("nested/foo.txt")).toEqual(EXPECTED_FOO_FILE);
     });
   });
 });