aboutsummaryrefslogtreecommitdiff
path: root/deps/npm/test/network
diff options
context:
space:
mode:
Diffstat (limited to 'deps/npm/test/network')
-rw-r--r--deps/npm/test/network/git-cache-locking.js3
-rw-r--r--deps/npm/test/network/registry.js4
2 files changed, 2 insertions, 5 deletions
diff --git a/deps/npm/test/network/git-cache-locking.js b/deps/npm/test/network/git-cache-locking.js
index 29ab5709b9..9c3e903bea 100644
--- a/deps/npm/test/network/git-cache-locking.js
+++ b/deps/npm/test/network/git-cache-locking.js
@@ -6,7 +6,6 @@ var mkdirp = require('mkdirp')
var pkg = path.resolve(__dirname, 'git-cache-locking')
var tmp = path.join(pkg, 'tmp')
var cache = path.join(pkg, 'cache')
-var shallowClone = Object.assign || require('util')._extend
test('setup', function (t) {
rimraf.sync(pkg)
@@ -18,7 +17,7 @@ test('git-cache-locking: install a git dependency', function (t) {
// disable git integration tests on Travis.
if (process.env.TRAVIS) return t.end()
- var gitEnv = shallowClone({}, process.env)
+ var gitEnv = Object.assign({}, process.env)
gitEnv.npm_config_cache = cache
gitEnv.npm_config_tmp = tmp
gitEnv.npm_config_prefix = pkg
diff --git a/deps/npm/test/network/registry.js b/deps/npm/test/network/registry.js
index d8ec4a204e..3dbe23ffd2 100644
--- a/deps/npm/test/network/registry.js
+++ b/deps/npm/test/network/registry.js
@@ -26,10 +26,8 @@ if (v[0] === 0 && v[1] < 10) {
})
}
-var extend = Object.assign || require('util')._extend
-
function runTests () {
- var env = extend({ TAP: 1 }, process.env)
+ var env = Object.assign({ TAP: 1 }, process.env)
env.npm = npmExec
// TODO: fix tap and / or nyc to handle nested invocations properly
env.COVERALLS_REPO_TOKEN = ''