test: fix imports

Author: geotrev

__tests__/commit.spec.js

@@ -1,10 +1,6 @@
 import "./mocks.js"
 import { ReportSteps } from "../bin/helpers/constants.js"
-import {
-  getCommitCmd,
-  getTagCmd,
-  getPushCmd,
-} from "../bin/helpers/git-commands.js"
+import { getCommitCmd, getTagCmd, getPushCmd } from "../bin/helpers/commands.js"
 import { setVersionToString } from "../bin/helpers/transformers.js"
 import { reportCmd } from "../bin/helpers/cmd.js"
 import { runCommit } from "../bin/modules/commit.js"

__tests__/increment.spec.js

@@ -1,21 +1,17 @@
 import "./mocks.js"
 import fs from "fs"
 import path from "path"
-import { pkgReporter, exitWithError } from "../bin/helpers/reporter.js"
+import { report, exitWithError } from "../bin/helpers/reporter.js"
 import { cmd } from "../bin/helpers/cmd.js"
-import { getVersionCommand } from "../bin/helpers/npm-commands.js"
+import { getVersionCommand } from "../bin/helpers/commands.js"
 import { runIncrement } from "../bin/modules/increment.js"
 
 jest.mock("../bin/helpers/cmd.js", () => ({
   cmd: jest.fn(),
 }))
 jest.mock("../bin/helpers/reporter.js", () => ({
   exitWithError: jest.fn(),
-  pkgReporter: {
-    info: jest.fn(),
-    start: jest.fn(),
-    succeed: jest.fn(),
-  },
+  report: jest.fn(),
 }))
 
 const packageNames = ["@test/one", "@test/two"]
@@ -65,11 +61,7 @@ describe("runIncrement()", () => {
       // When
       await runIncrement(config, entryOne)
       // Then
-      expect(cmd).toBeCalledWith(
-        command,
-        expect.objectContaining(config),
-        pkgReporter
-      )
+      expect(cmd).toBeCalledWith(command, expect.objectContaining(config), true)
     })
 
     it("sets new package content", async () => {
@@ -96,9 +88,7 @@ describe("runIncrement()", () => {
       // When
       await runIncrement(dryConfig, entryOne)
       // Then
-      expect(pkgReporter.info).toBeCalledWith(
-        `fs.writeFileSync(path.resolve(dir, "package.json"), newPkgJson, "utf8")`
-      )
+      expect(report).toBeCalled()
     })
 
     it("prints write command if verbose", async () => {
@@ -107,9 +97,7 @@ describe("runIncrement()", () => {
       // When
       await runIncrement(verbConfig, entryOne)
       // Then
-      expect(pkgReporter.info).toBeCalledWith(
-        `fs.writeFileSync(path.resolve(dir, "package.json"), newPkgJson, "utf8")`
-      )
+      expect(report).toBeCalled()
     })
 
     it("does not write to package.json if dry run", async () => {

__tests__/publish.spec.js

@@ -1,22 +1,13 @@
 import "./mocks.js"
 import path from "path"
-import { getAddCommand } from "../bin/helpers/git-commands.js"
+import { getAddCommand, getPublishCommand } from "../bin/helpers/commands.js"
 import { cmd } from "../bin/helpers/cmd.js"
-import { pkgReporter } from "../bin/helpers/reporter.js"
-import { getPublishCommand } from "../bin/helpers/npm-commands.js"
 import { runPublish } from "../bin/modules/publish.js"
 
 jest.mock("../bin/helpers/cmd.js", () => ({
   cmd: jest.fn(),
 }))
 
-jest.mock("../bin/helpers/reporter.js", () => ({
-  pkgReporter: {
-    start: jest.fn(),
-    succeed: jest.fn(),
-  },
-}))
-
 const entry = {
   name: "@test/one",
   dir: path.resolve(process.cwd(), "packages/one"),
@@ -50,7 +41,7 @@ describe("runPublish()", () => {
     // When
     await runPublish(baseConfig, entry)
     // Then
-    expect(cmd).toBeCalledWith(getAddCommand(), baseConfig, pkgReporter)
+    expect(cmd).toBeCalledWith(getAddCommand(), baseConfig, true)
   })
 
   it("publishes package", async () => {
@@ -60,7 +51,7 @@ describe("runPublish()", () => {
     expect(cmd).toBeCalledWith(
       getPublishCommand(entry.name, "latest"),
       baseConfig,
-      pkgReporter
+      true
     )
   })
 
@@ -83,7 +74,7 @@ describe("runPublish()", () => {
     expect(cmd).toBeCalledWith(
       getPublishCommand(entry.name, "next"),
       config,
-      pkgReporter
+      true
     )
   })
 
@@ -99,7 +90,7 @@ describe("runPublish()", () => {
     expect(cmd).toBeCalledWith(
       getPublishCommand(entry.name, "alpha"),
       config,
-      pkgReporter
+      true
     )
   })
 
@@ -115,7 +106,7 @@ describe("runPublish()", () => {
     expect(cmd).toBeCalledWith(
       getPublishCommand(entry.name, "beta"),
       config,
-      pkgReporter
+      true
     )
   })
 })