test: use shorthand properties in vm tests

nodejs · tniessen · Jan 11, 2018 · Jan 11, 2018 · Jan 11, 2018 · Jan 11, 2018
commit a4eaf4566c934da81e6fca4b2ea1a07bd23d0e83
diff --git a/test/parallel/test-vm-access-process-env.js b/test/parallel/test-vm-access-process-env.js
@@ -29,7 +29,7 @@ const assert = require('assert');
 const vm = require('vm');
 
 assert.doesNotThrow(function() {
-  const context = vm.createContext({ process: process });
+  const context = vm.createContext({ process });
   const result = vm.runInContext('process.env["PATH"]', context);
   assert.notStrictEqual(undefined, result);
 });
diff --git a/test/parallel/test-vm-context.js b/test/parallel/test-vm-context.js
@@ -81,7 +81,7 @@ const contextifiedSandboxErrorMsg =
 script = vm.createScript('const assert = require(\'assert\'); assert.throws(' +
                          'function() { throw "hello world"; }, /hello/);',
                          'some.js');
-script.runInNewContext({ require: require });
+script.runInNewContext({ require });
 
 // Issue GH-7529
 script = vm.createScript('delete b');

diff --git a/test/parallel/test-vm-function-declaration.js b/test/parallel/test-vm-function-declaration.js
@@ -24,7 +24,7 @@ require('../common');
 const assert = require('assert');
 
 const vm = require('vm');
-const o = vm.createContext({ console: console });
+const o = vm.createContext({ console });
 
 // Function declaration and expression should both be copied to the
 // sandboxed context.

diff --git a/test/parallel/test-vm-global-define-property.js b/test/parallel/test-vm-global-define-property.js
@@ -36,7 +36,7 @@ const code =
     'f;\n';
 
 const x = {};
-const o = vm.createContext({ console: console, x: x });
+const o = vm.createContext({ console, x });
 
 const res = vm.runInContext(code, o, 'test');
 

diff --git a/test/parallel/test-vm-harmony-symbols.js b/test/parallel/test-vm-harmony-symbols.js
@@ -31,7 +31,7 @@ assert.strictEqual(typeof sandbox.Symbol, 'function');
 assert.notStrictEqual(sandbox.Symbol, Symbol);
 
 // Unless we copy the Symbol constructor explicitly, of course.
-sandbox = { Symbol: Symbol };
+sandbox = { Symbol };
 vm.runInNewContext('this.Symbol = Symbol', sandbox);
 assert.strictEqual(typeof sandbox.Symbol, 'function');
 assert.strictEqual(sandbox.Symbol, Symbol);
diff --git a/test/parallel/test-vm-new-script-new-context.js b/test/parallel/test-vm-new-script-new-context.js
@@ -91,7 +91,7 @@ const Script = require('vm').Script;
 {
   const script = new Script('f.a = 2');
   const f = { a: 1 };
-  script.runInNewContext({ f: f });
+  script.runInNewContext({ f });
   assert.strictEqual(f.a, 2);
 
   assert.throws(() => {

diff --git a/test/parallel/test-vm-proxies.js b/test/parallel/test-vm-proxies.js
@@ -12,7 +12,7 @@ assert.strictEqual(typeof sandbox.Proxy, 'function');
 assert.notStrictEqual(sandbox.Proxy, Proxy);
 
 // Unless we copy the Proxy object explicitly, of course.
-sandbox = { Proxy: Proxy };
+sandbox = { Proxy };
 vm.runInNewContext('this.Proxy = Proxy', sandbox);
 assert.strictEqual(typeof sandbox.Proxy, 'function');
 assert.strictEqual(sandbox.Proxy, Proxy);
diff --git a/test/parallel/test-vm-run-in-new-context.js b/test/parallel/test-vm-run-in-new-context.js
@@ -65,7 +65,7 @@ assert.strictEqual(global.foo, 100);
 
 // Modify an object by reference
 const f = { a: 1 };
-vm.runInNewContext('f.a = 2', { f: f });
+vm.runInNewContext('f.a = 2', { f });
 assert.strictEqual(f.a, 2);
 
 // Use function in context without referencing context

diff --git a/test/parallel/test-vm-timeout.js b/test/parallel/test-vm-timeout.js
@@ -47,7 +47,7 @@ assert.throws(function() {
   const context = {
     log: console.log,
     runInVM: function(timeout) {
-      vm.runInNewContext('while(true) {}', context, { timeout: timeout });
+      vm.runInNewContext('while(true) {}', context, { timeout });
     }
   };
   vm.runInNewContext('runInVM(10)', context, { timeout: 10000 });
@@ -58,7 +58,7 @@ assert.throws(function() {
 assert.throws(function() {
   const context = {
     runInVM: function(timeout) {
-      vm.runInNewContext('while(true) {}', context, { timeout: timeout });
+      vm.runInNewContext('while(true) {}', context, { timeout });
     }
   };
   vm.runInNewContext('runInVM(10000)', context, { timeout: 100 });
@@ -69,9 +69,7 @@ assert.throws(function() {
 assert.throws(function() {
   const context = {
     runInVM: function(timeout) {
-      vm.runInNewContext('throw new Error(\'foobar\')', context, {
-        timeout: timeout
-      });
+      vm.runInNewContext('throw new Error(\'foobar\')', context, { timeout });
     }
   };
   vm.runInNewContext('runInVM(10000)', context, { timeout: 100000 });