test: upgrade tests to work with master’s common

PR-URL: nodejs#14459 Reviewed-By: Refael Ackermann <refack@gmail.com>
addaleax · Jul 27, 2017 · 1813467 · 1813467
1 parent d89bb1c
commit 1813467
Show file tree

Hide file tree

Showing 11 changed files with 27 additions and 31 deletions.
diff --git a/test/parallel/test-assert-fail.js b/test/parallel/test-assert-fail.js
@@ -23,7 +23,7 @@ assert.throws(
     code: 'ERR_ASSERTION',
     type: assert.AssertionError,
     operator: undefined,
-    actual: undefined,
+    actual: 'custom message',
     expected: undefined,
     message: 'custom message'
   })

diff --git a/test/parallel/test-assert.js b/test/parallel/test-assert.js
@@ -143,11 +143,7 @@ assert.throws(makeBlock(a.deepEqual, /a/igm, /a/im),
 {
   const re1 = /a/g;
   re1.lastIndex = 3;
-  assert.doesNotThrow(makeBlock(a.deepEqual, re1, /a/g),
-                      common.expectsError({
-                        code: 'ERR_ASSERTION',
-                        message: /^\/a\/g deepEqual \/a\/g$/
-                      }));
+  assert.doesNotThrow(makeBlock(a.deepEqual, re1, /a/g));
 }
 
 assert.doesNotThrow(makeBlock(a.deepEqual, 4, '4'), 'deepEqual(4, \'4\')');

diff --git a/test/parallel/test-child-process-spawnsync-validation-errors.js b/test/parallel/test-child-process-spawnsync-validation-errors.js
@@ -186,7 +186,7 @@ if (!common.isWindows) {
   // Validate the killSignal option
   const typeErr = /^TypeError: "killSignal" must be a string or number$/;
   const unknownSignalErr =
-    common.expectsError({ code: 'ERR_UNKNOWN_SIGNAL' });
+    common.expectsError({ code: 'ERR_UNKNOWN_SIGNAL' }, 17);
 
   pass('killSignal', undefined);
   pass('killSignal', null);

diff --git a/test/parallel/test-child-process-validate-stdio.js b/test/parallel/test-child-process-validate-stdio.js
@@ -6,7 +6,7 @@ const assert = require('assert');
 const _validateStdio = require('internal/child_process')._validateStdio;
 
 const expectedError =
-  common.expectsError({code: 'ERR_INVALID_OPT_VALUE', type: TypeError});
+  common.expectsError({ code: 'ERR_INVALID_OPT_VALUE', type: TypeError }, 2);
 
 // should throw if string and not ignore, pipe, or inherit
 assert.throws(() => _validateStdio('foo'), expectedError);
@@ -27,7 +27,7 @@ assert.throws(() => _validateStdio(600), expectedError);
 // should throw if stdio has ipc and sync is true
 const stdio2 = ['ipc', 'ipc', 'ipc'];
 assert.throws(() => _validateStdio(stdio2, true),
-              common.expectsError({code: 'ERR_IPC_SYNC_FORK', type: Error}));
+              common.expectsError({ code: 'ERR_IPC_SYNC_FORK', type: Error }));
 
 {
   const stdio3 = [process.stdin, process.stdout, process.stderr];

diff --git a/test/parallel/test-internal-errors.js b/test/parallel/test-internal-errors.js
@@ -166,7 +166,7 @@ assert.throws(() => {
   }, common.expectsError({ code: 'TEST_ERROR_1', type: RangeError }));
 }, common.expectsError({
   code: 'ERR_ASSERTION',
-  message: /^.+ is not the expected type \S/
+  message: /^.+ is not instance of \S/
 }));
 
 assert.throws(() => {

diff --git a/test/parallel/test-process-emitwarning.js b/test/parallel/test-process-emitwarning.js
@@ -58,7 +58,7 @@ warningThrowToString.toString = function() {
 process.emitWarning(warningThrowToString);
 
 const expectedError =
-  common.expectsError({code: 'ERR_INVALID_ARG_TYPE', type: TypeError});
+  common.expectsError({ code: 'ERR_INVALID_ARG_TYPE', type: TypeError }, 11);
 
 // TypeError is thrown on invalid input
 assert.throws(() => process.emitWarning(1), expectedError);

diff --git a/test/parallel/test-url-format-whatwg.js b/test/parallel/test-url-format-whatwg.js
@@ -25,7 +25,7 @@ assert.strictEqual(
     code: 'ERR_INVALID_ARG_TYPE',
     type: TypeError,
     message: 'The "options" argument must be of type object'
-  });
+  }, 4);
   assert.throws(() => url.format(myURL, true), expectedErr);
   assert.throws(() => url.format(myURL, 1), expectedErr);
   assert.throws(() => url.format(myURL, 'test'), expectedErr);
@@ -36,76 +36,76 @@ assert.strictEqual(
 // Any truthy value will be treated as true.
 
 assert.strictEqual(
-  url.format(myURL, {fragment: false}),
+  url.format(myURL, { fragment: false }),
   'http://xn--lck1c3crb1723bpq4a.com/a?a=b'
 );
 
 assert.strictEqual(
-  url.format(myURL, {fragment: ''}),
+  url.format(myURL, { fragment: '' }),
   'http://xn--lck1c3crb1723bpq4a.com/a?a=b'
 );
 
 assert.strictEqual(
-  url.format(myURL, {fragment: 0}),
+  url.format(myURL, { fragment: 0 }),
   'http://xn--lck1c3crb1723bpq4a.com/a?a=b'
 );
 
 assert.strictEqual(
-  url.format(myURL, {fragment: 1}),
+  url.format(myURL, { fragment: 1 }),
   'http://xn--lck1c3crb1723bpq4a.com/a?a=b#c'
 );
 
 assert.strictEqual(
-  url.format(myURL, {fragment: {}}),
+  url.format(myURL, { fragment: {} }),
   'http://xn--lck1c3crb1723bpq4a.com/a?a=b#c'
 );
 
 assert.strictEqual(
-  url.format(myURL, {search: false}),
+  url.format(myURL, { search: false }),
   'http://xn--lck1c3crb1723bpq4a.com/a#c'
 );
 
 assert.strictEqual(
-  url.format(myURL, {search: ''}),
+  url.format(myURL, { search: '' }),
   'http://xn--lck1c3crb1723bpq4a.com/a#c'
 );
 
 assert.strictEqual(
-  url.format(myURL, {search: 0}),
+  url.format(myURL, { search: 0 }),
   'http://xn--lck1c3crb1723bpq4a.com/a#c'
 );
 
 assert.strictEqual(
-  url.format(myURL, {search: 1}),
+  url.format(myURL, { search: 1 }),
   'http://xn--lck1c3crb1723bpq4a.com/a?a=b#c'
 );
 
 assert.strictEqual(
-  url.format(myURL, {search: {}}),
+  url.format(myURL, { search: {} }),
   'http://xn--lck1c3crb1723bpq4a.com/a?a=b#c'
 );
 
 assert.strictEqual(
-  url.format(myURL, {unicode: true}),
+  url.format(myURL, { unicode: true }),
   'http://理容ナカムラ.com/a?a=b#c'
 );
 
 assert.strictEqual(
-  url.format(myURL, {unicode: 1}),
+  url.format(myURL, { unicode: 1 }),
   'http://理容ナカムラ.com/a?a=b#c'
 );
 
 assert.strictEqual(
-  url.format(myURL, {unicode: {}}),
+  url.format(myURL, { unicode: {} }),
   'http://理容ナカムラ.com/a?a=b#c'
 );
 
 assert.strictEqual(
-  url.format(myURL, {unicode: false}),
+  url.format(myURL, { unicode: false }),
   'http://xn--lck1c3crb1723bpq4a.com/a?a=b#c'
 );
 
 assert.strictEqual(
-  url.format(myURL, {unicode: 0}),
+  url.format(myURL, { unicode: 0 }),
   'http://xn--lck1c3crb1723bpq4a.com/a?a=b#c'
 );
diff --git a/test/parallel/test-whatwg-url-domainto.js b/test/parallel/test-whatwg-url-domainto.js
@@ -13,7 +13,7 @@ const wptToASCIITests = require('../fixtures/url-toascii.js');
 
 {
   const expectedError = common.expectsError(
-      { code: 'ERR_MISSING_ARGS', type: TypeError });
+      { code: 'ERR_MISSING_ARGS', type: TypeError }, 2);
   assert.throws(() => domainToASCII(), expectedError);
   assert.throws(() => domainToUnicode(), expectedError);
   assert.strictEqual(domainToASCII(undefined), 'undefined');

diff --git a/test/parallel/test-whatwg-url-parsing.js b/test/parallel/test-whatwg-url-parsing.js
@@ -26,7 +26,7 @@ const failureTests = tests.filter((test) => test.failure).concat([
 ]);
 
 const expectedError = common.expectsError(
-    { code: 'ERR_INVALID_URL', type: TypeError });
+    { code: 'ERR_INVALID_URL', type: TypeError }, 102);
 
 for (const test of failureTests) {
   assert.throws(

diff --git a/test/parallel/test-whatwg-url-searchparams-constructor.js b/test/parallel/test-whatwg-url-searchparams-constructor.js
@@ -210,7 +210,7 @@ function makeIterableFunc(array) {
     code: 'ERR_INVALID_TUPLE',
     type: TypeError,
     message: 'Each query pair must be an iterable [name, value] tuple'
-  });
+  }, 6);
 
   let params;
   params = new URLSearchParams(undefined);

diff --git a/test/parallel/test-whatwg-url-searchparams.js b/test/parallel/test-whatwg-url-searchparams.js
@@ -76,7 +76,7 @@ sp.forEach(function() {
   const callbackErr = common.expectsError({
     code: 'ERR_INVALID_CALLBACK',
     type: TypeError
-  });
+  }, 2);
   assert.throws(() => sp.forEach(), callbackErr);
   assert.throws(() => sp.forEach(1), callbackErr);
 }