Skip to content

test: refactored context type err message to regex #12596

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
wants to merge 3 commits into from
+13 −4
Closed

test: refactored context type err message to regex #12596

Changes from 1 commit
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
24f9ae4
test: refactored context type err message to regex
Apr 22, 2017
1c7c87f
test: changed throw for runInNewContext to regex
Apr 22, 2017
c33fac3
test: changed type error throws to regex
Apr 22, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
24 changes: 21 additions & 3 deletions test/parallel/test-vm-context.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -62,9 +62,27 @@ assert.ok(gh1140Exception,
'expected exception from runInContext signature test');

// GH-558, non-context argument segfaults / raises assertion
[undefined, null, 0, 0.0, '', {}, []].forEach(function(e) {
assert.throws(function() { script.runInContext(e); }, TypeError);
assert.throws(function() { vm.runInContext('', e); }, TypeError);
const nonContextualSandboxErrorMsg =
/^TypeError: contextifiedSandbox argument must be an object\.$/;

[undefined, null, 0, 0.0, ''].forEach(function(e) {

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Can you remove this blank line.

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Unnecessary whitespace here and in the same place in the second section.

assert.throws(function() { script.runInContext(e); },
nonContextualSandboxErrorMsg);
assert.throws(function() { vm.runInContext('', e); },
nonContextualSandboxErrorMsg);
});

// GH-558, non-context argument segfaults / raises assertion
const contextifiedSandboxErrorMsg =
/^TypeError: sandbox argument must have been converted to a context\.$/;

[{}, []].forEach(function(e) {

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Same comment here about the blank line.

Copy link
Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@cjihrig that was my original thought, but i figured I'd skip the type checking and be more direct. I still have one more PR for this file and could change it then. What do you recommend?

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Instead of two separate loops, you could do the following with nested arrays:

[[undefined, nonContextualSandboxErrorMsg], etc.].forEach()

Then, you pass the first element to runInContext, and use the second element as the expected error.

Copy link
Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Will do. Thanks!

assert.throws(function() { script.runInContext(e); },
contextifiedSandboxErrorMsg);
assert.throws(function() { vm.runInContext('', e); },
contextifiedSandboxErrorMsg);
});

// Issue GH-693:
Expand Down