From 2b788dde633f9c98f956571f2d23497ce5caceb5 Mon Sep 17 00:00:00 2001 From: jeyanthinath Date: Tue, 2 May 2017 14:55:10 +0530 Subject: [PATCH 1/4] test-vm-is-context.js : changed the assert.thows object to regex and added score for sanbox object --- test/parallel/test-vm-is-context.js | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/test/parallel/test-vm-is-context.js b/test/parallel/test-vm-is-context.js index 1c5a2244323cc3..2d53d57599784e 100644 --- a/test/parallel/test-vm-is-context.js +++ b/test/parallel/test-vm-is-context.js @@ -26,7 +26,7 @@ const vm = require('vm'); assert.throws(function() { vm.isContext('string is not supported'); -}, TypeError); +}, /TypeError/); assert.strictEqual(vm.isContext({}), false); assert.strictEqual(vm.isContext([]), false); @@ -34,6 +34,8 @@ assert.strictEqual(vm.isContext([]), false); assert.strictEqual(vm.isContext(vm.createContext()), true); assert.strictEqual(vm.isContext(vm.createContext([])), true); -const sandbox = { foo: 'bar' }; -vm.createContext(sandbox); -assert.strictEqual(vm.isContext(sandbox), true); +{ + const sandbox = { foo: 'bar' }; + vm.createContext(sandbox); + assert.strictEqual(vm.isContext(sandbox), true); +} From 6c199caf896e865a1776dc50704d129645e50c6a Mon Sep 17 00:00:00 2001 From: jeyanthinath Date: Tue, 2 May 2017 16:16:53 +0530 Subject: [PATCH 2/4] vm: changed the error from constructor to regular expression assert.throws initally throws the TypeError constructor and now replacing that with regular expression --- test/parallel/test-vm-is-context.js | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/test/parallel/test-vm-is-context.js b/test/parallel/test-vm-is-context.js index 2d53d57599784e..c70b7cea245429 100644 --- a/test/parallel/test-vm-is-context.js +++ b/test/parallel/test-vm-is-context.js @@ -26,7 +26,7 @@ const vm = require('vm'); assert.throws(function() { vm.isContext('string is not supported'); -}, /TypeError/); +}, /^TypeError: sandbox must be an object$/); assert.strictEqual(vm.isContext({}), false); assert.strictEqual(vm.isContext([]), false); @@ -34,8 +34,6 @@ assert.strictEqual(vm.isContext([]), false); assert.strictEqual(vm.isContext(vm.createContext()), true); assert.strictEqual(vm.isContext(vm.createContext([])), true); -{ const sandbox = { foo: 'bar' }; vm.createContext(sandbox); assert.strictEqual(vm.isContext(sandbox), true); -} From 96fe0d8ab1c7e457a61af904b93a82b292cf9737 Mon Sep 17 00:00:00 2001 From: jeyanthinath Date: Tue, 2 May 2017 16:31:57 +0530 Subject: [PATCH 3/4] vm: changed the error from constructor to regular expression assert.throws initally throws the TypeError constructor and now replacing that with regular expression --- test/parallel/test-vm-is-context.js | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/test/parallel/test-vm-is-context.js b/test/parallel/test-vm-is-context.js index c70b7cea245429..6c3b783c5e9c33 100644 --- a/test/parallel/test-vm-is-context.js +++ b/test/parallel/test-vm-is-context.js @@ -34,6 +34,6 @@ assert.strictEqual(vm.isContext([]), false); assert.strictEqual(vm.isContext(vm.createContext()), true); assert.strictEqual(vm.isContext(vm.createContext([])), true); - const sandbox = { foo: 'bar' }; - vm.createContext(sandbox); - assert.strictEqual(vm.isContext(sandbox), true); +const sandbox = { foo: 'bar' }; +vm.createContext(sandbox); +assert.strictEqual(vm.isContext(sandbox), true); From ade9260527292a409e4d426f45ca1a971e8c60ee Mon Sep 17 00:00:00 2001 From: jeyanthinath Date: Tue, 2 May 2017 16:34:19 +0530 Subject: [PATCH 4/4] test: add regex check in test-vm-is-context Use a regex to validate the error message. --- test/parallel/test-vm-is-context.js | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/test/parallel/test-vm-is-context.js b/test/parallel/test-vm-is-context.js index c70b7cea245429..6c3b783c5e9c33 100644 --- a/test/parallel/test-vm-is-context.js +++ b/test/parallel/test-vm-is-context.js @@ -34,6 +34,6 @@ assert.strictEqual(vm.isContext([]), false); assert.strictEqual(vm.isContext(vm.createContext()), true); assert.strictEqual(vm.isContext(vm.createContext([])), true); - const sandbox = { foo: 'bar' }; - vm.createContext(sandbox); - assert.strictEqual(vm.isContext(sandbox), true); +const sandbox = { foo: 'bar' }; +vm.createContext(sandbox); +assert.strictEqual(vm.isContext(sandbox), true);