1berry/nodejs
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

test: fix and refactor test-http-invalid-urls

Browse Source 
When the second argument to `assert.throws()` is a string, it is not
treated as the expected error message but rather the message that the
assertion should display if no error is thrown. Ths change fixes that
error in `test-http-invalid-urls.js`.

Instead of skipping the test when there is no crypto, the test is now
run but with `http` only. `https` is skipped.

Logging was fixed. Previously, errors would be written out as being in
the `[object Object]` module rather than `http` or `https`.

PR-URL: https://github.com/nodejs/node/pull/15678
Reviewed-By: Luigi Pinca <luigipinca@gmail.com>
Reviewed-By: Yuta Hiroto <hello@about-hiroppy.com>
Reviewed-By: Colin Ihrig <cjihrig@gmail.com>
Reviewed-By: James M Snell <jasnell@gmail.com>
Reviewed-By: Ruben Bridgewater <ruben@bridgewater.de>
This commit is contained in:
Rich Trott 2017-09-28 22:59:14 -07:00 committed by Ruben Bridgewater
parent da40050b59
commit 2e215f169a
No known key found for this signature in database
GPG Key ID: F07496B3EB3C1762
1 changed files with 15 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
test/parallel/test-http-invalid-urls.js
View File

@ -1,20 +1,25 @@
/* eslint-disable crypto-check */
'use strict'; 'use strict';
const common = require('../common'); const common = require('../common');
if (!common.hasCrypto)
common.skip('missing crypto');
const assert = require('assert');
const http = require('http'); const http = require('http');
const https = require('https'); const modules = { 'http': http };
const error = 'Unable to determine the domain name';
if (common.hasCrypto) {
const https = require('https');
modules.https = https;
}
function test(host) { function test(host) {
['get', 'request'].forEach((method) => { ['get', 'request'].forEach((fn) => {
[http, https].forEach((module) => { Object.keys(modules).forEach((module) => {
assert.throws(() => module[method](host, () => { const doNotCall = common.mustNotCall(
throw new Error(`${module}.${method} should not connect to ${host}`); `${module}.${fn} should not connect to ${host}`
}), error); );
const throws = () => { modules[module][fn](host, doNotCall); };
common.expectsError(throws, { code: 'ERR_INVALID_DOMAIN_NAME' });
}); });
}); });
} }