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

package/test/shell.js

@@ -1,73 +1,76 @@
 import childProcess from 'node:child_process';
-import test from 'ava';
-import sinon from 'sinon';
+import test, { describe } from 'node:test';
+import assert from 'node:assert/strict';
 import Shell from '../lib/shell.js';
-import Log from '../lib/log.js';
 import { factory } from './util/index.js';
 
-const cwd = childProcess.execSync('pwd', { encoding: 'utf8' }).trim();
+describe('shell', () => {
+  const cwd = childProcess.execSync('pwd', { encoding: 'utf8' }).trim();
 
-const shell = factory(Shell);
+  const shell = factory(Shell);
 
-test('exec', async t => {
-  t.is(await shell.exec('echo bar'), 'bar');
-});
+  test('exec', async () => {
+    assert.equal(await shell.exec('echo bar'), 'bar');
+  });
 
-test('exec (with context)', async t => {
-  const exec = cmd => shell.exec(cmd, { verbose: false }, shell.config.getContext());
-  t.is(await exec(''), undefined);
-  t.is(await exec('pwd'), cwd);
-  t.is(await exec('echo ${git.pushArgs}'), '--follow-tags');
-  t.is(await exec('echo -*- ${github.tokenRef} -*-'), '-*- GITHUB_TOKEN -*-');
-});
+  test('exec (with context)', async () => {
+    const exec = cmd => shell.exec(cmd, { verbose: false }, shell.config.getContext());
+    assert.equal(await exec(''), undefined);
+    assert.equal(await exec('pwd'), cwd);
+    assert.equal(await exec('echo ${git.pushArgs}'), '--follow-tags');
+    assert.equal(await exec('echo -*- ${github.tokenRef} -*-'), '-*- GITHUB_TOKEN -*-');
+  });
 
-test('exec (with args)', async t => {
-  t.is(await shell.exec([]), undefined);
-  t.is(await shell.exec(['pwd']), cwd);
-  t.is(await shell.exec(['echo', 'a', 'b']), 'a b');
-  t.is(await shell.exec(['echo', '"a"']), '"a"');
-});
+  test('exec (with args)', async () => {
+    assert.equal(await shell.exec([]), undefined);
+    assert.equal(await shell.exec(['pwd']), cwd);
+    assert.equal(await shell.exec(['echo', 'a', 'b']), 'a b');
+    assert.equal(await shell.exec(['echo', '"a"']), '"a"');
+  });
 
-test('exec (dry-run/read-only)', async t => {
-  const shell = factory(Shell, { options: { 'dry-run': true } });
-  {
-    const actual = await shell.exec('pwd', { write: false });
-    t.is(actual, cwd);
-    t.is(shell.log.exec.callCount, 1);
-    t.is(shell.log.exec.firstCall.args[0], 'pwd');
-  }
-  {
-    const actual = await shell.exec('pwd');
-    t.is(actual, undefined);
-    t.is(shell.log.exec.callCount, 2);
-    t.is(shell.log.exec.secondCall.args[0], 'pwd');
-    t.deepEqual(shell.log.exec.secondCall.lastArg, { isDryRun: true });
-  }
-});
+  test('exec (dry-run/read-only)', async () => {
+    const shell = factory(Shell, { options: { 'dry-run': true } });
+    {
+      const actual = await shell.exec('pwd', { write: false });
+      assert.equal(actual, cwd);
+      assert.equal(shell.log.exec.mock.callCount(), 1);
+      assert.equal(shell.log.exec.mock.calls[0].arguments[0], 'pwd');
+    }
+    {
+      const actual = await shell.exec('pwd');
+      assert.equal(actual, undefined);
+      assert.equal(shell.log.exec.mock.callCount(), 2);
+      assert.equal(shell.log.exec.mock.calls[1].arguments[0], 'pwd');
+      assert.deepEqual(shell.log.exec.mock.calls[1].arguments.at(-1), { isDryRun: true });
+    }
+  });
 
-test('exec (verbose)', async t => {
-  const shell = factory(Shell, { options: { verbose: true } });
-  const actual = await shell.exec('echo foo');
-  t.is(shell.log.exec.firstCall.args[0], 'echo foo');
-  t.is(shell.log.exec.callCount, 1);
-  t.is(shell.log.verbose.firstCall.args[0], 'foo');
-  t.is(shell.log.verbose.callCount, 1);
-  t.is(actual, 'foo');
-});
+  test('exec (verbose)', async () => {
+    const shell = factory(Shell, { options: { verbose: true } });
+    const actual = await shell.exec('echo foo');
+    assert.equal(shell.log.exec.mock.calls[0].arguments[0], 'echo foo');
+    assert.equal(shell.log.exec.mock.callCount(), 1);
+    assert.equal(shell.log.verbose.mock.calls[0].arguments[0], 'foo');
+    assert.equal(shell.log.verbose.mock.callCount(), 1);
+    assert.equal(actual, 'foo');
+  });
 
-test('should cache results of command execution', async t => {
-  const log = sinon.createStubInstance(Log);
-  const shell = factory(Shell, { container: { log } });
-  const result1 = await shell.exec('echo foo');
-  const result2 = await shell.exec('echo foo');
-  t.is(result1, result2);
-  t.deepEqual(log.exec.args, [
-    ['echo foo', { isExternal: false, isCached: false }],
-    ['echo foo', { isExternal: false, isCached: true }]
-  ]);
-});
+  test('should cache results of command execution', async () => {
+    const shell = factory(Shell);
+    const result1 = await shell.exec('echo foo');
+    const result2 = await shell.exec('echo foo');
+    assert(result1 === result2);
+    assert.deepEqual(
+      shell.log.exec.mock.calls.map(call => call.arguments),
+      [
+        ['echo foo', { isExternal: false, isCached: false }],
+        ['echo foo', { isExternal: false, isCached: true }]
+      ]
+    );
+  });
 
-test('should bail out on failed command execution', async t => {
-  const shell = new Shell({ container: { log: sinon.createStubInstance(Log) } });
-  await t.throwsAsync(shell.exec('foo'));
+  test('should bail out on failed command execution', async () => {
+    const shell = new Shell({ container: {} });
+    await assert.rejects(shell.exec('foo'));
+  });
 });

package/test/spinner.js

@@ -1,12 +1,8 @@
-import test from 'ava';
-import sinon from 'sinon';
+import test from 'node:test';
+import assert from 'node:assert/strict';
 import Spinner from '../lib/spinner.js';
 import Config from '../lib/config.js';
 
-test.beforeEach(t => {
-  t.context.ora = sinon.spy();
-});
-
 const getConfig = options => {
   const testConfig = {
     ci: false,
@@ -16,43 +12,43 @@ const getConfig = options => {
 };
 
 test('should not show spinner and not execute task if disabled', async t => {
-  const { ora } = t.context;
-  const task = sinon.spy();
+  const ora = t.mock.fn();
+  const task = t.mock.fn();
   const spinner = new Spinner({ container: { ora } });
   await spinner.show({ enabled: false, task });
-  t.is(task.callCount, 0);
-  t.is(ora.callCount, 0);
+  assert.equal(task.mock.callCount(), 0);
+  assert.equal(ora.mock.callCount(), 0);
 });
 
 test('should show spinner and run task by default', async t => {
-  const { ora } = t.context;
-  const task = sinon.stub().resolves();
+  const ora = t.mock.fn();
+  const task = t.mock.fn(() => Promise.resolve());
   const label = 'foo';
   const config = getConfig({ ci: true });
   const spinner = new Spinner({ container: { ora, config } });
   await spinner.show({ task, label });
-  t.is(task.callCount, 1);
-  t.is(ora.callCount, 1);
-  t.is(ora.firstCall.args[0], task.firstCall.returnValue);
-  t.is(ora.firstCall.args[1], label);
+  assert.equal(task.mock.callCount(), 1);
+  assert.equal(ora.mock.callCount(), 1);
+  assert.equal(ora.mock.calls[0].arguments[0], task.mock.calls[0].result);
+  assert.equal(ora.mock.calls[0].arguments[1], label);
 });
 
 test('should run task, but not show spinner if interactive', async t => {
-  const { ora } = t.context;
-  const task = sinon.stub().resolves();
+  const ora = t.mock.fn();
+  const task = t.mock.fn(() => Promise.resolve());
   const config = getConfig({ ci: false });
   const spinner = new Spinner({ container: { ora, config } });
   await spinner.show({ task });
-  t.is(task.callCount, 1);
-  t.is(ora.callCount, 0);
+  assert.equal(task.mock.callCount(), 1);
+  assert.equal(ora.mock.callCount(), 0);
 });
 
 test('should run task and show spinner if interactive, but external', async t => {
-  const { ora } = t.context;
-  const task = sinon.stub().resolves();
+  const ora = t.mock.fn();
+  const task = t.mock.fn(() => Promise.resolve());
   const config = getConfig({ ci: false });
   const spinner = new Spinner({ container: { ora, config } });
   await spinner.show({ task, external: true });
-  t.is(task.callCount, 1);
-  t.is(ora.callCount, 1);
+  assert.equal(task.mock.callCount(), 1);
+  assert.equal(ora.mock.callCount(), 1);
 });

package/test/stub/github.js

@@ -1,30 +1,18 @@
-import nock from 'nock';
-
-const interceptAuthentication = ({ api = 'https://api.github.com', username = 'john' } = {}) => {
-  nock(api).get('/user').reply(200, {
-    login: username
-  });
+export const interceptAuthentication = (server, { username = 'john' } = {}) => {
+  server.get('/user', { status: 200, body: { login: username } });
 };
 
-const interceptCollaborator = ({
-  api = 'https://api.github.com',
-  owner = 'user',
-  project = 'repo',
-  username = 'john'
-} = {}) => {
-  nock(api).get(`/repos/${owner}/${project}/collaborators/${username}`).reply(204);
+export const interceptCollaborator = (server, { owner = 'user', project = 'repo', username = 'john' } = {}) => {
+  server.get(`/repos/${owner}/${project}/collaborators/${username}`, { status: 204 });
 };
 
-const interceptListReleases = ({
-  host = 'github.com',
-  api = 'https://api.github.com',
-  owner = 'user',
-  project = 'repo',
-  tag_name
-} = {}) => {
-  nock(api)
-    .get(`/repos/${owner}/${project}/releases?per_page=1&page=1`)
-    .reply(200, [
+export const interceptListReleases = (
+  server,
+  { host = 'github.com', owner = 'user', project = 'repo', tag_name } = {}
+) => {
+  server.get(`/repos/${owner}/${project}/releases?per_page=1&page=1`, {
+    status: 200,
+    body: [
       {
         id: 1,
         upload_url: `https://uploads.${host}/repos/${owner}/${project}/releases/1/assets{?name,label}`,
@@ -36,39 +24,38 @@ const interceptListReleases = ({
         draft: false,
         prerelease: false
       }
-    ]);
+    ]
+  });
 };
 
-const interceptCreate = ({
-  api = 'https://api.github.com',
-  host = 'github.com',
-  owner = 'user',
-  project = 'repo',
-  body: {
-    tag_name,
-    name = '',
-    body = null,
-    prerelease = false,
-    draft = false,
-    generate_release_notes = false,
-    make_latest = 'true',
-    discussion_category_name = undefined
-  }
-} = {}) => {
-  nock(api)
-    .post(`/repos/${owner}/${project}/releases`, {
+export const interceptCreate = (
+  server,
+  {
+    api = 'https://api.github.com',
+    host = 'github.com',
+    owner = 'user',
+    project = 'repo',
+    body: {
       tag_name,
-      name,
-      body,
-      prerelease,
-      draft,
-      generate_release_notes,
-      make_latest,
-      discussion_category_name
-    })
-    .reply(() => {
-      const id = 1;
-      const responseBody = {
+      name = '',
+      body = null,
+      prerelease = false,
+      draft = false,
+      generate_release_notes = false,
+      make_latest = 'true',
+      discussion_category_name = undefined
+    }
+  } = {}
+) => {
+  const id = 1;
+  server.post(
+    {
+      url: `/repos/${owner}/${project}/releases`,
+      body: { tag_name, name, body, prerelease, draft, generate_release_notes, make_latest, discussion_category_name }
+    },
+    {
+      status: 200,
+      body: {
         id,
         tag_name,
         name,
@@ -79,82 +66,85 @@ const interceptCreate = ({
         upload_url: `https://uploads.${host}/repos/${owner}/${project}/releases/${id}/assets{?name,label}`,
         html_url: `https://${host}/${owner}/${project}/releases/tag/${tag_name}`,
         discussion_url: discussion_category_name ? `https://${host}/${owner}/${project}/discussions/${id}` : undefined
-      };
-      return [200, responseBody, { location: `${api}/repos/${owner}/${project}/releases/${id}` }];
-    });
+      },
+      headers: { location: `${api}/repos/${owner}/${project}/releases/${id}` }
+    }
+  );
 };
 
-const interceptUpdate = ({
-  host = 'github.com',
-  api = 'https://api.github.com',
-  owner = 'user',
-  project = 'repo',
-  body: {
-    tag_name,
-    name = '',
-    body = null,
-    prerelease = false,
-    draft = false,
-    generate_release_notes = false,
-    make_latest = 'true',
-    discussion_category_name = undefined
-  }
-} = {}) => {
-  nock(api)
-    .patch(`/repos/${owner}/${project}/releases/1`, {
-      tag_name,
-      name,
-      body,
-      draft,
-      prerelease,
-      generate_release_notes,
-      make_latest,
-      discussion_category_name
-    })
-    .reply(200, {
-      id: 1,
+export const interceptUpdate = (
+  server,
+  {
+    host = 'github.com',
+    owner = 'user',
+    project = 'repo',
+    body: {
       tag_name,
-      name,
-      body,
-      prerelease,
-      draft,
-      generate_release_notes,
-      upload_url: `https://uploads.${host}/repos/${owner}/${project}/releases/1/assets{?name,label}`,
-      html_url: `https://${host}/${owner}/${project}/releases/tag/${tag_name}`
-    });
+      name = '',
+      body = null,
+      prerelease = false,
+      draft = false,
+      generate_release_notes = false,
+      make_latest = 'true',
+      discussion_category_name = undefined
+    }
+  } = {}
+) => {
+  server.patch(
+    {
+      url: `/repos/${owner}/${project}/releases/1`,
+      body: {
+        tag_name,
+        name,
+        body,
+        draft,
+        prerelease,
+        generate_release_notes,
+        make_latest,
+        discussion_category_name
+      }
+    },
+    {
+      status: 200,
+      body: {
+        id: 1,
+        tag_name,
+        name,
+        body,
+        prerelease,
+        draft,
+        generate_release_notes,
+        upload_url: `https://uploads.${host}/repos/${owner}/${project}/releases/1/assets{?name,label}`,
+        html_url: `https://${host}/${owner}/${project}/releases/tag/${tag_name}`
+      }
+    }
+  );
 };
 
-const interceptAsset = ({
-  api = 'https://api.github.com',
-  host = 'github.com',
-  owner = 'user',
-  project = 'repo',
-  tagName,
-  body = {}
-} = {}) => {
-  nock(`https://uploads.${host}`)
-    .post(`/repos/${owner}/${project}/releases/1/assets`, body)
-    .query(true)
-    .reply(200, function () {
+export const interceptAsset = (
+  server,
+  { api = 'https://api.github.com', host = 'github.com', owner = 'user', project = 'repo', tagName } = {}
+) => {
+  server.post(
+    {
+      url: `/repos/${owner}/${project}/releases/1/assets`
+    },
+    request => {
       const id = 1;
-      const [, name] = this.req.path.match(/\?name=([^&]+)/);
+      const url = new URL(request.url);
+      const name = url.searchParams.get('name');
       return {
-        id,
-        url: `${api}/repos/${owner}/${project}/releases/assets/${id}`,
-        name,
-        label: '',
-        state: 'uploaded',
-        size: this.req.headers['content-length'],
-        browser_download_url: `https://${host}/${owner}/${project}/releases/download/${tagName}/${name}`
+        status: 200,
+        body: {
+          id,
+          url: `${api}/repos/${owner}/${project}/releases/assets/${id}`,
+          name,
+          label: '',
+          state: 'uploaded',
+          size: request.headers['content-length'],
+          browser_download_url: `https://${host}/${owner}/${project}/releases/download/${tagName}/${name}`
+        }
       };
-    });
-};
-
-export {
-  interceptAuthentication,
-  interceptCollaborator,
-  interceptListReleases,
-  interceptCreate,
-  interceptUpdate,
-  interceptAsset
+    }
+  );
 };

package/test/stub/gitlab.js

@@ -1,63 +1,87 @@
-import nock from 'nock';
+export const interceptMembers = (server, { owner = 'emma' } = {}) => {
+  server.get(`/projects/john%2Frepo/members/all/1`, { status: 200, username: owner });
+};
 
-export let interceptUser = ({ host = 'https://gitlab.com', owner = 'user' } = {}, options) =>
-  nock(host, options).get('/api/v4/user').reply(200, { id: 1, username: owner });
+export const interceptUser = (server, { owner = 'user' } = {}, options = {}) => {
+  server.get({ url: '/user', ...options }, { status: 200, body: { id: 1, username: owner } });
+};
 
-export let interceptCollaborator = (
-  { host = 'https://gitlab.com', owner = 'user', project = 'repo', group, userId = 1 } = {},
-  options
+export const interceptCollaborator = (
+  server,
+  { owner = 'user', project = 'repo', group, userId = 1 } = {},
+  options = {}
 ) =>
-  nock(host, options)
-    .get(`/api/v4/projects/${group ? `${group}%2F` : ''}${owner}%2F${project}/members/all/${userId}`)
-    .reply(200, { id: userId, username: owner, access_level: 30 });
+  server.get(
+    {
+      url: `/projects/${group ? `${group}%2F` : ''}${owner}%2F${project}/members/all/${userId}`,
+      ...options
+    },
+    {
+      status: 200,
+      body: { id: userId, username: owner, access_level: 30 }
+    }
+  );
 
-export let interceptPublish = ({ host = 'https://gitlab.com', owner = 'user', project = 'repo', body } = {}, options) =>
-  nock(host, options)
-    .post(`/api/v4/projects/${owner}%2F${project}/releases`, body)
-    .reply(200, {
-      _links: {
-        self: `https://gitlab.com/${owner}/${project}/-/releases/${body?.tag_name ?? '1.0.0'}`
+export const interceptPublish = (server, { owner = 'user', project = 'repo', body } = {}) =>
+  server.post(
+    { url: `/projects/${owner}%2F${project}/releases`, body },
+    {
+      status: 200,
+      body: {
+        _links: {
+          self: `https://gitlab.com/${owner}/${project}/-/releases/${body?.tag_name ?? '1.0.0'}`
+        }
       }
-    });
+    }
+  );
 
-export let interceptMilestones = (
-  { host = 'https://gitlab.com', owner = 'user', project = 'repo', query = {}, milestones = [] } = {},
-  options
-) =>
-  nock(host, options)
-    .get(`/api/v4/projects/${owner}%2F${project}/milestones`)
-    .query(
-      Object.assign(
-        {
-          include_parent_milestones: true
-        },
-        query
-      )
-    )
-    .reply(200, JSON.stringify(milestones));
+export const interceptMilestones = (server, { owner = 'user', project = 'repo', query = {}, milestones = [] } = {}) =>
+  server.get(
+    {
+      url: `/projects/${owner}%2F${project}/milestones`,
+      query: {
+        include_parent_milestones: 'true',
+        ...query
+      }
+    },
+    {
+      status: 200,
+      body: milestones
+    }
+  );
 
-export let interceptAsset = ({ host = 'https://gitlab.com', owner = 'user', project = 'repo' } = {}) =>
-  nock(host)
-    .post(`/api/v4/projects/${owner}%2F${project}/uploads`)
-    .query(true)
-    .reply(200, (_, requestBody) => {
-      const [, name] = requestBody.match(/filename="([^"]+)/);
+export const interceptAsset = (server, { owner = 'user', project = 'repo' } = {}) =>
+  server.post(
+    {
+      url: `/projects/${owner}%2F${project}/uploads`
+    },
+    async request => {
+      const formData = await request.formData();
+      const { name } = formData.get('file');
       return {
-        alt: name,
-        url: `/uploads/7e8bec1fe27cc46a4bc6a91b9e82a07c/${name}`,
-        full_path: `/-/project/1234/uploads/7e8bec1fe27cc46a4bc6a91b9e82a07c/${name}`,
-        markdown: `[${name}](/uploads/7e8bec1fe27cc46a4bc6a91b9e82a07c/${name})`,
-        _links: {
-          self: `https://gitlab.com/${owner}/${project}/-/releases/${name}`
+        status: 200,
+        body: {
+          alt: name,
+          url: `/uploads/7e8bec1fe27cc46a4bc6a91b9e82a07c/${name}`,
+          full_path: `/-/project/1234/uploads/7e8bec1fe27cc46a4bc6a91b9e82a07c/${name}`,
+          markdown: `[${name}](/uploads/7e8bec1fe27cc46a4bc6a91b9e82a07c/${name})`,
+          _links: {
+            self: `https://gitlab.com/${owner}/${project}/-/releases/${name}`
+          }
         }
       };
-    });
+    }
+  );
 
-export let interceptAssetGeneric = ({ host = 'https://gitlab.com', owner = 'user', project = 'repo' } = {}) =>
-  nock(host)
-    .put(`/api/v4/projects/${owner}%2F${project}/packages/generic/release-it/2.0.1/file-v2.0.1.txt`)
-    .reply(200, () => {
-      return {
+export const interceptAssetGeneric = (server, { owner = 'user', project = 'repo' } = {}) =>
+  server.put(
+    {
+      url: `/projects/${owner}%2F${project}/packages/generic/release-it/2.0.1/file-v2.0.1.txt`
+    },
+    {
+      status: 200,
+      body: {
         message: '201 Created'
-      };
-    });
+      }
+    }
+  );