From f4a6dd56f2a686c9329e65664e66eae7a73b674c Mon Sep 17 00:00:00 2001
From: Rebecca Turner <me@re-becca.org>
Date: Thu, 25 May 2017 04:43:26 -0700
Subject: test: make no-scan-full-global-dir compat w/ class based
 install/uninstall

---
 test/tap/no-scan-full-global-dir.js | 35 ++++++++++++++++++-----------------
 1 file changed, 18 insertions(+), 17 deletions(-)

(limited to 'test')

diff --git a/test/tap/no-scan-full-global-dir.js b/test/tap/no-scan-full-global-dir.js
index ca051fc62..6a9349d54 100644
--- a/test/tap/no-scan-full-global-dir.js
+++ b/test/tap/no-scan-full-global-dir.js
@@ -4,7 +4,6 @@ var path = require('path')
 var test = require('tap').test
 var requireInject = require('require-inject')
 var osenv = require('osenv')
-var inherits = require('inherits')
 var npm = require('../../lib/npm.js')
 
 var packages = {
@@ -47,26 +46,26 @@ test('setup', function (t) {
   })
 })
 
-function loadArgMetadata (cb) {
-  this.args = this.args.map(function (arg) { return {name: arg} })
-  cb()
-}
-
 test('installer', function (t) {
   t.plan(1)
   var installer = requireInject('../../lib/install.js', {
     'fs': mockFs,
     'readdir-scoped-modules': mockReaddir,
-    'read-package-json': mockReadPackageJson
+    'read-package-json': mockReadPackageJson,
+    'mkdirp': function (path, cb) { cb() }
   })
 
   var Installer = installer.Installer
-  var TestInstaller = function () {
-    Installer.apply(this, arguments)
-    this.global = true
+  class TestInstaller extends Installer {
+    constructor (where, dryrun, args) {
+      super(where, dryrun, args)
+      this.global = true
+    }
+    loadArgMetadata (cb) {
+      this.args = this.args.map(function (arg) { return {name: arg} })
+      cb()
+    }
   }
-  inherits(TestInstaller, Installer)
-  TestInstaller.prototype.loadArgMetadata = loadArgMetadata
 
   var inst = new TestInstaller(__dirname, false, ['def', 'abc'])
   inst.loadCurrentTree(function () {
@@ -81,15 +80,17 @@ test('uninstaller', function (t) {
   var uninstaller = requireInject('../../lib/uninstall.js', {
     'fs': mockFs,
     'readdir-scoped-modules': mockReaddir,
-    'read-package-json': mockReadPackageJson
+    'read-package-json': mockReadPackageJson,
+    'mkdirp': function (path, cb) { cb() }
   })
 
   var Uninstaller = uninstaller.Uninstaller
-  var TestUninstaller = function () {
-    Uninstaller.apply(this, arguments)
-    this.global = true
+  class TestUninstaller extends Uninstaller {
+    constructor (where, dryrun, args) {
+      super(where, dryrun, args)
+      this.global = true
+    }
   }
-  inherits(TestUninstaller, Uninstaller)
 
   var uninst = new TestUninstaller(__dirname, false, ['ghi', 'jkl'])
   uninst.loadCurrentTree(function () {
-- 
cgit v1.2.3