release-it 19.0.0-next.1 → 19.0.0-next.3

package/test/npm.js

@@ -1,418 +1,360 @@
-import path from 'node:path';
-import { patchFs } from 'fs-monkey';
-import test from 'ava';
-import sinon from 'sinon';
-import { vol } from 'memfs';
+import { join } from 'node:path';
+import test, { describe } from 'node:test';
+import assert from 'node:assert/strict';
+import { writeFileSync } from 'node:fs';
 import npm from '../lib/plugin/npm/npm.js';
 import { factory, runTasks } from './util/index.js';
-import { getArgs } from './util/helpers.js';
-
-const mockFs = volume => {
-  vol.fromJSON(volume);
-  const unpatch = patchFs(vol);
-  return () => {
-    vol.reset();
-    unpatch();
-  };
-};
-
-test('should return npm package url', t => {
-  const options = { npm: { name: 'my-cool-package' } };
-  const npmClient = factory(npm, { options });
-  t.is(npmClient.getPackageUrl(), 'https://www.npmjs.com/package/my-cool-package');
-});
-
-test('should return npm package url (custom registry)', t => {
-  const options = { npm: { name: 'my-cool-package', publishConfig: { registry: 'https://registry.example.org/' } } };
-  const npmClient = factory(npm, { options });
-  t.is(npmClient.getPackageUrl(), 'https://registry.example.org/package/my-cool-package');
-});
+import { mkTmpDir, getArgs } from './util/helpers.js';
 
-test('should return npm package url (custom publicPath)', t => {
-  const options = { npm: { name: 'my-cool-package', publishConfig: { publicPath: '/custom/public-path' } } };
-  const npmClient = factory(npm, { options });
-  t.is(npmClient.getPackageUrl(), 'https://www.npmjs.com/custom/public-path/my-cool-package');
-});
+describe('npm', async () => {
+  test('should return npm package url', async () => {
+    const options = { npm: { name: 'my-cool-package' } };
+    const npmClient = factory(npm, { options });
+    assert.equal(npmClient.getPackageUrl(), 'https://www.npmjs.com/package/my-cool-package');
+  });
 
-test('should return npm package url (custom registry and publicPath)', t => {
-  const options = {
-    npm: {
-      name: 'my-cool-package',
-      publishConfig: { registry: 'https://registry.example.org/', publicPath: '/custom/public-path' }
-    }
-  };
-  const npmClient = factory(npm, { options });
-  t.is(npmClient.getPackageUrl(), 'https://registry.example.org/custom/public-path/my-cool-package');
-});
+  test('should return npm package url (custom registry)', async () => {
+    const options = { npm: { name: 'my-cool-package', publishConfig: { registry: 'https://registry.example.org/' } } };
+    const npmClient = factory(npm, { options });
+    assert.equal(npmClient.getPackageUrl(), 'https://registry.example.org/package/my-cool-package');
+  });
 
-test('should return default tag', async t => {
-  const npmClient = factory(npm);
-  const tag = await npmClient.resolveTag();
-  t.is(tag, 'latest');
-});
+  test('should return npm package url (custom publicPath)', async () => {
+    const options = { npm: { name: 'my-cool-package', publishConfig: { publicPath: '/custom/public-path' } } };
+    const npmClient = factory(npm, { options });
+    assert.equal(npmClient.getPackageUrl(), 'https://www.npmjs.com/custom/public-path/my-cool-package');
+  });
 
-test('should resolve default tag for pre-release', async t => {
-  const npmClient = factory(npm);
-  const stub = sinon.stub(npmClient, 'getRegistryPreReleaseTags').resolves([]);
-  const tag = await npmClient.resolveTag('1.0.0-0');
-  t.is(tag, 'next');
-  stub.restore();
-});
+  test('should return npm package url (custom registry and publicPath)', async () => {
+    const options = {
+      npm: {
+        name: 'my-cool-package',
+        publishConfig: { registry: 'https://registry.example.org/', publicPath: '/custom/public-path' }
+      }
+    };
+    const npmClient = factory(npm, { options });
+    assert.equal(npmClient.getPackageUrl(), 'https://registry.example.org/custom/public-path/my-cool-package');
+  });
 
-test('should guess tag from registry for pre-release', async t => {
-  const npmClient = factory(npm);
-  const stub = sinon.stub(npmClient, 'getRegistryPreReleaseTags').resolves(['alpha']);
-  const tag = await npmClient.resolveTag('1.0.0-0');
-  t.is(tag, 'alpha');
-  stub.restore();
-});
+  test('should return default tag', async () => {
+    const npmClient = factory(npm);
+    const tag = await npmClient.resolveTag();
+    assert.equal(tag, 'latest');
+  });
 
-test('should derive tag from pre-release version', async t => {
-  const npmClient = factory(npm);
-  const tag = await npmClient.resolveTag('1.0.2-alpha.3');
-  t.is(tag, 'alpha');
-});
+  test('should resolve default tag for pre-release', async t => {
+    const npmClient = factory(npm);
+    t.mock.method(npmClient, 'getRegistryPreReleaseTags', () => []);
+    const tag = await npmClient.resolveTag('1.0.0-0');
+    assert.equal(tag, 'next');
+  });
 
-test('should use provided (default) tag even for pre-release', async t => {
-  const options = { npm: { tag: 'latest' } };
-  const npmClient = factory(npm, { options });
-  const exec = sinon.stub(npmClient.shell, 'exec').resolves();
-  await npmClient.bump('1.0.0-next.0');
-  t.is(npmClient.getContext('tag'), 'latest');
-  exec.restore();
-});
+  test('should guess tag from registry for pre-release', async t => {
+    const npmClient = factory(npm);
+    t.mock.method(npmClient, 'getRegistryPreReleaseTags', () => ['alpha']);
+    const tag = await npmClient.resolveTag('1.0.0-0');
+    assert.equal(tag, 'alpha');
+  });
 
-test('should throw when `npm version` fails', async t => {
-  const npmClient = factory(npm);
-  const exec = sinon
-    .stub(npmClient.shell, 'exec')
-    .rejects(new Error('npm ERR! Version not changed, might want --allow-same-version'));
+  test('should derive tag from pre-release version', async () => {
+    const npmClient = factory(npm);
+    const tag = await npmClient.resolveTag('1.0.2-alpha.3');
+    assert.equal(tag, 'alpha');
+  });
 
-  await t.throwsAsync(npmClient.bump('1.0.0-next.0'), { message: /Version not changed/ });
+  test('should use provided (default) tag even for pre-release', async t => {
+    const options = { npm: { tag: 'latest' } };
+    const npmClient = factory(npm, { options });
+    t.mock.method(npmClient.shell, 'exec', () => Promise.resolve());
+    await npmClient.bump('1.0.0-next.0');
+    assert.equal(npmClient.getContext('tag'), 'latest');
+  });
 
-  exec.restore();
-});
+  test('should throw when `npm version` fails', async t => {
+    const npmClient = factory(npm);
+    t.mock.method(npmClient.shell, 'exec', () =>
+      Promise.reject(new Error('npm ERR! Version not changed, might want --allow-same-version'))
+    );
+    await assert.rejects(npmClient.bump('1.0.0-next.0'), { message: /Version not changed/ });
+  });
 
-test('should return first pre-release tag from package in registry when resolving tag without pre-id', async t => {
-  const npmClient = factory(npm);
-  const response = {
-    latest: '1.4.1',
-    alpha: '2.0.0-alpha.1',
-    beta: '2.0.0-beta.3'
-  };
-  const exec = sinon.stub(npmClient.shell, 'exec').resolves(JSON.stringify(response));
-  t.is(await npmClient.resolveTag('2.0.0-5'), 'alpha');
-  exec.restore();
-});
+  test('should return first pre-release tag from package in registry when resolving tag without pre-id', async t => {
+    const npmClient = factory(npm);
+    const response = { latest: '1.4.1', alpha: '2.0.0-alpha.1', beta: '2.0.0-beta.3' };
+    t.mock.method(npmClient.shell, 'exec', () => Promise.resolve(JSON.stringify(response)));
+    assert.equal(await npmClient.resolveTag('2.0.0-5'), 'alpha');
+  });
 
-test('should return default pre-release tag when resolving tag without pre-id', async t => {
-  const npmClient = factory(npm);
-  const response = {
-    latest: '1.4.1'
-  };
-  const exec = sinon.stub(npmClient.shell, 'exec').resolves(JSON.stringify(response));
-  t.is(await npmClient.resolveTag('2.0.0-0'), 'next');
-  exec.restore();
-});
+  test('should return default pre-release tag when resolving tag without pre-id', async t => {
+    const npmClient = factory(npm);
+    const response = {
+      latest: '1.4.1'
+    };
+    t.mock.method(npmClient.shell, 'exec', () => Promise.resolve(JSON.stringify(response)));
+    assert.equal(await npmClient.resolveTag('2.0.0-0'), 'next');
+  });
 
-test('should handle erroneous output when resolving tag without pre-id', async t => {
-  const npmClient = factory(npm);
-  const exec = sinon.stub(npmClient.shell, 'exec').resolves('');
-  t.is(await npmClient.resolveTag('2.0.0-0'), 'next');
-  exec.restore();
-});
+  test('should handle erroneous output when resolving tag without pre-id', async t => {
+    const npmClient = factory(npm);
+    t.mock.method(npmClient.shell, 'exec', () => Promise.resolve(''));
+    assert.equal(await npmClient.resolveTag('2.0.0-0'), 'next');
+  });
 
-test('should handle errored request when resolving tag without pre-id', async t => {
-  const npmClient = factory(npm);
-  const exec = sinon.stub(npmClient.shell, 'exec').rejects();
-  t.is(await npmClient.resolveTag('2.0.0-0'), 'next');
-  exec.restore();
-});
+  test('should handle errored request when resolving tag without pre-id', async t => {
+    const npmClient = factory(npm);
+    t.mock.method(npmClient.shell, 'exec', () => Promise.resolve());
+    assert.equal(await npmClient.resolveTag('2.0.0-0'), 'next');
+  });
 
-test('should add registry to commands when specified', async t => {
-  const npmClient = factory(npm);
-  npmClient.setContext({ publishConfig: { registry: 'registry.example.org' } });
-  const exec = sinon.stub(npmClient.shell, 'exec').resolves();
-  exec.withArgs('npm whoami --registry registry.example.org').resolves('john');
-  exec
-    .withArgs(/npm access (list collaborators --json|ls-collaborators) release-it --registry registry.example.org/)
-    .resolves(JSON.stringify({ john: ['write'] }));
-  await runTasks(npmClient);
-  t.is(exec.args[0][0], 'npm ping --registry registry.example.org');
-  t.is(exec.args[1][0], 'npm whoami --registry registry.example.org');
-  t.regex(exec.args[2][0], /npm show release-it@[a-z]+ version --registry registry\.example\.org/);
-  exec.restore();
-});
+  test('should add registry to commands when specified', async t => {
+    const npmClient = factory(npm);
+    npmClient.setContext({ publishConfig: { registry: 'registry.example.org' } });
+    const exec = t.mock.method(npmClient.shell, 'exec', command => {
+      if (command === 'npm whoami --registry registry.example.org') return Promise.resolve('john');
+      const re = /npm access (list collaborators --json|ls-collaborators) release-it --registry registry.example.org/;
+      if (re.test.command) return Promise.resolve(JSON.stringify({ john: ['write'] }));
+      return Promise.resolve();
+    });
 
-test('should not throw when executing tasks', async t => {
-  const npmClient = factory(npm);
-  const exec = sinon.stub(npmClient.shell, 'exec').resolves();
-  exec.withArgs('npm whoami').resolves('john');
-  exec
-    .withArgs(/npm access (list collaborators --json|ls-collaborators) release-it/)
-    .resolves(JSON.stringify({ john: ['write'] }));
-  await t.notThrowsAsync(runTasks(npmClient));
-  exec.restore();
-});
+    await runTasks(npmClient);
+    assert.equal(exec.mock.calls[0].arguments[0], 'npm ping --registry registry.example.org');
+    assert.equal(exec.mock.calls[1].arguments[0], 'npm whoami --registry registry.example.org');
+    assert.match(
+      exec.mock.calls[2].arguments[0],
+      /npm show release-it@[a-z]+ version --registry registry\.example\.org/
+    );
+  });
 
-test('should throw if npm is down', async t => {
-  const npmClient = factory(npm);
-  const exec = sinon.stub(npmClient.shell, 'exec').resolves();
-  exec.withArgs('npm ping').rejects();
-  await t.throwsAsync(runTasks(npmClient), { message: /^Unable to reach npm registry/ });
-  exec.restore();
-});
+  test('should not throw when executing tasks', async t => {
+    const npmClient = factory(npm);
+    t.mock.method(npmClient.shell, 'exec', command => {
+      if (command === 'npm whoami') return Promise.resolve('john');
+      const re = /npm access (list collaborators --json|ls-collaborators) release-it/;
+      if (re.test.command) return Promise.resolve(JSON.stringify({ john: ['write'] }));
+      return Promise.resolve();
+    });
+    await assert.doesNotReject(runTasks(npmClient));
+  });
 
-test('should not throw if npm returns 400/404 for unsupported ping/whoami/access', async t => {
-  const npmClient = factory(npm);
-  const exec = sinon.stub(npmClient.shell, 'exec').resolves();
-  const pingError = "npm ERR! code E404\nnpm ERR! 404 Package '--ping' not found : ping";
-  const whoamiError = "npm ERR! code E404\nnpm ERR! 404 Package '--whoami' not found : whoami";
-  const accessError = 'npm ERR! code E400\nnpm ERR! 400 Bad Request - GET https://npm.example.org/-/collaborators';
-  exec.withArgs('npm ping').rejects(new Error(pingError));
-  exec.withArgs('npm whoami').rejects(new Error(whoamiError));
-  exec.withArgs('npm access').rejects(new Error(accessError));
-  await runTasks(npmClient);
-  t.is(exec.lastCall.args[0].trim(), 'npm publish . --tag latest');
-  exec.restore();
-});
+  test('should throw if npm is down', async t => {
+    const npmClient = factory(npm);
+    t.mock.method(npmClient.shell, 'exec', command => {
+      if (command === 'npm ping') return Promise.reject();
+      return Promise.resolve();
+    });
+    await assert.rejects(runTasks(npmClient), { message: /^Unable to reach npm registry/ });
+  });
 
-test('should not throw if npm returns 400 for unsupported ping/whoami/access', async t => {
-  const npmClient = factory(npm);
-  const exec = sinon.stub(npmClient.shell, 'exec').resolves();
-  const pingError = 'npm ERR! code E400\nnpm ERR! 400 Bad Request - GET https://npm.example.org/-/ping?write=true';
-  const whoamiError = 'npm ERR! code E400\nnpm ERR! 400 Bad Request - GET https://npm.example.org/-/whoami';
-  const accessError = 'npm ERR! code E400\nnpm ERR! 400 Bad Request - GET https://npm.example.org/-/collaborators';
-  exec.withArgs('npm ping').rejects(new Error(pingError));
-  exec.withArgs('npm whoami').rejects(new Error(whoamiError));
-  exec.withArgs('npm access').rejects(new Error(accessError));
-  await runTasks(npmClient);
-  t.is(exec.lastCall.args[0].trim(), 'npm publish . --tag latest');
-  exec.restore();
-});
+  test('should not throw if npm returns 400/404 for unsupported ping/whoami/access', async t => {
+    const npmClient = factory(npm);
+    const exec = t.mock.method(npmClient.shell, 'exec', () => Promise.resolve());
+    const pingError = "npm ERR! code E404\nnpm ERR! 404 Package '--ping' not found : ping";
+    const whoamiError = "npm ERR! code E404\nnpm ERR! 404 Package '--whoami' not found : whoami";
+    const accessError = 'npm ERR! code E400\nnpm ERR! 400 Bad Request - GET https://npm.example.org/-/collaborators';
+    exec.mock.mockImplementationOnce(() => Promise.reject(new Error(pingError)), 0);
+    exec.mock.mockImplementationOnce(() => Promise.reject(new Error(whoamiError)), 1);
+    exec.mock.mockImplementationOnce(() => Promise.reject(new Error(accessError)), 2);
+    await runTasks(npmClient);
+    assert.equal(exec.mock.calls.at(-1).arguments[0].trim(), 'npm publish . --tag latest');
+  });
 
-test('should not throw if npm returns 404 for unsupported ping', async t => {
-  const npmClient = factory(npm);
-  const exec = sinon.stub(npmClient.shell, 'exec').resolves();
-  const pingError = 'npm ERR!     <title>404 - No content for path /-/ping</title>';
-  exec.withArgs('npm ping').rejects(new Error(pingError));
-  exec.withArgs('npm whoami').resolves('john');
-  exec
-    .withArgs(/npm access (list collaborators --json|ls-collaborators) release-it/)
-    .resolves(JSON.stringify({ john: ['write'] }));
-  await runTasks(npmClient);
-  t.is(exec.lastCall.args[0].trim(), 'npm publish . --tag latest');
-  exec.restore();
-});
+  test('should not throw if npm returns 400 for unsupported ping/whoami/access', async t => {
+    const npmClient = factory(npm);
+    const exec = t.mock.method(npmClient.shell, 'exec', () => Promise.resolve());
+    const pingError = 'npm ERR! code E400\nnpm ERR! 400 Bad Request - GET https://npm.example.org/-/ping?write=true';
+    const whoamiError = 'npm ERR! code E400\nnpm ERR! 400 Bad Request - GET https://npm.example.org/-/whoami';
+    const accessError = 'npm ERR! code E400\nnpm ERR! 400 Bad Request - GET https://npm.example.org/-/collaborators';
+    exec.mock.mockImplementationOnce(() => Promise.reject(new Error(pingError)), 0);
+    exec.mock.mockImplementationOnce(() => Promise.reject(new Error(whoamiError)), 1);
+    exec.mock.mockImplementationOnce(() => Promise.reject(new Error(accessError)), 2);
+    await runTasks(npmClient);
+    assert.equal(exec.mock.calls.at(-1).arguments[0].trim(), 'npm publish . --tag latest');
+  });
 
-test('should throw if user is not authenticated', async t => {
-  const npmClient = factory(npm);
-  const exec = sinon.stub(npmClient.shell, 'exec').resolves();
-  exec.withArgs('npm whoami').rejects();
-  await t.throwsAsync(runTasks(npmClient), { message: /^Not authenticated with npm/ });
-  exec.restore();
-});
+  test('should throw if user is not authenticated', async t => {
+    const npmClient = factory(npm);
+    const exec = t.mock.method(npmClient.shell, 'exec', () => Promise.resolve());
+    exec.mock.mockImplementationOnce(() => Promise.reject(), 1);
+    await assert.rejects(runTasks(npmClient), { message: /^Not authenticated with npm/ });
+  });
 
-test('should throw if user is not a collaborator (v9)', async t => {
-  const npmClient = factory(npm);
-  const exec = sinon.stub(npmClient.shell, 'exec').resolves();
-  exec.withArgs('npm whoami').resolves('ada');
-  exec.withArgs('npm --version').resolves('9.2.0');
-  exec.withArgs('npm access list collaborators --json release-it').resolves(JSON.stringify({ john: ['write'] }));
-  await t.throwsAsync(runTasks(npmClient), { message: /^User ada is not a collaborator for release-it/ });
-  exec.restore();
-});
+  test('should throw if user is not a collaborator (v9)', async t => {
+    const npmClient = factory(npm);
+    t.mock.method(npmClient.shell, 'exec', command => {
+      if (command === 'npm whoami') return Promise.resolve('ada');
+      if (command === 'npm --version') return Promise.resolve('9.2.0');
+      if (command === 'npm access list collaborators --json release-it')
+        return Promise.resolve(JSON.stringify({ john: ['write'] }));
+      return Promise.resolve();
+    });
+    await assert.rejects(runTasks(npmClient), { message: /^User ada is not a collaborator for release-it/ });
+  });
 
-test('should throw if user is not a collaborator (v8)', async t => {
-  const npmClient = factory(npm);
-  const exec = sinon.stub(npmClient.shell, 'exec').resolves();
-  exec.withArgs('npm whoami').resolves('ada');
-  exec.withArgs('npm --version').resolves('8.2.0');
-  exec
-    .withArgs(/npm access (list collaborators --json|ls-collaborators) release-it/)
-    .resolves(JSON.stringify({ john: ['write'] }));
-  await t.throwsAsync(runTasks(npmClient), { message: /^User ada is not a collaborator for release-it/ });
-  exec.restore();
-});
+  test('should throw if user is not a collaborator (v8)', async t => {
+    const npmClient = factory(npm);
 
-test('should not throw if user is not a collaborator on a new package', async t => {
-  const npmClient = factory(npm);
-  const exec = sinon.stub(npmClient.shell, 'exec').resolves();
-  exec.withArgs('npm whoami').resolves('ada');
-  exec
-    .withArgs(/npm access (list collaborators --json|ls-collaborators) release-it/)
-    .rejects(
-      new Error(
-        'npm ERR! code E404\nnpm ERR! 404 Not Found - GET https://registry.npmjs.org/-/package/release-it/collaborators?format=cli - File not found'
-      )
-    );
-  await t.notThrowsAsync(runTasks(npmClient));
-  exec.restore();
-});
+    t.mock.method(npmClient.shell, 'exec', command => {
+      if (command === 'npm whoami') return Promise.resolve('ada');
+      if (command === 'npm --version') return Promise.resolve('8.2.0');
+      const re = /npm access (list collaborators --json|ls-collaborators) release-it/;
+      if (re.test(command)) return Promise.resolve(JSON.stringify({ john: ['write'] }));
+      return Promise.resolve();
+    });
 
-test('should publish a new private scoped package as npm would', async t => {
-  const options = { npm: { tag: 'beta' } };
-  const npmClient = factory(npm, { options });
-  npmClient.setContext({ name: '@scoped/pkg' });
-  const exec = sinon.spy(npmClient.shell, 'exec');
-  await npmClient.publish();
-  t.is(exec.lastCall.args[0].trim(), 'npm publish . --tag beta');
-  exec.restore();
-});
+    await assert.rejects(runTasks(npmClient), { message: /^User ada is not a collaborator for release-it/ });
+  });
 
-test('should not publish private package', async t => {
-  const npmClient = factory(npm);
-  npmClient.setContext({ name: 'pkg', private: true });
-  const exec = sinon.spy(npmClient.shell, 'exec');
-  await npmClient.publish();
-  const publish = exec.args.filter(arg => arg[0].startsWith('npm publish'));
-  t.is(publish.length, 0);
-  t.regex(npmClient.log.warn.lastCall.args[0], /package is private/);
-});
+  test('should not throw if user is not a collaborator on a new package', async t => {
+    const npmClient = factory(npm);
 
-test('should handle 2FA and publish with OTP', async t => {
-  const npmClient = factory(npm);
-  npmClient.setContext({ name: 'pkg' });
+    t.mock.method(npmClient.shell, 'exec', command => {
+      if (command === 'npm whoami') return Promise.resolve('ada');
+      const re = /npm access (list collaborators --json|ls-collaborators) release-it/;
+      const message =
+        'npm ERR! code E404\nnpm ERR! 404 Not Found - GET https://registry.npmjs.org/-/package/release-it/collaborators?format=cli - File not found';
+      if (re.test(command)) return Promise.reject(new Error(message));
+      return Promise.resolve();
+    });
 
-  const exec = sinon.stub(npmClient.shell, 'exec');
+    await assert.doesNotReject(runTasks(npmClient));
+  });
 
-  exec.onFirstCall().rejects(new Error('Initial error with one-time pass.'));
-  exec.onSecondCall().rejects(new Error('The provided one-time pass is incorrect.'));
-  exec.onThirdCall().resolves();
+  test('should handle 2FA and publish with OTP', async t => {
+    const npmClient = factory(npm);
+    npmClient.setContext({ name: 'pkg' });
 
-  await npmClient.publish({
-    otpCallback: () =>
-      npmClient.publish({
-        otp: '123',
-        otpCallback: () => npmClient.publish({ otp: '123456' })
-      })
-  });
+    const exec = t.mock.method(npmClient.shell, 'exec');
 
-  t.is(exec.callCount, 3);
-  t.is(exec.firstCall.args[0].trim(), 'npm publish . --tag latest');
-  t.is(exec.secondCall.args[0].trim(), 'npm publish . --tag latest --otp 123');
-  t.is(exec.thirdCall.args[0].trim(), 'npm publish . --tag latest --otp 123456');
+    exec.mock.mockImplementationOnce(() => Promise.reject(new Error('Initial error with one-time pass.')), 0);
+    exec.mock.mockImplementationOnce(() => Promise.reject(new Error('The provided one-time pass is incorrect.')), 1);
+    exec.mock.mockImplementationOnce(() => Promise.resolve(), 2);
 
-  t.is(npmClient.log.warn.callCount, 1);
-  t.is(npmClient.log.warn.firstCall.args[0], 'The provided OTP is incorrect or has expired.');
-});
+    await npmClient.publish({
+      otpCallback: () =>
+        npmClient.publish({
+          otp: '123',
+          otpCallback: () => npmClient.publish({ otp: '123456' })
+        })
+    });
 
-test('should publish', async t => {
-  const npmClient = factory(npm);
-  const exec = sinon.stub(npmClient.shell, 'exec').resolves();
-  exec.withArgs('npm whoami').resolves('john');
-  exec
-    .withArgs(/npm access (list collaborators --json|ls-collaborators) release-it/)
-    .resolves(JSON.stringify({ john: ['write'] }));
-  await runTasks(npmClient);
-  t.is(exec.lastCall.args[0].trim(), 'npm publish . --tag latest');
-  exec.restore();
-});
+    assert.equal(exec.mock.callCount(), 3);
+    assert.equal(exec.mock.calls[0].arguments[0].trim(), 'npm publish . --tag latest');
+    assert.equal(exec.mock.calls[1].arguments[0].trim(), 'npm publish . --tag latest --otp 123');
+    assert.equal(exec.mock.calls[2].arguments[0].trim(), 'npm publish . --tag latest --otp 123456');
 
-test('should use extra publish arguments ', async t => {
-  const options = { npm: { skipChecks: true, publishArgs: '--registry=http://my-internal-registry.local' } };
-  const npmClient = factory(npm, { options });
-  const exec = sinon.stub(npmClient.shell, 'exec').resolves();
-  await runTasks(npmClient);
-  t.is(exec.lastCall.args[0].trim(), 'npm publish . --tag latest --registry=http://my-internal-registry.local');
-  exec.restore();
-});
+    assert.equal(npmClient.log.warn.mock.callCount(), 1);
+    assert.equal(npmClient.log.warn.mock.calls[0].arguments[0], 'The provided OTP is incorrect or has expired.');
+  });
 
-test('should skip checks', async t => {
-  const options = { npm: { skipChecks: true } };
-  const npmClient = factory(npm, { options });
-  await t.notThrowsAsync(npmClient.init());
-});
+  test('should publish', async t => {
+    const npmClient = factory(npm);
+    const exec = t.mock.method(npmClient.shell, 'exec', command => {
+      if (command === 'npm whoami') return Promise.resolve('john');
+      const re = /npm access (list collaborators --json|ls-collaborators) release-it/;
+      if (re.test(command)) return Promise.resolve(JSON.stringify({ john: ['write'] }));
+      return Promise.resolve();
+    });
+    await runTasks(npmClient);
+    assert.equal(exec.mock.calls.at(-1).arguments[0].trim(), 'npm publish . --tag latest');
+  });
 
-test('should publish to a different/scoped registry', async t => {
-  const resetFs = mockFs({
-    [path.resolve('package.json')]: JSON.stringify({
-      name: '@my-scope/my-pkg',
-      version: '1.0.0',
-      publishConfig: {
-        access: 'public',
-        '@my-scope:registry': 'https://gitlab.com/api/v4/projects/my-scope%2Fmy-pkg/packages/npm/'
-      }
-    })
+  test('should use extra publish arguments', async t => {
+    const options = { npm: { skipChecks: true, publishArgs: '--registry=http://my-internal-registry.local' } };
+    const npmClient = factory(npm, { options });
+    const exec = t.mock.method(npmClient.shell, 'exec', () => Promise.resolve());
+    await runTasks(npmClient);
+    assert.equal(
+      exec.mock.calls.at(-1).arguments[0].trim(),
+      'npm publish . --tag latest --registry=http://my-internal-registry.local'
+    );
   });
-  const options = { npm };
-  const npmClient = factory(npm, { options });
-  const exec = sinon.stub(npmClient.shell, 'exec').resolves();
-  exec
-    .withArgs('npm whoami --registry https://gitlab.com/api/v4/projects/my-scope%2Fmy-pkg/packages/npm/')
-    .resolves('john');
-  exec
-    .withArgs(
-      /npm access (list collaborators --json|ls-collaborators) @my-scope\/my-pkg --registry https:\/\/gitlab\.com\/api\/v4\/projects\/my-scope%2Fmy-pkg\/packages\/npm\//
-    )
-    .resolves(JSON.stringify({ john: ['write'] }));
-
-  await runTasks(npmClient);
-
-  t.deepEqual(getArgs(exec.args, 'npm'), [
-    'npm ping --registry https://gitlab.com/api/v4/projects/my-scope%2Fmy-pkg/packages/npm/',
-    'npm whoami --registry https://gitlab.com/api/v4/projects/my-scope%2Fmy-pkg/packages/npm/',
-    'npm show @my-scope/my-pkg@latest version --registry https://gitlab.com/api/v4/projects/my-scope%2Fmy-pkg/packages/npm/',
-    'npm --version',
-    'npm version 1.0.1 --no-git-tag-version',
-    'npm publish . --tag latest --registry https://gitlab.com/api/v4/projects/my-scope%2Fmy-pkg/packages/npm/'
-  ]);
-
-  exec.restore();
-  resetFs();
-});
 
-test('should not publish when `npm version` fails', async t => {
-  const resetFs = mockFs({
-    [path.resolve('package.json')]: JSON.stringify({
-      name: '@my-scope/my-pkg',
-      version: '1.0.0'
-    })
+  test('should skip checks', async () => {
+    const options = { npm: { skipChecks: true } };
+    const npmClient = factory(npm, { options });
+    await assert.doesNotReject(npmClient.init());
   });
-  const options = { npm };
-  const npmClient = factory(npm, { options });
-  const exec = sinon.stub(npmClient.shell, 'exec').resolves();
-
-  exec.withArgs('npm whoami').resolves('john');
-  exec
-    .withArgs(/npm access (list collaborators --json|ls-collaborators) @my-scope\/my-pkg/)
-    .resolves(JSON.stringify({ john: ['write'] }));
-  exec
-    .withArgs('npm version 1.0.1 --no-git-tag-version')
-    .rejects('npm ERR! Version not changed, might want --allow-same-version');
-
-  try {
+
+  test('should publish to a different/scoped registry', async t => {
+    const tmp = mkTmpDir();
+    process.chdir(tmp);
+    writeFileSync(
+      join(tmp, 'package.json'),
+      JSON.stringify({
+        name: '@my-scope/my-pkg',
+        version: '1.0.0',
+        publishConfig: {
+          access: 'public',
+          '@my-scope:registry': 'https://gitlab.com/api/v4/projects/my-scope%2Fmy-pkg/packages/npm/'
+        }
+      })
+    );
+    const options = { npm };
+    const npmClient = factory(npm, { options });
+    const exec = t.mock.method(npmClient.shell, 'exec', command => {
+      const cmd = 'npm whoami --registry https://gitlab.com/api/v4/projects/my-scope%2Fmy-pkg/packages/npm/';
+      if (command === cmd) return Promise.resolve('john');
+      const re =
+        /npm access (list collaborators --json|ls-collaborators) @my-scope\/my-pkg --registry https:\/\/gitlab\.com\/api\/v4\/projects\/my-scope%2Fmy-pkg\/packages\/npm\//;
+      if (re.test(command)) return Promise.resolve(JSON.stringify({ john: ['write'] }));
+      return Promise.resolve();
+    });
     await runTasks(npmClient);
-  } catch (error) {
-    t.regex(error.toString(), /Version not changed/);
-  }
-
-  t.deepEqual(getArgs(exec.args, 'npm'), [
-    'npm ping',
-    'npm whoami',
-    'npm show @my-scope/my-pkg@latest version',
-    'npm --version',
-    'npm version 1.0.1 --no-git-tag-version'
-  ]);
-
-  exec.restore();
-  resetFs();
-});
 
-test('should add allow-same-version argument', async t => {
-  const options = { npm: { skipChecks: true, allowSameVersion: true } };
-  const npmClient = factory(npm, { options });
-  const exec = sinon.stub(npmClient.shell, 'exec').resolves();
-  await runTasks(npmClient);
-  const version = exec.args.filter(arg => arg[0].startsWith('npm version'));
-  t.regex(version[0][0], / --allow-same-version/);
-});
+    assert.deepEqual(getArgs(exec, 'npm'), [
+      'npm ping --registry https://gitlab.com/api/v4/projects/my-scope%2Fmy-pkg/packages/npm/',
+      'npm whoami --registry https://gitlab.com/api/v4/projects/my-scope%2Fmy-pkg/packages/npm/',
+      'npm show @my-scope/my-pkg@latest version --registry https://gitlab.com/api/v4/projects/my-scope%2Fmy-pkg/packages/npm/',
+      'npm --version',
+      'npm version 1.0.1 --no-git-tag-version',
+      'npm publish . --tag latest --registry https://gitlab.com/api/v4/projects/my-scope%2Fmy-pkg/packages/npm/'
+    ]);
+  });
+
+  test('should not publish when `npm version` fails', async t => {
+    const tmp = mkTmpDir();
+    process.chdir(tmp);
+    writeFileSync(join(tmp, 'package.json'), JSON.stringify({ name: '@my-scope/my-pkg', version: '1.0.0' }));
+    const options = { npm };
+    const npmClient = factory(npm, { options });
+
+    const exec = t.mock.method(npmClient.shell, 'exec', command => {
+      if (command === 'npm whoami') return Promise.resolve('john');
+      const re = /npm access (list collaborators --json|ls-collaborators) @my-scope\/my-pkg/;
+      if (re.test(command)) return Promise.resolve(JSON.stringify({ john: ['write'] }));
+      if (command === 'npm version 1.0.1 --no-git-tag-version')
+        return Promise.reject('npm ERR! Version not changed, might want --allow-same-version');
+      return Promise.resolve();
+    });
+
+    await assert.rejects(runTasks(npmClient), /Version not changed/);
+
+    assert.deepEqual(getArgs(exec, 'npm'), [
+      'npm ping',
+      'npm whoami',
+      'npm show @my-scope/my-pkg@latest version',
+      'npm --version',
+      'npm version 1.0.1 --no-git-tag-version'
+    ]);
+  });
+
+  test('should add allow-same-version argument', async t => {
+    const options = { npm: { skipChecks: true, allowSameVersion: true } };
+    const npmClient = factory(npm, { options });
+
+    const exec = t.mock.method(npmClient.shell, 'exec', () => Promise.resolve());
 
-test('should add version arguments', async t => {
-  const options = { npm: { skipChecks: true, versionArgs: ['--workspaces-update=false', '--allow-same-version'] } };
-  const npmClient = factory(npm, { options });
-  const exec = sinon.stub(npmClient.shell, 'exec').resolves();
-  await runTasks(npmClient);
-  const version = exec.args.filter(arg => arg[0].startsWith('npm version'));
-  t.regex(version[0][0], / --workspaces-update=false --allow-same-version/);
+    await runTasks(npmClient);
+    const versionArgs = getArgs(exec, 'npm version');
+    assert.match(versionArgs[0], / --allow-same-version/);
+  });
+
+  test('should add version arguments', async t => {
+    const options = { npm: { skipChecks: true, versionArgs: ['--workspaces-update=false', '--allow-same-version'] } };
+    const npmClient = factory(npm, { options });
+    const exec = t.mock.method(npmClient.shell, 'exec', () => Promise.resolve());
+    await runTasks(npmClient);
+    const versionArgs = getArgs(exec, 'npm version');
+    assert.match(versionArgs[0], / --workspaces-update=false --allow-same-version/);
+  });
 });