test: adds npm commands helper file

Author: geotrev

__tests__/increment.spec.js

@@ -4,6 +4,7 @@ import path from "path"
 import { runIncrement } from "../bin/increment.js"
 import { pkgReporter, exitWithError } from "../bin/helpers/reporter.js"
 import { cmd } from "../bin/helpers/cmd.js"
+import { getVersionCommand } from "../bin/helpers/npm-commands.js"
 
 jest.mock("../bin/helpers/cmd.js", () => ({
   cmd: jest.fn(),
@@ -55,12 +56,12 @@ describe("runIncrement()", () => {
     })
 
     afterEach(() => {
-      fs.writeFileSync.mockReset()
+      fs.writeFileSync.mockRestore()
     })
 
     it("versions an entry", async () => {
       // Given
-      const command = `npm version -w ${entryOne.name} ${config.releaseVersion} --no-git-tag-version`
+      const command = getVersionCommand(entryOne.name, config.releaseVersion)
       // When
       await runIncrement(config, entryOne)
       // Then
@@ -136,7 +137,7 @@ describe("runIncrement()", () => {
     })
 
     afterEach(() => {
-      fs.writeFileSync.mockReset()
+      fs.writeFileSync.mockRestore()
     })
 
     it("exits if write to file fails", async () => {

__tests__/publish.spec.js

@@ -4,6 +4,7 @@ import { getAddCommand } from "../bin/helpers/git-commands.js"
 import { runPublish } from "../bin/publish.js"
 import { cmd } from "../bin/helpers/cmd.js"
 import { pkgReporter } from "../bin/helpers/reporter.js"
+import { getPublishCommand } from "../bin/helpers/npm-commands.js"
 
 jest.mock("../bin/helpers/cmd.js", () => ({
   cmd: jest.fn(),
@@ -57,7 +58,7 @@ describe("runPublish()", () => {
     await runPublish(baseConfig, entry)
     // Then
     expect(cmd).toBeCalledWith(
-      `npm publish -w ${entry.name} --tag latest`,
+      getPublishCommand(entry.name, "latest"),
       baseConfig,
       pkgReporter
     )
@@ -80,7 +81,7 @@ describe("runPublish()", () => {
     await runPublish(config, entry)
     // Then
     expect(cmd).toBeCalledWith(
-      `npm publish -w ${entry.name} --tag next`,
+      getPublishCommand(entry.name, "next"),
       config,
       pkgReporter
     )
@@ -96,7 +97,7 @@ describe("runPublish()", () => {
     await runPublish(config, entry)
     // Then
     expect(cmd).toBeCalledWith(
-      `npm publish -w ${entry.name} --tag alpha`,
+      getPublishCommand(entry.name, "alpha"),
       config,
       pkgReporter
     )
@@ -112,7 +113,7 @@ describe("runPublish()", () => {
     await runPublish(config, entry)
     // Then
     expect(cmd).toBeCalledWith(
-      `npm publish -w ${entry.name} --tag beta`,
+      getPublishCommand(entry.name, "beta"),
       config,
       pkgReporter
     )

bin/helpers/npm-commands.js

@@ -0,0 +1,7 @@
+export function getPublishCommand(name, tag) {
+  return `npm publish -w ${name} --tag ${tag}`
+}
+
+export function getVersionCommand(name, version) {
+  return `npm version -w ${name} ${version} --no-git-tag-version`
+}

bin/increment.js

@@ -5,6 +5,7 @@ import path from "path"
 import { exitWithError, pkgReporter } from "./helpers/reporter.js"
 import { ROOT_PACKAGE_FILE } from "./helpers/constants.js"
 import { cmd } from "./helpers/cmd.js"
+import { getVersionCommand } from "./helpers/npm-commands.js"
 
 function getSemverRangePart(version) {
   let rangePart = ""
@@ -88,9 +89,11 @@ function setDependencies(config, entry) {
 export async function runIncrement(config, entry) {
   pkgReporter.start("Version")
 
-  const incCommand = `npm version -w ${entry.name} ${config.releaseVersion} --no-git-tag-version`
-
-  await cmd(incCommand, config, pkgReporter)
+  await cmd(
+    getVersionCommand(entry.name, config.releaseVersion),
+    config,
+    pkgReporter
+  )
 
   setDependencies(config, entry)
 

bin/publish.js

@@ -4,6 +4,7 @@ import semver from "semver"
 import { getAddCommand } from "./helpers/git-commands.js"
 import { cmd } from "./helpers/cmd.js"
 import { pkgReporter } from "./helpers/reporter.js"
+import { getPublishCommand } from "./helpers/npm-commands.js"
 
 function parsePreId(version) {
   const parts = semver.prerelease(version) || []
@@ -21,10 +22,8 @@ export async function runPublish(config, entry) {
     "latest"
 
   if (!isPrivate) {
-    const pubCommand = `npm publish -w ${entry.name} --tag ${tag}`
-
     await cmd(getAddCommand(), config, pkgReporter)
-    await cmd(pubCommand, config, pkgReporter)
+    await cmd(getPublishCommand(entry.name, tag), config, pkgReporter)
 
     pkgReporter.succeed("Publish successful")
   } else {