diff --git a/lib/cli/config.js b/lib/cli/config.js index dd8f987ca1..3691f0a079 100644 --- a/lib/cli/config.js +++ b/lib/cli/config.js @@ -9,7 +9,7 @@ */ const fs = require('fs'); -const findUp = require('findup-sync'); +const findUp = require('find-up'); const path = require('path'); const debug = require('debug')('mocha:cli:config'); @@ -72,7 +72,7 @@ exports.loadConfig = filepath => { * @returns {string|null} Filepath to config, if found */ exports.findConfig = (cwd = process.cwd()) => { - const filepath = findUp(exports.CONFIG_FILES, {cwd}); + const filepath = findUp.sync(exports.CONFIG_FILES, {cwd}); if (filepath) { debug(`found config at ${filepath}`); } diff --git a/lib/cli/options.js b/lib/cli/options.js index 5ec8ff0ebf..a033c39ac7 100644 --- a/lib/cli/options.js +++ b/lib/cli/options.js @@ -13,7 +13,7 @@ const {ONE_AND_DONE_ARGS} = require('./one-and-dones'); const mocharc = require('../mocharc.json'); const {list} = require('./run-helpers'); const {loadConfig, findConfig} = require('./config'); -const findup = require('findup-sync'); +const findUp = require('find-up'); const {deprecate} = require('../utils'); const debug = require('debug')('mocha:cli:options'); const {createMissingArgumentError} = require('../errors'); @@ -255,7 +255,7 @@ const loadPkgRc = (args = {}) => { return result; } result = {}; - const filepath = args.package || findup(mocharc.package); + const filepath = args.package || findUp.sync(mocharc.package); if (filepath) { try { const pkg = JSON.parse(fs.readFileSync(filepath, 'utf8')); diff --git a/test/node-unit/cli/config.spec.js b/test/node-unit/cli/config.spec.js index d5d64ee593..eeb4bb2b82 100644 --- a/test/node-unit/cli/config.spec.js +++ b/test/node-unit/cli/config.spec.js @@ -109,12 +109,12 @@ describe('cli/config', function() { let findConfig; beforeEach(function() { - findup = sandbox.stub().returns('/some/path/.mocharc.js'); + findup = {sync: sandbox.stub().returns('/some/path/.mocharc.js')}; rewiremock.enable(); findConfig = rewiremock.proxy( require.resolve('../../../lib/cli/config'), r => ({ - 'findup-sync': r.by(() => findup) + 'find-up': r.by(() => findup) }) ).findConfig; }); diff --git a/test/node-unit/cli/options.spec.js b/test/node-unit/cli/options.spec.js index b849db5ab3..3438a5564f 100644 --- a/test/node-unit/cli/options.spec.js +++ b/test/node-unit/cli/options.spec.js @@ -10,14 +10,16 @@ const configPath = require.resolve('../../../lib/cli/config'); const proxyLoadOptions = ({ readFileSync = {}, - findupSync = {}, + findupSync = null, findConfig = {}, loadConfig = {} } = {}) => rewiremock.proxy(modulePath, r => ({ fs: r.with({readFileSync}).directChildOnly(), [mocharcPath]: defaults, - 'findup-sync': r.by(() => findupSync).directChildOnly(), + 'find-up': r + .by(() => (findupSync ? {sync: findupSync} : {})) + .directChildOnly(), [configPath]: r.with({findConfig, loadConfig}).directChildOnly() })).loadOptions;