Browse Source

assert: improve support for new execution contexts

More detailed information in GH-693
v0.9.5-release
lukebayes 14 years ago
committed by isaacs
parent
commit
ae1b0ca7a5
  1. 2
      lib/assert.js
  2. 8
      test/simple/test-script-context.js

2
lib/assert.js

@ -277,7 +277,7 @@ function expectedException(actual, expected) {
return false; return false;
} }
if (expected instanceof RegExp) { if (Object.prototype.toString.call(expected) == '[object RegExp]') {
return expected.test(actual); return expected.test(actual);
} else if (actual instanceof expected) { } else if (actual instanceof expected) {
return true; return true;

8
test/simple/test-script-context.js

@ -42,7 +42,6 @@ result = script.runInContext(context);
assert.equal(3, context.foo); assert.equal(3, context.foo);
assert.equal('lala', context.thing); assert.equal('lala', context.thing);
// Issue GH-227: // Issue GH-227:
Script.runInNewContext('', null, 'some.js'); Script.runInNewContext('', null, 'some.js');
@ -69,3 +68,10 @@ function isTypeError(o) {
assert.throws(function() { script.runInContext(e); }, isTypeError); assert.throws(function() { script.runInContext(e); }, isTypeError);
assert.throws(function() { vm.runInContext('', e); }, isTypeError); assert.throws(function() { vm.runInContext('', e); }, isTypeError);
})); }));
// Issue GH-693:
common.debug('test RegExp as argument to assert.throws');
script = vm.createScript('var assert = require(\'assert\'); assert.throws(' +
'function() { throw "hello world"; }, /hello/);',
'some.js');
script.runInNewContext({ require : require });

Loading…
Cancel
Save