diff options
author | Luke Karrys <luke@lukekarrys.com> | 2022-02-22 00:16:44 +0300 |
---|---|---|
committer | Luke Karrys <luke@lukekarrys.com> | 2022-02-24 02:58:59 +0300 |
commit | eef16c18aacfbfed8bcfc72407d2a1b0c5ea00bc (patch) | |
tree | 68ac885bb7360d47555748194b1a51796dfde676 /workspaces/arborist/test | |
parent | 64d451c80d3385aba0f0a89736368318f2389500 (diff) |
chore(arborist): remove log option
BREAKING CHANGE: this drops support for the `log` property
Diffstat (limited to 'workspaces/arborist/test')
-rw-r--r-- | workspaces/arborist/test/add-rm-pkg-deps.js | 9 | ||||
-rw-r--r-- | workspaces/arborist/test/arborist/reify.js | 1 | ||||
-rw-r--r-- | workspaces/arborist/test/get-workspace-nodes.js | 10 | ||||
-rw-r--r-- | workspaces/arborist/test/tracker.js | 35 |
4 files changed, 23 insertions, 32 deletions
diff --git a/workspaces/arborist/test/add-rm-pkg-deps.js b/workspaces/arborist/test/add-rm-pkg-deps.js index 54485f7bc..77ea2bd61 100644 --- a/workspaces/arborist/test/add-rm-pkg-deps.js +++ b/workspaces/arborist/test/add-rm-pkg-deps.js @@ -10,13 +10,14 @@ t.test('add', t => { const file = npa('file@file:/some/path/foo.tgz', '/') const logs = [] - const log = { - warn: function (...args) { + const log = (l, ...args) => { + if (l === 'warn') { logs.push(args) - }, + } } + process.on('log', log) + t.teardown(() => process.off('log', log)) t.strictSame(add({ - log, pkg: { dependencies: { bar: '1' }, devDependencies: { foo: '2' }, diff --git a/workspaces/arborist/test/arborist/reify.js b/workspaces/arborist/test/arborist/reify.js index db4b64c9b..f69547db4 100644 --- a/workspaces/arborist/test/arborist/reify.js +++ b/workspaces/arborist/test/arborist/reify.js @@ -1076,6 +1076,7 @@ t.test('scoped registries', async t => { registry, }) const kReify = Symbol.for('reifyNode') + a.addTracker('reify') a.idealTree = new Node({ path }) const node = new Node({ diff --git a/workspaces/arborist/test/get-workspace-nodes.js b/workspaces/arborist/test/get-workspace-nodes.js index fa259a8fe..3de4d73da 100644 --- a/workspaces/arborist/test/get-workspace-nodes.js +++ b/workspaces/arborist/test/get-workspace-nodes.js @@ -4,8 +4,6 @@ const Arborist = require('../lib/arborist/index.js') const { resolve } = require('path') const path = resolve(__dirname, './fixtures/workspaces-shared-deps-virtual') -const log = require('proc-log') - const warningTracker = () => { const list = [] const onlog = (...msg) => msg[0] === 'warn' && list.push(msg) @@ -23,7 +21,7 @@ t.before(async () => { t.test('basic behavior', t => { const getLogs = warningTracker() - const wsNodes = getWorkspaceNodes(tree, ['a'], log) + const wsNodes = getWorkspaceNodes(tree, ['a']) t.equal(wsNodes.length, 1) t.equal(wsNodes[0], tree.children.get('a').target) t.same(getLogs(), []) @@ -32,7 +30,7 @@ t.test('basic behavior', t => { t.test('filter set, but no workspaces present', t => { const getLogs = warningTracker() - const wsNodes = getWorkspaceNodes(tree.children.get('b').target, ['xyz'], log) + const wsNodes = getWorkspaceNodes(tree.children.get('b').target, ['xyz']) t.same(wsNodes, []) t.same(getLogs(), [ ['warn', 'workspaces', 'filter set, but no workspaces present'], @@ -42,7 +40,7 @@ t.test('filter set, but no workspaces present', t => { t.test('name in filter set, but not in workspaces', t => { const getLogs = warningTracker() - const wsNodes = getWorkspaceNodes(tree, ['xyz'], log) + const wsNodes = getWorkspaceNodes(tree, ['xyz']) t.same(wsNodes, []) t.same(getLogs(), [ ['warn', 'workspaces', 'xyz in filter set, but not in workspaces'], @@ -57,7 +55,7 @@ t.test('name in filter set, but no workspace folder present', t => { // but if we start moving things around and make a mistake, it's // possible to get there. tree.children.get('c').target.root = null - const wsNodes = getWorkspaceNodes(tree, ['c'], log) + const wsNodes = getWorkspaceNodes(tree, ['c']) t.same(wsNodes, []) t.same(getLogs(), [ ['warn', 'workspaces', 'c in filter set, but no workspace folder present'], diff --git a/workspaces/arborist/test/tracker.js b/workspaces/arborist/test/tracker.js index 03ece91a3..0c2fbb729 100644 --- a/workspaces/arborist/test/tracker.js +++ b/workspaces/arborist/test/tracker.js @@ -1,15 +1,6 @@ const Tracker = require('../lib/tracker.js')(class {}) const t = require('tap') -const npmlog = { - newGroup: () => ({ - newGroup: () => ({ finish: () => {} }), - finish: () => {}, - }), - enableProgress: () => {}, - disableProgress: () => {}, -} - t.test('no npmlog', t => { const tr = new Tracker() t.doesNotThrow(() => { @@ -24,27 +15,27 @@ t.test('no npmlog', t => { t.test('adds tracker', t => { t.doesNotThrow(() => { - const tr = new Tracker({ log: npmlog }) + const tr = new Tracker() tr.addTracker('testTracker') }) t.doesNotThrow(() => { - const tr = new Tracker({ log: npmlog }) + const tr = new Tracker() tr.addTracker('testTracker') tr.addTracker('testTracker', 'subTracker') }) t.doesNotThrow(() => { - const tr = new Tracker({ log: npmlog }) + const tr = new Tracker() tr.addTracker('testTracker') tr.addTracker('testTracker', 'subTracker') tr.addTracker('testTracker', 'subTracker') }) t.doesNotThrow(() => { - const tr = new Tracker({ log: npmlog }) + const tr = new Tracker() tr.addTracker('testTracker') tr.addTracker('testTracker', 'subTracker.name', 'subTracker.key') }) - const tr = new Tracker({ log: npmlog }) + const tr = new Tracker() t.throws(() => { tr.addTracker() }, Error, `Tracker can't be null or undefined`) @@ -70,19 +61,19 @@ t.test('adds tracker', t => { t.test('finishes tracker', t => { t.doesNotThrow(() => { - const tr = new Tracker({ log: npmlog }) + const tr = new Tracker() tr.addTracker('testTracker') tr.finishTracker('testTracker') }) t.doesNotThrow(() => { - const tr = new Tracker({ log: npmlog }) + const tr = new Tracker() tr.addTracker('testTracker') tr.addTracker('testTracker', 'subTracker') tr.finishTracker('testTracker', 'subTracker') tr.finishTracker('testTracker') }) t.doesNotThrow(() => { - const tr = new Tracker({ log: npmlog }) + const tr = new Tracker() tr.addTracker('testTracker') tr.addTracker('testTracker', 'subTracker.name', 'subTracker.key') tr.finishTracker('testTracker', 'subTracker.name', 'subTracker.key') @@ -90,14 +81,14 @@ t.test('finishes tracker', t => { }) t.doesNotThrow(() => { - const tr = new Tracker({ log: npmlog }) + const tr = new Tracker() tr.addTracker('firstTracker') tr.addTracker('secondTracker') tr.finishTracker('firstTracker') tr.finishTracker('secondTracker') }) - const tr = new Tracker({ log: npmlog }) + const tr = new Tracker() t.throws(() => { tr.finishTracker() }, Error, `Tracker can't be null or undefined`) @@ -109,19 +100,19 @@ t.test('finishes tracker', t => { }, Error, `Tracker can't be null or undefined`) t.doesNotThrow(() => { - const tr = new Tracker({ log: npmlog }) + const tr = new Tracker() tr.addTracker('testTracker') tr.addTracker('testTracker', 'testChild') tr.finishTracker('testTracker') }) t.throws(() => { - const tr = new Tracker({ log: npmlog }) + const tr = new Tracker() tr.finishTracker('testTracker') }, Error, 'Tracker "testTracker" does not exist') t.doesNotThrow(() => { - const tr = new Tracker({ log: npmlog }) + const tr = new Tracker() tr.addTracker('testTracker') tr.finishTracker('testTracker', 'nonExistentSubTracker') }) |