diff --git a/lib/fs.js b/lib/fs.js index d8131fa..bc8e867 100644 --- a/lib/fs.js +++ b/lib/fs.js @@ -9,13 +9,13 @@ promises.rm = promises.rm || async function (...args) { const options = args[1] || {} try { - const stat = await fs.stat(pathToRemove, { throwIfNoEntry: false }) + const stat = await promises.stat(pathToRemove, { throwIfNoEntry: false }) const isDirectory = stat.isDirectory() if (isDirectory) { - await fs.rmdir(pathToRemove, options) + await promises.rmdir(pathToRemove, options) } else { - await fs.unlink(pathToRemove) + await promises.unlink(pathToRemove) } } catch (err) { if (err.code === 'ENOENT' && options.force) { diff --git a/test/test-configure-nodedir.js b/test/test-configure-nodedir.js index a6debde..e74cc65 100644 --- a/test/test-configure-nodedir.js +++ b/test/test-configure-nodedir.js @@ -10,7 +10,7 @@ const semver = require('semver') const versionSemver = semver.parse(process.version) -const configure = requireInject('../lib/configure', { +const configure = requireInject.withEmptyCache('../lib/configure', { 'graceful-fs': { openSync: () => 0, closeSync: () => {}, @@ -26,7 +26,7 @@ const configure = requireInject('../lib/configure', { } }) -const configure2 = requireInject('../lib/configure', { +const configure2 = requireInject.withEmptyCache('../lib/configure', { 'graceful-fs': { openSync: () => 0, closeSync: () => {}, diff --git a/test/test-configure-python.js b/test/test-configure-python.js index 094e791..8767c04 100644 --- a/test/test-configure-python.js +++ b/test/test-configure-python.js @@ -7,7 +7,7 @@ const { devDir } = require('./common') const gyp = require('../lib/node-gyp') const requireInject = require('require-inject') -const configure = requireInject('../lib/configure', { +const configure = requireInject.withEmptyCache('../lib/configure', { 'graceful-fs': { openSync: () => 0, closeSync: () => {}, diff --git a/test/test-find-accessible-sync.js b/test/test-find-accessible-sync.js index 0c8a5dd..5d0013a 100644 --- a/test/test-find-accessible-sync.js +++ b/test/test-find-accessible-sync.js @@ -4,7 +4,7 @@ const { describe, it } = require('mocha') const assert = require('assert') const path = require('path') const requireInject = require('require-inject') -const { findAccessibleSync } = requireInject('../lib/util', { +const { findAccessibleSync } = requireInject.withEmptyCache('../lib/util', { 'graceful-fs': { closeSync: function () { return undefined }, openSync: function (path) { diff --git a/test/test-install.js b/test/test-install.js index de91b26..d6882c9 100644 --- a/test/test-install.js +++ b/test/test-install.js @@ -16,7 +16,7 @@ const { download } = require('../lib/download') describe('install', function () { it('EACCES retry once', async () => { let statCalled = 0 - const mockInstall = requireInject('../lib/install', { + const mockInstall = requireInject.withEmptyCache('../lib/install', { 'graceful-fs': { promises: { stat (_) {