Skip to content

Commit

Permalink
Merge pull request #1231 from zertosh/update-process
Browse files Browse the repository at this point in the history
Update process to ~0.11.0
  • Loading branch information
zertosh committed Apr 30, 2015
2 parents 4ca8416 + a762d3b commit a615650
Show file tree
Hide file tree
Showing 10 changed files with 22 additions and 8 deletions.
4 changes: 2 additions & 2 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -44,14 +44,14 @@
"http-browserify": "^1.4.0",
"https-browserify": "~0.0.0",
"inherits": "~2.0.1",
"insert-module-globals": "^6.2.0",
"insert-module-globals": "^6.4.0",
"isarray": "0.0.1",
"labeled-stream-splicer": "^1.0.0",
"module-deps": "^3.7.7",
"os-browserify": "~0.1.1",
"parents": "^1.0.1",
"path-browserify": "~0.0.0",
"process": "^0.10.0",
"process": "~0.11.0",
"punycode": "^1.3.2",
"querystring-es3": "~0.2.0",
"read-only-stream": "^1.1.1",
Expand Down
1 change: 1 addition & 0 deletions test/bundle.js
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,7 @@ test('bundle', function (t) {

var c = {
setTimeout : setTimeout,
clearTimeout : clearTimeout,
console : console
};
vm.runInNewContext(src, c);
Expand Down
3 changes: 2 additions & 1 deletion test/coffeeify.js
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,8 @@ test('coffeeify with an implicit global', function (t) {
if (err) t.fail(err);
vm.runInNewContext(src, {
console: { log: log },
setTimeout: setTimeout
setTimeout: setTimeout,
clearTimeout: clearTimeout
});
function log (msg) { t.equal(msg, 'eyo') }
});
Expand Down
6 changes: 5 additions & 1 deletion test/external_shim.js
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,11 @@ test('requiring a shimmed module name from an external bundle', function (t) {
b2.bundle(function (err, src2) {
t.plan(1);

var c = {setTimeout: setTimeout, console: console};
var c = {
console: console,
setTimeout: setTimeout,
clearTimeout: clearTimeout
};
vm.runInNewContext(src1 + src2, c);

t.ok(c.require('bundle1').shim === c.require('bundle2').shim);
Expand Down
2 changes: 1 addition & 1 deletion test/global.js
Original file line number Diff line number Diff line change
Expand Up @@ -69,7 +69,7 @@ test('process.nextTick', function (t) {
var b = browserify();
b.add(__dirname + '/global/tick.js');
b.bundle(function (err, src) {
var c = { t: t, setTimeout: setTimeout };
var c = { t: t, setTimeout: setTimeout, clearTimeout: clearTimeout };
vm.runInNewContext(src, c);
});
});
Expand Down
3 changes: 2 additions & 1 deletion test/global_coffeeify.js
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,8 @@ test('coffeeify globally', function (t) {
if (err) t.fail(err);
vm.runInNewContext(src, {
console: { log: log },
setTimeout: setTimeout
setTimeout: setTimeout,
clearTimeout: clearTimeout
});
function log (msg) { t.equal(msg, 'eyo') }
});
Expand Down
6 changes: 5 additions & 1 deletion test/leak.js
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,11 @@ test('leaking information about system paths (process)', function (t) {
t.equal(src.indexOf(dirstring), -1, 'temp directory visible');
t.equal(src.indexOf(process.cwd()), -1, 'cwd directory visible');
t.equal(src.indexOf('/home'), -1, 'home directory visible');
vm.runInNewContext(src, { t: t, setTimeout: setTimeout });
vm.runInNewContext(src, {
t: t,
setTimeout: setTimeout,
clearTimeout: clearTimeout
});
});
});

Expand Down
3 changes: 2 additions & 1 deletion test/process.js
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,8 @@ test('implicit process global', function (t) {
t.equal(two, 2);
t.end();
},
setTimeout: setTimeout
setTimeout: setTimeout,
clearTimeout: clearTimeout
};
vm.runInNewContext(src, c);
});
Expand Down
1 change: 1 addition & 0 deletions test/reset.js
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,7 @@ test('reset', function (t) {
t.ifError(err);
var c = {
setTimeout : setTimeout,
clearTimeout : clearTimeout,
console : console
};
vm.runInNewContext(src, c);
Expand Down
1 change: 1 addition & 0 deletions test/reverse_multi_bundle.js
Original file line number Diff line number Diff line change
Expand Up @@ -38,6 +38,7 @@ test('reverse multi bundle', function (t) {
var src = appSrc + ';' + lazySrc;
var c = {
setTimeout: setTimeout,
clearTimeout: clearTimeout,
t: t
};
vm.runInNewContext(src, c);
Expand Down

0 comments on commit a615650

Please sign in to comment.