From 9b0c4cd8078ea4023f2020beb4a0c2a4aebeb86f Mon Sep 17 00:00:00 2001 From: Kevin Cox Date: Thu, 1 Dec 2016 11:01:49 -0600 Subject: [PATCH 1/3] test: update test-tls-check-server-identity.js Changed var to const, assert.equal to assert.strictEqual, and used a template string for error output. --- .../test-tls-check-server-identity.js | 20 +++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/test/parallel/test-tls-check-server-identity.js b/test/parallel/test-tls-check-server-identity.js index 0732ab3c0fcd67..99eb5074fc2e39 100644 --- a/test/parallel/test-tls-check-server-identity.js +++ b/test/parallel/test-tls-check-server-identity.js @@ -1,16 +1,16 @@ 'use strict'; -var common = require('../common'); -var assert = require('assert'); -var util = require('util'); +const common = require('../common'); +const assert = require('assert'); +const util = require('util'); if (!common.hasCrypto) { common.skip('missing crypto'); return; } -var tls = require('tls'); +const tls = require('tls'); -var tests = [ +const tests = [ // False-y values. { host: false, @@ -253,9 +253,9 @@ var tests = [ ]; tests.forEach(function(test, i) { - var err = tls.checkServerIdentity(test.host, test.cert); - assert.equal(err && err.reason, - test.error, - 'Test#' + i + ' failed: ' + util.inspect(test) + '\n' + - test.error + ' != ' + (err && err.reason)); + const err = tls.checkServerIdentity(test.host, test.cert); + assert.strictEqual(err && err.reason, + test.error, + `Test# ${i} failed: ${util.inspect(test)} \n + ${test.error} != ${(err && err.reason)}`); }); From a55a9ac57d5de224f437d178926cbcf6f839b3e3 Mon Sep 17 00:00:00 2001 From: Kevin Cox Date: Mon, 5 Dec 2016 14:49:15 -0800 Subject: [PATCH 2/3] test: update test-tls-check-server-identity.js Converted multi-line string template literals to string concatentation. --- test/parallel/test-tls-check-server-identity.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/test/parallel/test-tls-check-server-identity.js b/test/parallel/test-tls-check-server-identity.js index 99eb5074fc2e39..f8dc002bfe28c9 100644 --- a/test/parallel/test-tls-check-server-identity.js +++ b/test/parallel/test-tls-check-server-identity.js @@ -256,6 +256,6 @@ tests.forEach(function(test, i) { const err = tls.checkServerIdentity(test.host, test.cert); assert.strictEqual(err && err.reason, test.error, - `Test# ${i} failed: ${util.inspect(test)} \n - ${test.error} != ${(err && err.reason)}`); + `Test# ${i} failed: ${util.inspect(test)} \n` + + `${test.error} != ${(err && err.reason)}`); }); From 7b341c3f02a0fc35a06a464e153ad64f7de7859a Mon Sep 17 00:00:00 2001 From: Kevin Cox Date: Mon, 5 Dec 2016 15:12:24 -0800 Subject: [PATCH 3/3] test: update test-tls-check-server-identity.js Converted multi-line string template literals to string concatentation. --- test/parallel/test-tls-check-server-identity.js | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/test/parallel/test-tls-check-server-identity.js b/test/parallel/test-tls-check-server-identity.js index f8dc002bfe28c9..5c89ef8bf4d425 100644 --- a/test/parallel/test-tls-check-server-identity.js +++ b/test/parallel/test-tls-check-server-identity.js @@ -1,14 +1,15 @@ 'use strict'; const common = require('../common'); -const assert = require('assert'); -const util = require('util'); if (!common.hasCrypto) { common.skip('missing crypto'); return; } -const tls = require('tls'); +const assert = require('assert'); +const util = require('util'); + +const tls = require('tls'); const tests = [ // False-y values.