From 0acaf9d8ff3e96fd2a71c786c8ee883c2b2006d2 Mon Sep 17 00:00:00 2001 From: Brian C Date: Tue, 16 Jul 2019 18:41:54 -0500 Subject: [PATCH] Fix compare (#1923) * Fix deepEqual compare In node 12 assert.deepEqual against a buffer & array no longer passes if the values are the same. This makes sense. Updated the test to not use deepEqual in this case. --- lib/native/client.js | 2 +- test/unit/utils-tests.js | 35 ++++++++++++++++++----------------- 2 files changed, 19 insertions(+), 18 deletions(-) diff --git a/lib/native/client.js b/lib/native/client.js index 0084d0250..6859bc2cc 100644 --- a/lib/native/client.js +++ b/lib/native/client.js @@ -7,7 +7,7 @@ * README.md file in the root directory of this source tree. */ -// eslint-disable-next-line node/no-missing-require +// eslint-disable-next-line var Native = require('pg-native') var TypeOverrides = require('../type-overrides') var semver = require('semver') diff --git a/test/unit/utils-tests.js b/test/unit/utils-tests.js index 0bca25af7..4308f7a18 100644 --- a/test/unit/utils-tests.js +++ b/test/unit/utils-tests.js @@ -29,22 +29,22 @@ test('EventEmitter.once', function (t) { test('normalizing query configs', function () { var config - var callback = function () {} + var callback = function () { } - config = utils.normalizeQueryConfig({text: 'TEXT'}) - assert.same(config, {text: 'TEXT'}) + config = utils.normalizeQueryConfig({ text: 'TEXT' }) + assert.same(config, { text: 'TEXT' }) - config = utils.normalizeQueryConfig({text: 'TEXT'}, [10]) - assert.deepEqual(config, {text: 'TEXT', values: [10]}) + config = utils.normalizeQueryConfig({ text: 'TEXT' }, [10]) + assert.deepEqual(config, { text: 'TEXT', values: [10] }) - config = utils.normalizeQueryConfig({text: 'TEXT', values: [10]}) - assert.deepEqual(config, {text: 'TEXT', values: [10]}) + config = utils.normalizeQueryConfig({ text: 'TEXT', values: [10] }) + assert.deepEqual(config, { text: 'TEXT', values: [10] }) config = utils.normalizeQueryConfig('TEXT', [10], callback) - assert.deepEqual(config, {text: 'TEXT', values: [10], callback: callback}) + assert.deepEqual(config, { text: 'TEXT', values: [10], callback: callback }) - config = utils.normalizeQueryConfig({text: 'TEXT', values: [10]}, callback) - assert.deepEqual(config, {text: 'TEXT', values: [10], callback: callback}) + config = utils.normalizeQueryConfig({ text: 'TEXT', values: [10] }, callback) + assert.deepEqual(config, { text: 'TEXT', values: [10], callback: callback }) }) test('prepareValues: buffer prepared properly', function () { @@ -57,7 +57,8 @@ test('prepareValues: Uint8Array prepared properly', function () { var buf = new Uint8Array([1, 2, 3]).subarray(1, 2) var out = utils.prepareValue(buf) assert.ok(Buffer.isBuffer(out)) - assert.deepEqual(out, [2]) + assert.equal(out.length, 1) + assert.deepEqual(out[0], 2) }) test('prepareValues: date prepared properly', function () { @@ -167,12 +168,12 @@ test('prepareValue: objects with simple toPostgres prepared properly', function assert.strictEqual(out, 'zomgcustom!') }) -test('prepareValue: buffer array prepared properly', function() { - var buffer1 = Buffer.from('dead', 'hex') - var buffer2 = Buffer.from('beef', 'hex') - var out = utils.prepareValue([buffer1, buffer2]) - assert.strictEqual(out, '{\\\\xdead,\\\\xbeef}') - }) +test('prepareValue: buffer array prepared properly', function () { + var buffer1 = Buffer.from('dead', 'hex') + var buffer2 = Buffer.from('beef', 'hex') + var out = utils.prepareValue([buffer1, buffer2]) + assert.strictEqual(out, '{\\\\xdead,\\\\xbeef}') +}) test('prepareValue: objects with complex toPostgres prepared properly', function () { var buf = Buffer.from('zomgcustom!')