From 2667a541d327192d892143d34004bed41548bf71 Mon Sep 17 00:00:00 2001 From: Dan Aprahamian Date: Mon, 18 Dec 2017 12:09:17 -0500 Subject: [PATCH] chore(assign): replace assign with native Object.assign Fixes NODE-1227 --- lib/connection/pool.js | 3 +- lib/topologies/server.js | 5 +- lib/utils.js | 32 ------- .../mongos_mocks/mixed_seed_list_tests.js | 11 ++- .../mongos_mocks/multiple_proxies_tests.js | 9 +- .../mongos_mocks/proxy_failover_tests.js | 13 ++- .../proxy_read_preference_tests.js | 13 ++- .../single_proxy_connection_tests.js | 9 +- .../functional/rs_mocks/add_remove_tests.js | 73 ++++++++-------- .../rs_mocks/all_servers_close_tests.js | 17 ++-- .../functional/rs_mocks/connection_tests.js | 83 +++++++++---------- .../functional/rs_mocks/failover_tests.js | 41 +++++---- .../rs_mocks/maintanance_mode_tests.js | 17 ++-- .../functional/rs_mocks/monitoring_tests.js | 29 ++++--- .../rs_mocks/no_primary_found_tests.js | 19 ++--- .../functional/rs_mocks/operation_tests.js | 17 ++-- .../rs_mocks/primary_loses_network_tests.js | 23 +++-- .../rs_mocks/read_preferences_tests.js | 67 ++++++++------- .../mongos_topology_tests.js | 7 +- .../replset_topology_tests.js | 19 ++--- .../single_topology_tests.js | 5 +- .../single_mocks/compression_tests.js | 13 ++- .../functional/single_mocks/timeout_tests.js | 13 ++- test/tests/unit/common.js | 17 ++-- test/tests/unit/mongos/sessions_tests.js | 9 +- test/tests/unit/single/sessions_tests.js | 29 ++++--- 26 files changed, 268 insertions(+), 325 deletions(-) diff --git a/lib/connection/pool.js b/lib/connection/pool.js index f6e215484..3fdd8076d 100644 --- a/lib/connection/pool.js +++ b/lib/connection/pool.js @@ -9,7 +9,6 @@ var inherits = require('util').inherits, f = require('util').format, Query = require('./commands').Query, CommandResult = require('./command_result'), - assign = require('../utils').assign, MESSAGE_HEADER_SIZE = require('../wireprotocol/shared').MESSAGE_HEADER_SIZE, opcodes = require('../wireprotocol/shared').opcodes, compress = require('../wireprotocol/compression').compress, @@ -80,7 +79,7 @@ var Pool = function(topology, options) { this.topology = topology; // Add the options - this.options = assign( + this.options = Object.assign( { // Host and port settings host: 'localhost', diff --git a/lib/topologies/server.js b/lib/topologies/server.js index 2368f97cd..3a671842d 100644 --- a/lib/topologies/server.js +++ b/lib/topologies/server.js @@ -15,7 +15,6 @@ var inherits = require('util').inherits, ThreeTwoWireProtocolSupport = require('../wireprotocol/3_2_support'), BasicCursor = require('../cursor'), sdam = require('./shared'), - assign = require('../utils').assign, createClientInfo = require('./shared').createClientInfo, createCompressionInfo = require('./shared').createCompressionInfo, resolveClusterTime = require('./shared').resolveClusterTime, @@ -534,7 +533,7 @@ Server.prototype.connect = function(options) { } // Create a pool - self.s.pool = new Pool(this, assign(self.s.options, options, { bson: this.s.bson })); + self.s.pool = new Pool(this, Object.assign(self.s.options, options, { bson: this.s.bson })); // Set up listeners self.s.pool.on('close', eventHandler(self, 'close')); @@ -657,7 +656,7 @@ Server.prototype.command = function(ns, cmd, options, callback) { if (result) return callback(result); // Clone the options - options = assign({}, options, { wireProtocolCommand: false }); + options = Object.assign({}, options, { wireProtocolCommand: false }); // Debug log if (self.s.logger.isDebug()) diff --git a/lib/utils.js b/lib/utils.js index 8f3749ccb..f42c20fd4 100644 --- a/lib/utils.js +++ b/lib/utils.js @@ -2,37 +2,6 @@ const crypto = require('crypto'); -/** - * Copy the values of all enumerable own properties from one or more - * source objects to a target object. It will return the target object. - */ -const assign = Object.assign - ? Object.assign - : function assign(target) { - if (target === undefined || target === null) { - throw new TypeError('Cannot convert first argument to object'); - } - - var to = Object(target); - for (var i = 1; i < arguments.length; i++) { - var nextSource = arguments[i]; - if (nextSource === undefined || nextSource === null) { - continue; - } - - var keysArray = Object.keys(Object(nextSource)); - for (var nextIndex = 0, len = keysArray.length; nextIndex < len; nextIndex++) { - var nextKey = keysArray[nextIndex]; - var desc = Object.getOwnPropertyDescriptor(nextSource, nextKey); - if (desc !== undefined && desc.enumerable) { - to[nextKey] = nextSource[nextKey]; - } - } - } - - return to; - }; - const uuidV4 = () => { const result = crypto.randomBytes(16); result[6] = (result[6] & 0x0f) | 0x40; @@ -41,6 +10,5 @@ const uuidV4 = () => { }; module.exports = { - assign: assign, uuidV4: uuidV4 }; diff --git a/test/tests/functional/mongos_mocks/mixed_seed_list_tests.js b/test/tests/functional/mongos_mocks/mixed_seed_list_tests.js index 72ce7dd27..e31e98823 100644 --- a/test/tests/functional/mongos_mocks/mixed_seed_list_tests.js +++ b/test/tests/functional/mongos_mocks/mixed_seed_list_tests.js @@ -1,6 +1,5 @@ 'use strict'; var expect = require('chai').expect, - assign = require('../../../../lib/utils').assign, co = require('co'), mock = require('../../../mock'); @@ -25,12 +24,12 @@ describe('Mongos Mixed Seed List (mocks)', function() { var mongos2 = null; // Default message fields - var defaultFields = assign({}, mock.DEFAULT_ISMASTER, { + var defaultFields = Object.assign({}, mock.DEFAULT_ISMASTER, { msg: 'isdbgrid' }); // Default message fields - var defaultRSFields = assign({}, mock.DEFAULT_ISMASTER, { + var defaultRSFields = Object.assign({}, mock.DEFAULT_ISMASTER, { setName: 'rs', setVersion: 1, electionId: new ObjectId(), @@ -39,7 +38,7 @@ describe('Mongos Mixed Seed List (mocks)', function() { }); // Primary server states - var serverIsMaster = [assign({}, defaultFields), assign({}, defaultRSFields)]; + var serverIsMaster = [Object.assign({}, defaultFields), Object.assign({}, defaultRSFields)]; // Boot the mock co(function*() { @@ -116,7 +115,7 @@ describe('Mongos Mixed Seed List (mocks)', function() { var mongos2 = null; // Default message fields - var defaultRSFields = assign({}, mock.DEFAULT_ISMASTER, { + var defaultRSFields = Object.assign({}, mock.DEFAULT_ISMASTER, { setName: 'rs', setVersion: 1, electionId: new ObjectId(), @@ -125,7 +124,7 @@ describe('Mongos Mixed Seed List (mocks)', function() { }); // Primary server states - var serverIsMaster = [assign({}, defaultRSFields), assign({}, defaultRSFields)]; + var serverIsMaster = [Object.assign({}, defaultRSFields), Object.assign({}, defaultRSFields)]; // Boot the mock co(function*() { diff --git a/test/tests/functional/mongos_mocks/multiple_proxies_tests.js b/test/tests/functional/mongos_mocks/multiple_proxies_tests.js index eb44129d2..1cc8a4e57 100644 --- a/test/tests/functional/mongos_mocks/multiple_proxies_tests.js +++ b/test/tests/functional/mongos_mocks/multiple_proxies_tests.js @@ -1,6 +1,5 @@ 'use strict'; var expect = require('chai').expect, - assign = require('../../../../lib/utils').assign, co = require('co'), mock = require('../../../mock'); @@ -23,12 +22,12 @@ describe('Mongos Multiple Proxies (mocks)', function() { var mongos2 = null; // Default message fields - var defaultFields = assign({}, mock.DEFAULT_ISMASTER, { + var defaultFields = Object.assign({}, mock.DEFAULT_ISMASTER, { msg: 'isdbgrid' }); // Primary server states - var serverIsMaster = [assign({}, defaultFields)]; + var serverIsMaster = [Object.assign({}, defaultFields)]; // Boot the mock co(function*() { mongos1 = yield mock.createServer(11000, 'localhost'); @@ -107,12 +106,12 @@ describe('Mongos Multiple Proxies (mocks)', function() { var Mongos = this.configuration.mongo.Mongos; // Default message fields - var defaultFields = assign({}, mock.DEFAULT_ISMASTER, { + var defaultFields = Object.assign({}, mock.DEFAULT_ISMASTER, { msg: 'isdbgrid' }); // Primary server states - var serverIsMaster = [assign({}, defaultFields)]; + var serverIsMaster = [Object.assign({}, defaultFields)]; // Boot the mock co(function*() { const mongos1 = yield mock.createServer(11002, 'localhost'); diff --git a/test/tests/functional/mongos_mocks/proxy_failover_tests.js b/test/tests/functional/mongos_mocks/proxy_failover_tests.js index 652a292e7..0f40e4885 100644 --- a/test/tests/functional/mongos_mocks/proxy_failover_tests.js +++ b/test/tests/functional/mongos_mocks/proxy_failover_tests.js @@ -1,6 +1,5 @@ 'use strict'; var expect = require('chai').expect, - assign = require('../../../../lib/utils').assign, co = require('co'), mock = require('../../../mock'); @@ -19,12 +18,12 @@ describe('Mongos Proxy Failover (mocks)', function() { var Mongos = this.configuration.mongo.Mongos; // Default message fields - var defaultFields = assign({}, mock.DEFAULT_ISMASTER, { + var defaultFields = Object.assign({}, mock.DEFAULT_ISMASTER, { msg: 'isdbgrid' }); // Primary server states - var serverIsMaster = [assign({}, defaultFields)]; + var serverIsMaster = [Object.assign({}, defaultFields)]; // Boot the mock co(function*() { const mongos1 = yield mock.createServer(52007, 'localhost'); @@ -98,12 +97,12 @@ describe('Mongos Proxy Failover (mocks)', function() { var currentStep = 0; // Default message fields - var defaultFields = assign({}, mock.DEFAULT_ISMASTER, { + var defaultFields = Object.assign({}, mock.DEFAULT_ISMASTER, { msg: 'isdbgrid' }); // Primary server states - var serverIsMaster = [assign({}, defaultFields)]; + var serverIsMaster = [Object.assign({}, defaultFields)]; // Boot the mock co(function*() { const mongos1 = yield mock.createServer(52009, 'localhost'); @@ -198,12 +197,12 @@ describe('Mongos Proxy Failover (mocks)', function() { var currentStep = 0; // Default message fields - var defaultFields = assign({}, mock.DEFAULT_ISMASTER, { + var defaultFields = Object.assign({}, mock.DEFAULT_ISMASTER, { msg: 'isdbgrid' }); // Primary server states - var serverIsMaster = [assign({}, defaultFields)]; + var serverIsMaster = [Object.assign({}, defaultFields)]; // Boot the mock co(function*() { const mongos1 = yield mock.createServer(52011, 'localhost'); diff --git a/test/tests/functional/mongos_mocks/proxy_read_preference_tests.js b/test/tests/functional/mongos_mocks/proxy_read_preference_tests.js index bb223eb23..ce33e3446 100644 --- a/test/tests/functional/mongos_mocks/proxy_read_preference_tests.js +++ b/test/tests/functional/mongos_mocks/proxy_read_preference_tests.js @@ -1,6 +1,5 @@ 'use strict'; var expect = require('chai').expect, - assign = require('../../../../lib/utils').assign, co = require('co'), mock = require('../../../mock'); @@ -21,12 +20,12 @@ describe('Mongos Proxy Read Preference (mocks)', function() { ReadPreference = this.configuration.mongo.ReadPreference; // Default message fields - var defaultFields = assign({}, mock.DEFAULT_ISMASTER, { + var defaultFields = Object.assign({}, mock.DEFAULT_ISMASTER, { msg: 'isdbgrid' }); // Primary server states - var serverIsMaster = [assign({}, defaultFields)]; + var serverIsMaster = [Object.assign({}, defaultFields)]; // Received command on server var command = null; // Boot the mock @@ -102,12 +101,12 @@ describe('Mongos Proxy Read Preference (mocks)', function() { ReadPreference = this.configuration.mongo.ReadPreference; // Default message fields - var defaultFields = assign({}, mock.DEFAULT_ISMASTER, { + var defaultFields = Object.assign({}, mock.DEFAULT_ISMASTER, { msg: 'isdbgrid' }); // Primary server states - var serverIsMaster = [assign({}, defaultFields)]; + var serverIsMaster = [Object.assign({}, defaultFields)]; // Received command on server var command = null; // Boot the mock @@ -182,12 +181,12 @@ describe('Mongos Proxy Read Preference (mocks)', function() { ReadPreference = this.configuration.mongo.ReadPreference; // Default message fields - var defaultFields = assign({}, mock.DEFAULT_ISMASTER, { + var defaultFields = Object.assign({}, mock.DEFAULT_ISMASTER, { msg: 'isdbgrid' }); // Primary server states - var serverIsMaster = [assign({}, defaultFields)]; + var serverIsMaster = [Object.assign({}, defaultFields)]; // Received command on server var command = null; // Boot the mock diff --git a/test/tests/functional/mongos_mocks/single_proxy_connection_tests.js b/test/tests/functional/mongos_mocks/single_proxy_connection_tests.js index e5bcd7a7e..0ca7692df 100644 --- a/test/tests/functional/mongos_mocks/single_proxy_connection_tests.js +++ b/test/tests/functional/mongos_mocks/single_proxy_connection_tests.js @@ -2,7 +2,6 @@ var expect = require('chai').expect, f = require('util').format, co = require('co'), - assign = require('../../../../lib/utils').assign, mock = require('../../../mock'); describe('Mongos Single Proxy Connection (mocks)', function() { @@ -25,12 +24,12 @@ describe('Mongos Single Proxy Connection (mocks)', function() { var stopRespondingPrimary = false; // Default message fields - var defaultFields = assign({}, mock.DEFAULT_ISMASTER, { + var defaultFields = Object.assign({}, mock.DEFAULT_ISMASTER, { msg: 'isdbgrid' }); // Primary server states - var serverIsMaster = [assign({}, defaultFields)]; + var serverIsMaster = [Object.assign({}, defaultFields)]; // Boot the mock co(function*() { @@ -109,12 +108,12 @@ describe('Mongos Single Proxy Connection (mocks)', function() { ObjectId = this.configuration.mongo.BSON.ObjectId; // Default message fields - var defaultFields = assign({}, mock.DEFAULT_ISMASTER, { + var defaultFields = Object.assign({}, mock.DEFAULT_ISMASTER, { msg: 'isdbgrid' }); // Primary server states - var serverIsMaster = [assign({}, defaultFields)]; + var serverIsMaster = [Object.assign({}, defaultFields)]; // Boot the mock co(function*() { diff --git a/test/tests/functional/rs_mocks/add_remove_tests.js b/test/tests/functional/rs_mocks/add_remove_tests.js index ef672618a..9f2abccaa 100644 --- a/test/tests/functional/rs_mocks/add_remove_tests.js +++ b/test/tests/functional/rs_mocks/add_remove_tests.js @@ -1,7 +1,6 @@ 'use strict'; var expect = require('chai').expect, - assign = require('../../../../lib/utils').assign, co = require('co'), Connection = require('../../../../lib/connection/connection'), mock = require('../../../mock'), @@ -34,7 +33,7 @@ describe('ReplSet Add Remove (mocks)', function() { ObjectId = this.configuration.mongo.BSON.ObjectId; var currentIsMasterIndex = 0; - var defaultFields = assign({}, mock.DEFAULT_ISMASTER, { + var defaultFields = Object.assign({}, mock.DEFAULT_ISMASTER, { setName: 'rs', setVersion: 1, electionId: new ObjectId(), @@ -44,14 +43,14 @@ describe('ReplSet Add Remove (mocks)', function() { // Primary server states var primary = [ - assign({}, defaultFields, { + Object.assign({}, defaultFields, { ismaster: true, secondary: false, me: 'localhost:32000', primary: 'localhost:32000', tags: { loc: 'ny' } }), - assign({}, defaultFields, { + Object.assign({}, defaultFields, { ismaster: true, secondary: false, me: 'localhost:32000', @@ -64,14 +63,14 @@ describe('ReplSet Add Remove (mocks)', function() { // Primary server states var firstSecondary = [ - assign({}, defaultFields, { + Object.assign({}, defaultFields, { ismaster: false, secondary: true, me: 'localhost:32001', primary: 'localhost:32000', tags: { loc: 'sf' } }), - assign({}, defaultFields, { + Object.assign({}, defaultFields, { ismaster: false, secondary: true, me: 'localhost:32001', @@ -84,7 +83,7 @@ describe('ReplSet Add Remove (mocks)', function() { // Primary server states var secondSecondary = [ - assign({}, defaultFields, { + Object.assign({}, defaultFields, { ismaster: false, secondary: true, me: 'localhost:32003', @@ -97,14 +96,14 @@ describe('ReplSet Add Remove (mocks)', function() { // Primary server states var arbiter = [ - assign({}, defaultFields, { + Object.assign({}, defaultFields, { ismaster: false, secondary: false, arbiterOnly: true, me: 'localhost:32002', primary: 'localhost:32000' }), - assign({}, defaultFields, { + Object.assign({}, defaultFields, { ismaster: false, secondary: false, arbiterOnly: true, @@ -205,7 +204,7 @@ describe('ReplSet Add Remove (mocks)', function() { ObjectId = this.configuration.mongo.BSON.ObjectId; var currentIsMasterIndex = 0; - var defaultFields = assign({}, mock.DEFAULT_ISMASTER, { + var defaultFields = Object.assign({}, mock.DEFAULT_ISMASTER, { setName: 'rs', setVersion: 1, electionId: new ObjectId(), @@ -215,14 +214,14 @@ describe('ReplSet Add Remove (mocks)', function() { // Primary server states var primary = [ - assign({}, defaultFields, { + Object.assign({}, defaultFields, { ismaster: true, secondary: false, me: 'localhost:32000', primary: 'localhost:32000', tags: { loc: 'ny' } }), - assign({}, defaultFields, { + Object.assign({}, defaultFields, { ismaster: true, secondary: false, me: 'localhost:32000', @@ -235,14 +234,14 @@ describe('ReplSet Add Remove (mocks)', function() { // Primary server states var firstSecondary = [ - assign({}, defaultFields, { + Object.assign({}, defaultFields, { ismaster: false, secondary: true, me: 'localhost:32001', primary: 'localhost:32000', tags: { loc: 'sf' } }), - assign({}, defaultFields, { + Object.assign({}, defaultFields, { ismaster: false, secondary: true, me: 'localhost:32001', @@ -255,7 +254,7 @@ describe('ReplSet Add Remove (mocks)', function() { // Primary server states var secondSecondary = [ - assign({}, defaultFields, { + Object.assign({}, defaultFields, { ismaster: false, secondary: true, me: 'localhost:32003', @@ -276,14 +275,14 @@ describe('ReplSet Add Remove (mocks)', function() { // Primary server states var arbiter = [ - assign({}, defaultFields, { + Object.assign({}, defaultFields, { ismaster: false, secondary: false, arbiterOnly: true, me: 'localhost:32002', primary: 'localhost:32000' }), - assign({}, defaultFields, { + Object.assign({}, defaultFields, { ismaster: false, secondary: false, arbiterOnly: true, @@ -400,7 +399,7 @@ describe('ReplSet Add Remove (mocks)', function() { ObjectId = this.configuration.mongo.BSON.ObjectId; var currentIsMasterIndex = 0; - var defaultFields = assign({}, mock.DEFAULT_ISMASTER, { + var defaultFields = Object.assign({}, mock.DEFAULT_ISMASTER, { setName: 'rs', setVersion: 1, electionId: new ObjectId(), @@ -410,14 +409,14 @@ describe('ReplSet Add Remove (mocks)', function() { // Primary server states var primary = [ - assign({}, defaultFields, { + Object.assign({}, defaultFields, { ismaster: true, secondary: false, me: 'localhost:32000', primary: 'localhost:32000', tags: { loc: 'ny' } }), - assign({}, defaultFields, { + Object.assign({}, defaultFields, { ismaster: true, secondary: false, me: 'localhost:32000', @@ -426,7 +425,7 @@ describe('ReplSet Add Remove (mocks)', function() { hosts: ['localhost:32000', 'localhost:32001', 'localhost:32002'], setVersion: 2 }), - assign({}, defaultFields, { + Object.assign({}, defaultFields, { ismaster: true, secondary: false, me: 'localhost:32000', @@ -437,14 +436,14 @@ describe('ReplSet Add Remove (mocks)', function() { // Primary server states var firstSecondary = [ - assign({}, defaultFields, { + Object.assign({}, defaultFields, { ismaster: false, secondary: true, me: 'localhost:32001', primary: 'localhost:32000', tags: { loc: 'sf' } }), - assign({}, defaultFields, { + Object.assign({}, defaultFields, { ismaster: false, secondary: true, me: 'localhost:32001', @@ -453,7 +452,7 @@ describe('ReplSet Add Remove (mocks)', function() { hosts: ['localhost:32000', 'localhost:32001', 'localhost:32002'], setVersion: 2 }), - assign({}, defaultFields, { + Object.assign({}, defaultFields, { ismaster: false, secondary: true, me: 'localhost:32001', @@ -464,7 +463,7 @@ describe('ReplSet Add Remove (mocks)', function() { // Primary server states var secondSecondary = [ - assign({}, defaultFields, { + Object.assign({}, defaultFields, { ismaster: false, secondary: true, me: 'localhost:32003', @@ -481,7 +480,7 @@ describe('ReplSet Add Remove (mocks)', function() { minWireVersion: 0, ok: 1 }, - assign({}, defaultFields, { + Object.assign({}, defaultFields, { ismaster: false, secondary: true, me: 'localhost:32003', @@ -492,14 +491,14 @@ describe('ReplSet Add Remove (mocks)', function() { // Primary server states var arbiter = [ - assign({}, defaultFields, { + Object.assign({}, defaultFields, { ismaster: false, secondary: false, arbiterOnly: true, me: 'localhost:32002', primary: 'localhost:32000' }), - assign({}, defaultFields, { + Object.assign({}, defaultFields, { ismaster: false, secondary: false, arbiterOnly: true, @@ -508,7 +507,7 @@ describe('ReplSet Add Remove (mocks)', function() { hosts: ['localhost:32000', 'localhost:32001', 'localhost:32002'], setVersion: 2 }), - assign({}, defaultFields, { + Object.assign({}, defaultFields, { ismaster: false, secondary: false, arbiterOnly: true, @@ -639,7 +638,7 @@ describe('ReplSet Add Remove (mocks)', function() { ObjectId = this.configuration.mongo.BSON.ObjectId; var currentIsMasterIndex = 0; - var defaultFields = assign({}, mock.DEFAULT_ISMASTER, { + var defaultFields = Object.assign({}, mock.DEFAULT_ISMASTER, { setName: 'rs', setVersion: 1, electionId: new ObjectId(), @@ -649,14 +648,14 @@ describe('ReplSet Add Remove (mocks)', function() { // Primary server states var primary = [ - assign({}, defaultFields, { + Object.assign({}, defaultFields, { ismaster: true, secondary: false, me: 'localhost:32000', primary: 'localhost:32000', tags: { loc: 'ny' } }), - assign({}, defaultFields, { + Object.assign({}, defaultFields, { ismaster: true, secondary: false, me: 'localhost:32000', @@ -669,14 +668,14 @@ describe('ReplSet Add Remove (mocks)', function() { // Primary server states var firstSecondary = [ - assign({}, defaultFields, { + Object.assign({}, defaultFields, { ismaster: false, secondary: true, me: 'localhost:32001', primary: 'localhost:32000', tags: { loc: 'sf' } }), - assign({}, defaultFields, { + Object.assign({}, defaultFields, { ismaster: false, secondary: true, me: 'localhost:32001', @@ -689,7 +688,7 @@ describe('ReplSet Add Remove (mocks)', function() { // Primary server states var secondSecondary = [ - assign({}, defaultFields, { + Object.assign({}, defaultFields, { ismaster: false, secondary: true, me: 'localhost:32003', @@ -702,14 +701,14 @@ describe('ReplSet Add Remove (mocks)', function() { // Primary server states var arbiter = [ - assign({}, defaultFields, { + Object.assign({}, defaultFields, { ismaster: false, secondary: false, arbiterOnly: true, me: 'localhost:32002', primary: 'localhost:32000' }), - assign({}, defaultFields, { + Object.assign({}, defaultFields, { ismaster: false, secondary: false, arbiterOnly: true, diff --git a/test/tests/functional/rs_mocks/all_servers_close_tests.js b/test/tests/functional/rs_mocks/all_servers_close_tests.js index ecb87e7ef..3c13326c4 100644 --- a/test/tests/functional/rs_mocks/all_servers_close_tests.js +++ b/test/tests/functional/rs_mocks/all_servers_close_tests.js @@ -2,7 +2,6 @@ var expect = require('chai').expect, co = require('co'), - assign = require('../../../../lib/utils').assign, Connection = require('../../../../lib/connection/connection'), mock = require('../../../mock'), ConnectionSpy = require('../shared').ConnectionSpy; @@ -37,7 +36,7 @@ describe('ReplSet All Servers Close (mocks)', function() { var die = false; // Default message fields - var defaultFields = assign({}, mock.DEFAULT_ISMASTER, { + var defaultFields = Object.assign({}, mock.DEFAULT_ISMASTER, { setName: 'rs', setVersion: 1, electionId: electionIds[0], @@ -47,7 +46,7 @@ describe('ReplSet All Servers Close (mocks)', function() { // Primary server states var primary = [ - assign({}, defaultFields, { + Object.assign({}, defaultFields, { ismaster: true, secondary: false, me: 'localhost:32000', @@ -58,7 +57,7 @@ describe('ReplSet All Servers Close (mocks)', function() { // Primary server states var firstSecondary = [ - assign({}, defaultFields, { + Object.assign({}, defaultFields, { ismaster: false, secondary: true, me: 'localhost:32001', @@ -69,7 +68,7 @@ describe('ReplSet All Servers Close (mocks)', function() { // Primary server states var arbiter = [ - assign({}, defaultFields, { + Object.assign({}, defaultFields, { ismaster: false, secondary: false, arbiterOnly: true, @@ -181,7 +180,7 @@ describe('ReplSet All Servers Close (mocks)', function() { var die = false; // Default message fields - var defaultFields = assign({}, mock.DEFAULT_ISMASTER, { + var defaultFields = Object.assign({}, mock.DEFAULT_ISMASTER, { setName: 'rs', setVersion: 1, electionId: electionIds[0], @@ -191,7 +190,7 @@ describe('ReplSet All Servers Close (mocks)', function() { // Primary server states var primary = [ - assign({}, defaultFields, { + Object.assign({}, defaultFields, { ismaster: true, secondary: false, me: 'localhost:34000', @@ -202,7 +201,7 @@ describe('ReplSet All Servers Close (mocks)', function() { // Primary server states var firstSecondary = [ - assign({}, defaultFields, { + Object.assign({}, defaultFields, { ismaster: false, secondary: true, me: 'localhost:34001', @@ -213,7 +212,7 @@ describe('ReplSet All Servers Close (mocks)', function() { // Primary server states var arbiter = [ - assign({}, defaultFields, { + Object.assign({}, defaultFields, { ismaster: false, secondary: false, arbiterOnly: true, diff --git a/test/tests/functional/rs_mocks/connection_tests.js b/test/tests/functional/rs_mocks/connection_tests.js index a76bd8fc1..8a5569475 100644 --- a/test/tests/functional/rs_mocks/connection_tests.js +++ b/test/tests/functional/rs_mocks/connection_tests.js @@ -1,7 +1,6 @@ 'use strict'; var expect = require('chai').expect, co = require('co'), - assign = require('../../../../lib/utils').assign, Connection = require('../../../../lib/connection/connection'), mock = require('../../../mock'), ConnectionSpy = require('../shared').ConnectionSpy; @@ -35,7 +34,7 @@ describe('ReplSet Connection Tests (mocks)', function() { var electionIds = [new ObjectId(), new ObjectId()]; // Default message fields - var defaultFields = assign({}, mock.DEFAULT_ISMASTER, { + var defaultFields = Object.assign({}, mock.DEFAULT_ISMASTER, { setName: 'rs', setVersion: 1, electionId: electionIds[0], @@ -45,7 +44,7 @@ describe('ReplSet Connection Tests (mocks)', function() { // Primary server states var primary = [ - assign({}, defaultFields, { + Object.assign({}, defaultFields, { ismaster: true, secondary: false, me: 'localhost:32000', @@ -56,7 +55,7 @@ describe('ReplSet Connection Tests (mocks)', function() { // Primary server states var firstSecondary = [ - assign({}, defaultFields, { + Object.assign({}, defaultFields, { ismaster: false, secondary: true, me: 'localhost:32001', @@ -67,7 +66,7 @@ describe('ReplSet Connection Tests (mocks)', function() { // Primary server states var arbiter = [ - assign({}, defaultFields, { + Object.assign({}, defaultFields, { ismaster: false, secondary: false, arbiterOnly: true, @@ -161,7 +160,7 @@ describe('ReplSet Connection Tests (mocks)', function() { ObjectId = this.configuration.mongo.BSON.ObjectId; var electionIds = [new ObjectId(), new ObjectId()]; - var defaultFields = assign({}, mock.DEFAULT_ISMASTER, { + var defaultFields = Object.assign({}, mock.DEFAULT_ISMASTER, { setName: 'rs', setVersion: 1, electionId: electionIds[0], @@ -171,7 +170,7 @@ describe('ReplSet Connection Tests (mocks)', function() { // Primary server states var primary = [ - assign({}, defaultFields, { + Object.assign({}, defaultFields, { ismaster: true, secondary: false, me: 'localhost:32000', @@ -182,7 +181,7 @@ describe('ReplSet Connection Tests (mocks)', function() { // Primary server states var firstSecondary = [ - assign({}, defaultFields, { + Object.assign({}, defaultFields, { ismaster: false, secondary: true, me: 'localhost:32001', @@ -193,7 +192,7 @@ describe('ReplSet Connection Tests (mocks)', function() { // Primary server states var arbiter = [ - assign({}, defaultFields, { + Object.assign({}, defaultFields, { ismaster: false, secondary: false, arbiterOnly: true, @@ -279,7 +278,7 @@ describe('ReplSet Connection Tests (mocks)', function() { ObjectId = this.configuration.mongo.BSON.ObjectId; var electionIds = [new ObjectId(), new ObjectId()]; - var defaultFields = assign({}, mock.DEFAULT_ISMASTER, { + var defaultFields = Object.assign({}, mock.DEFAULT_ISMASTER, { setName: 'rs', setVersion: 1, electionId: electionIds[0], @@ -289,7 +288,7 @@ describe('ReplSet Connection Tests (mocks)', function() { // Primary server states var primary = [ - assign({}, defaultFields, { + Object.assign({}, defaultFields, { ismaster: true, secondary: false, me: 'localhost:32000', @@ -300,7 +299,7 @@ describe('ReplSet Connection Tests (mocks)', function() { // Primary server states var firstSecondary = [ - assign({}, defaultFields, { + Object.assign({}, defaultFields, { ismaster: false, secondary: true, me: 'localhost:32001', @@ -390,7 +389,7 @@ describe('ReplSet Connection Tests (mocks)', function() { ObjectId = this.configuration.mongo.BSON.ObjectId; var electionIds = [new ObjectId(), new ObjectId()]; - var defaultFields = assign({}, mock.DEFAULT_ISMASTER, { + var defaultFields = Object.assign({}, mock.DEFAULT_ISMASTER, { setName: 'rs', setVersion: 1, electionId: electionIds[0], @@ -400,7 +399,7 @@ describe('ReplSet Connection Tests (mocks)', function() { // Primary server states var firstSecondary = [ - assign({}, defaultFields, { + Object.assign({}, defaultFields, { ismaster: false, secondary: true, me: 'localhost:32001', @@ -461,7 +460,7 @@ describe('ReplSet Connection Tests (mocks)', function() { ObjectId = this.configuration.mongo.BSON.ObjectId; var electionIds = [new ObjectId(), new ObjectId()]; - var defaultFields = assign({}, mock.DEFAULT_ISMASTER, { + var defaultFields = Object.assign({}, mock.DEFAULT_ISMASTER, { setName: 'rs', setVersion: 1, electionId: electionIds[0], @@ -471,7 +470,7 @@ describe('ReplSet Connection Tests (mocks)', function() { // Primary server states var firstSecondary = [ - assign({}, defaultFields, { + Object.assign({}, defaultFields, { ismaster: false, secondary: true, me: 'localhost:32001', @@ -482,7 +481,7 @@ describe('ReplSet Connection Tests (mocks)', function() { // Primary server states var arbiter = [ - assign({}, defaultFields, { + Object.assign({}, defaultFields, { ismaster: false, secondary: false, arbiterOnly: true, @@ -566,7 +565,7 @@ describe('ReplSet Connection Tests (mocks)', function() { ObjectId = this.configuration.mongo.BSON.ObjectId; var electionIds = [new ObjectId(), new ObjectId()]; - var defaultFields = assign({}, mock.DEFAULT_ISMASTER, { + var defaultFields = Object.assign({}, mock.DEFAULT_ISMASTER, { setName: 'rs', setVersion: 1, electionId: electionIds[0], @@ -576,7 +575,7 @@ describe('ReplSet Connection Tests (mocks)', function() { // Primary server states var primary = [ - assign({}, defaultFields, { + Object.assign({}, defaultFields, { ismaster: true, secondary: false, me: 'localhost:32000', @@ -587,7 +586,7 @@ describe('ReplSet Connection Tests (mocks)', function() { // Primary server states var firstSecondary = [ - assign({}, defaultFields, { + Object.assign({}, defaultFields, { ismaster: false, secondary: true, me: 'localhost:32001', @@ -598,7 +597,7 @@ describe('ReplSet Connection Tests (mocks)', function() { // Primary server states var arbiter = [ - assign({}, defaultFields, { + Object.assign({}, defaultFields, { ismaster: false, secondary: false, arbiterOnly: true, @@ -692,7 +691,7 @@ describe('ReplSet Connection Tests (mocks)', function() { ObjectId = this.configuration.mongo.BSON.ObjectId; var electionIds = [new ObjectId(), new ObjectId()]; - var defaultFields = assign({}, mock.DEFAULT_ISMASTER, { + var defaultFields = Object.assign({}, mock.DEFAULT_ISMASTER, { setName: 'rs', setVersion: 1, electionId: electionIds[0], @@ -702,7 +701,7 @@ describe('ReplSet Connection Tests (mocks)', function() { // Primary server states var primary = [ - assign({}, defaultFields, { + Object.assign({}, defaultFields, { ismaster: true, secondary: false, me: 'localhost:32000', @@ -713,7 +712,7 @@ describe('ReplSet Connection Tests (mocks)', function() { // Primary server states var firstSecondary = [ - assign({}, defaultFields, { + Object.assign({}, defaultFields, { ismaster: false, secondary: true, me: 'localhost:32001', @@ -724,7 +723,7 @@ describe('ReplSet Connection Tests (mocks)', function() { // Primary server states var arbiter = [ - assign({}, defaultFields, { + Object.assign({}, defaultFields, { ismaster: false, secondary: false, arbiterOnly: true, @@ -802,7 +801,7 @@ describe('ReplSet Connection Tests (mocks)', function() { ObjectId = this.configuration.mongo.BSON.ObjectId; var electionIds = [new ObjectId(), new ObjectId()]; - var defaultFields = assign({}, mock.DEFAULT_ISMASTER, { + var defaultFields = Object.assign({}, mock.DEFAULT_ISMASTER, { setName: 'rs', setVersion: 1, electionId: electionIds[0], @@ -812,7 +811,7 @@ describe('ReplSet Connection Tests (mocks)', function() { // Primary server states var primary = [ - assign({}, defaultFields, { + Object.assign({}, defaultFields, { ismaster: true, secondary: false, me: 'localhost:32000', @@ -823,7 +822,7 @@ describe('ReplSet Connection Tests (mocks)', function() { // Primary server states var firstSecondary = [ - assign({}, defaultFields, { + Object.assign({}, defaultFields, { ismaster: false, secondary: true, me: 'localhost:32001', @@ -901,7 +900,7 @@ describe('ReplSet Connection Tests (mocks)', function() { ObjectId = this.configuration.mongo.BSON.ObjectId; var electionIds = [new ObjectId(), new ObjectId()]; - var defaultFields = assign({}, mock.DEFAULT_ISMASTER, { + var defaultFields = Object.assign({}, mock.DEFAULT_ISMASTER, { setName: 'rs', setVersion: 1, electionId: electionIds[0], @@ -911,7 +910,7 @@ describe('ReplSet Connection Tests (mocks)', function() { // Primary server states var primary = [ - assign({}, defaultFields, { + Object.assign({}, defaultFields, { ismaster: true, secondary: false, me: 'localhost:32000', @@ -922,7 +921,7 @@ describe('ReplSet Connection Tests (mocks)', function() { // Primary server states var firstSecondary = [ - assign({}, defaultFields, { + Object.assign({}, defaultFields, { ismaster: false, secondary: true, me: 'localhost:32001', @@ -933,7 +932,7 @@ describe('ReplSet Connection Tests (mocks)', function() { // Primary server states var arbiter = [ - assign({}, defaultFields, { + Object.assign({}, defaultFields, { ismaster: false, secondary: false, arbiterOnly: true, @@ -1022,7 +1021,7 @@ describe('ReplSet Connection Tests (mocks)', function() { ObjectId = this.configuration.mongo.BSON.ObjectId; var electionIds = [new ObjectId(), new ObjectId()]; - var defaultFields = assign({}, mock.DEFAULT_ISMASTER, { + var defaultFields = Object.assign({}, mock.DEFAULT_ISMASTER, { setName: 'rs', setVersion: 1, electionId: electionIds[0], @@ -1031,7 +1030,7 @@ describe('ReplSet Connection Tests (mocks)', function() { }); var primary = [ - assign({}, defaultFields, { + Object.assign({}, defaultFields, { ismaster: true, secondary: false, me: 'localhost:32000', @@ -1041,7 +1040,7 @@ describe('ReplSet Connection Tests (mocks)', function() { ]; var arbiter = [ - assign({}, defaultFields, { + Object.assign({}, defaultFields, { ismaster: false, secondary: false, arbiterOnly: true, @@ -1117,7 +1116,7 @@ describe('ReplSet Connection Tests (mocks)', function() { ObjectId = this.configuration.mongo.BSON.ObjectId; var electionIds = [new ObjectId(), new ObjectId()]; - var defaultFields = assign({}, mock.DEFAULT_ISMASTER, { + var defaultFields = Object.assign({}, mock.DEFAULT_ISMASTER, { setName: 'rs', setVersion: 1, electionId: electionIds[0], @@ -1127,7 +1126,7 @@ describe('ReplSet Connection Tests (mocks)', function() { // Primary server states var primary = [ - assign({}, defaultFields, { + Object.assign({}, defaultFields, { ismaster: true, secondary: false, me: 'localhost:32000', @@ -1138,7 +1137,7 @@ describe('ReplSet Connection Tests (mocks)', function() { // Primary server states var firstSecondary = [ - assign({}, defaultFields, { + Object.assign({}, defaultFields, { ismaster: false, secondary: true, me: 'localhost:32001', @@ -1149,7 +1148,7 @@ describe('ReplSet Connection Tests (mocks)', function() { // Primary server states var arbiter = [ - assign({}, defaultFields, { + Object.assign({}, defaultFields, { ismaster: false, secondary: false, arbiterOnly: true, @@ -1231,7 +1230,7 @@ describe('ReplSet Connection Tests (mocks)', function() { ObjectId = this.configuration.mongo.BSON.ObjectId; var electionIds = [new ObjectId(), new ObjectId()]; - var defaultFields = assign({}, mock.DEFAULT_ISMASTER, { + var defaultFields = Object.assign({}, mock.DEFAULT_ISMASTER, { setName: 'rs', setVersion: 1, electionId: electionIds[0], @@ -1241,7 +1240,7 @@ describe('ReplSet Connection Tests (mocks)', function() { // Primary server states var firstSecondary = [ - assign({}, defaultFields, { + Object.assign({}, defaultFields, { ismaster: false, secondary: true, me: 'localhost:32001', @@ -1252,7 +1251,7 @@ describe('ReplSet Connection Tests (mocks)', function() { // Primary server states var arbiter = [ - assign({}, defaultFields, { + Object.assign({}, defaultFields, { ismaster: false, secondary: false, arbiterOnly: true, diff --git a/test/tests/functional/rs_mocks/failover_tests.js b/test/tests/functional/rs_mocks/failover_tests.js index 51f396f0a..1f9fdcc14 100644 --- a/test/tests/functional/rs_mocks/failover_tests.js +++ b/test/tests/functional/rs_mocks/failover_tests.js @@ -1,6 +1,5 @@ 'use strict'; var expect = require('chai').expect, - assign = require('../../../../lib/utils').assign, co = require('co'), Connection = require('../../../../lib/connection/connection'), mock = require('../../../mock'), @@ -35,7 +34,7 @@ describe('ReplSet Failover (mocks)', function() { var currentIsMasterIndex = 0; var electionIds = [new ObjectId(0), new ObjectId(1)]; - var defaultFields = assign({}, mock.DEFAULT_ISMASTER, { + var defaultFields = Object.assign({}, mock.DEFAULT_ISMASTER, { setName: 'rs', setVersion: 1, electionId: electionIds[0], @@ -45,21 +44,21 @@ describe('ReplSet Failover (mocks)', function() { // Primary server states var primary = [ - assign({}, defaultFields, { + Object.assign({}, defaultFields, { ismaster: true, secondary: false, me: 'localhost:32000', primary: 'localhost:32000', tags: { loc: 'ny' } }), - assign({}, defaultFields, { + Object.assign({}, defaultFields, { ismaster: false, secondary: true, me: 'localhost:32000', primary: 'localhost:32000', tags: { loc: 'ny' } }), - assign({}, defaultFields, { + Object.assign({}, defaultFields, { ismaster: false, secondary: true, me: 'localhost:32000', @@ -71,21 +70,21 @@ describe('ReplSet Failover (mocks)', function() { // Primary server states var firstSecondary = [ - assign({}, defaultFields, { + Object.assign({}, defaultFields, { ismaster: false, secondary: true, me: 'localhost:32001', primary: 'localhost:32000', tags: { loc: 'sf' } }), - assign({}, defaultFields, { + Object.assign({}, defaultFields, { ismaster: false, secondary: true, me: 'localhost:32001', primary: 'localhost:32000', tags: { loc: 'sf' } }), - assign({}, defaultFields, { + Object.assign({}, defaultFields, { ismaster: true, secondary: false, me: 'localhost:32001', @@ -97,21 +96,21 @@ describe('ReplSet Failover (mocks)', function() { // Primary server states var secondSecondary = [ - assign({}, defaultFields, { + Object.assign({}, defaultFields, { ismaster: false, secondary: true, me: 'localhost:32002', primary: 'localhost:32000', tags: { loc: 'sf' } }), - assign({}, defaultFields, { + Object.assign({}, defaultFields, { ismaster: false, secondary: true, me: 'localhost:32002', primary: 'localhost:32000', tags: { loc: 'sf' } }), - assign({}, defaultFields, { + Object.assign({}, defaultFields, { ismaster: false, secondary: true, me: 'localhost:32002', @@ -246,7 +245,7 @@ describe('ReplSet Failover (mocks)', function() { var currentIsMasterIndex = 0; var electionIds = [new ObjectId(0), new ObjectId(1)]; - var defaultFields = assign({}, mock.DEFAULT_ISMASTER, { + var defaultFields = Object.assign({}, mock.DEFAULT_ISMASTER, { setName: 'rs', setVersion: 1, electionId: electionIds[0], @@ -256,21 +255,21 @@ describe('ReplSet Failover (mocks)', function() { // Primary server states var primary = [ - assign({}, defaultFields, { + Object.assign({}, defaultFields, { ismaster: true, secondary: false, me: 'localhost:32000', primary: 'localhost:32000', tags: { loc: 'ny' } }), - assign({}, defaultFields, { + Object.assign({}, defaultFields, { ismaster: false, secondary: true, me: 'localhost:32000', primary: 'localhost:32000', tags: { loc: 'ny' } }), - assign({}, defaultFields, { + Object.assign({}, defaultFields, { ismaster: false, secondary: true, me: 'localhost:32000', @@ -282,21 +281,21 @@ describe('ReplSet Failover (mocks)', function() { // Primary server states var firstSecondary = [ - assign({}, defaultFields, { + Object.assign({}, defaultFields, { ismaster: false, secondary: true, me: 'localhost:32001', primary: 'localhost:32000', tags: { loc: 'sf' } }), - assign({}, defaultFields, { + Object.assign({}, defaultFields, { ismaster: false, secondary: true, me: 'localhost:32001', primary: 'localhost:32000', tags: { loc: 'sf' } }), - assign({}, defaultFields, { + Object.assign({}, defaultFields, { ismaster: true, secondary: false, me: 'localhost:32001', @@ -308,21 +307,21 @@ describe('ReplSet Failover (mocks)', function() { // Primary server states var secondSecondary = [ - assign({}, defaultFields, { + Object.assign({}, defaultFields, { ismaster: false, secondary: true, me: 'localhost:32002', primary: 'localhost:32000', tags: { loc: 'sf' } }), - assign({}, defaultFields, { + Object.assign({}, defaultFields, { ismaster: false, secondary: true, me: 'localhost:32002', primary: 'localhost:32000', tags: { loc: 'sf' } }), - assign({}, defaultFields, { + Object.assign({}, defaultFields, { ismaster: false, secondary: true, me: 'localhost:32002', diff --git a/test/tests/functional/rs_mocks/maintanance_mode_tests.js b/test/tests/functional/rs_mocks/maintanance_mode_tests.js index a9470827c..a4efe8476 100644 --- a/test/tests/functional/rs_mocks/maintanance_mode_tests.js +++ b/test/tests/functional/rs_mocks/maintanance_mode_tests.js @@ -1,6 +1,5 @@ 'use strict'; var expect = require('chai').expect, - assign = require('../../../../lib/utils').assign, co = require('co'), Connection = require('../../../../lib/connection/connection'), mock = require('../../../mock'), @@ -33,7 +32,7 @@ describe('ReplSet Maintenance Mode (mocks)', function() { ObjectId = this.configuration.mongo.BSON.ObjectId; var currentIsMasterIndex = 0; - var defaultFields = assign({}, mock.DEFAULT_ISMASTER, { + var defaultFields = Object.assign({}, mock.DEFAULT_ISMASTER, { setName: 'rs', setVersion: 1, electionId: new ObjectId(), @@ -43,14 +42,14 @@ describe('ReplSet Maintenance Mode (mocks)', function() { // Primary server states var primary = [ - assign({}, defaultFields, { + Object.assign({}, defaultFields, { ismaster: true, secondary: false, me: 'localhost:32000', primary: 'localhost:32000', tags: { loc: 'ny' } }), - assign({}, defaultFields, { + Object.assign({}, defaultFields, { ismaster: true, secondary: false, me: 'localhost:32000', @@ -61,14 +60,14 @@ describe('ReplSet Maintenance Mode (mocks)', function() { // Primary server states var firstSecondary = [ - assign({}, defaultFields, { + Object.assign({}, defaultFields, { ismaster: false, secondary: true, me: 'localhost:32001', primary: 'localhost:32000', tags: { loc: 'sf' } }), - assign({}, defaultFields, { + Object.assign({}, defaultFields, { ismaster: false, secondary: true, me: 'localhost:32001', @@ -79,7 +78,7 @@ describe('ReplSet Maintenance Mode (mocks)', function() { // Primary server states var secondSecondary = [ - assign({}, defaultFields, { + Object.assign({}, defaultFields, { ismaster: false, secondary: true, me: 'localhost:32003', @@ -98,14 +97,14 @@ describe('ReplSet Maintenance Mode (mocks)', function() { // Primary server states var arbiter = [ - assign({}, defaultFields, { + Object.assign({}, defaultFields, { ismaster: false, secondary: false, arbiterOnly: true, me: 'localhost:32002', primary: 'localhost:32000' }), - assign({}, defaultFields, { + Object.assign({}, defaultFields, { ismaster: false, secondary: false, arbiterOnly: true, diff --git a/test/tests/functional/rs_mocks/monitoring_tests.js b/test/tests/functional/rs_mocks/monitoring_tests.js index e1446d3c3..b7e23d0e0 100644 --- a/test/tests/functional/rs_mocks/monitoring_tests.js +++ b/test/tests/functional/rs_mocks/monitoring_tests.js @@ -1,6 +1,5 @@ 'use strict'; var expect = require('chai').expect, - assign = require('../../../../lib/utils').assign, co = require('co'), Connection = require('../../../../lib/connection/connection'), mock = require('../../../mock'), @@ -41,7 +40,7 @@ describe('ReplSet Monitoring (mocks)', function() { var electionIds = [new ObjectId(), new ObjectId()]; var currentIsMasterState = 0; var stopRespondingPrimary = false; - var defaultFields = assign({}, mock.DEFAULT_ISMASTER, { + var defaultFields = Object.assign({}, mock.DEFAULT_ISMASTER, { setName: 'rs', setVersion: 1, electionId: electionIds[currentIsMasterState], @@ -50,13 +49,13 @@ describe('ReplSet Monitoring (mocks)', function() { // Primary server states var primary = [ - assign({}, defaultFields, { + Object.assign({}, defaultFields, { ismaster: true, secondary: false, me: 'localhost:32000', primary: 'localhost:32000' }), - assign({}, defaultFields, { + Object.assign({}, defaultFields, { ismaster: false, secondary: true, me: 'localhost:32000', @@ -66,13 +65,13 @@ describe('ReplSet Monitoring (mocks)', function() { // Primary server states var firstSecondary = [ - assign({}, defaultFields, { + Object.assign({}, defaultFields, { ismaster: false, secondary: true, me: 'localhost:32001', primary: 'localhost:32000' }), - assign({}, defaultFields, { + Object.assign({}, defaultFields, { ismaster: true, secondary: false, me: 'localhost:32001', @@ -82,13 +81,13 @@ describe('ReplSet Monitoring (mocks)', function() { // Primary server states var secondSecondary = [ - assign({}, defaultFields, { + Object.assign({}, defaultFields, { ismaster: false, secondary: true, me: 'localhost:32002', primary: 'localhost:32000' }), - assign({}, defaultFields, { + Object.assign({}, defaultFields, { ismaster: false, secondary: true, me: 'localhost:32002', @@ -242,7 +241,7 @@ describe('ReplSet Monitoring (mocks)', function() { var electionIds = [new ObjectId(), new ObjectId()]; var currentIsMasterState = 0; - var defaultFields = assign({}, mock.DEFAULT_ISMASTER, { + var defaultFields = Object.assign({}, mock.DEFAULT_ISMASTER, { setName: 'rs', setVersion: 1, electionId: electionIds[currentIsMasterState], @@ -251,13 +250,13 @@ describe('ReplSet Monitoring (mocks)', function() { // Primary server states var primary = [ - assign({}, defaultFields, { + Object.assign({}, defaultFields, { ismaster: true, secondary: false, me: 'localhost:32000', primary: 'localhost:32000' }), - assign({}, defaultFields, { + Object.assign({}, defaultFields, { ismaster: false, secondary: true, me: 'localhost:32000', @@ -267,13 +266,13 @@ describe('ReplSet Monitoring (mocks)', function() { // Primary server states var firstSecondary = [ - assign({}, defaultFields, { + Object.assign({}, defaultFields, { ismaster: false, secondary: true, me: 'localhost:32001', primary: 'localhost:32000' }), - assign({}, defaultFields, { + Object.assign({}, defaultFields, { ismaster: true, secondary: false, me: 'localhost:32001', @@ -283,13 +282,13 @@ describe('ReplSet Monitoring (mocks)', function() { // Primary server states var secondSecondary = [ - assign({}, defaultFields, { + Object.assign({}, defaultFields, { ismaster: false, secondary: true, me: 'localhost:32002', primary: 'localhost:32000' }), - assign({}, defaultFields, { + Object.assign({}, defaultFields, { ismaster: false, secondary: true, me: 'localhost:32002', diff --git a/test/tests/functional/rs_mocks/no_primary_found_tests.js b/test/tests/functional/rs_mocks/no_primary_found_tests.js index fed5421ef..3af2ae55b 100644 --- a/test/tests/functional/rs_mocks/no_primary_found_tests.js +++ b/test/tests/functional/rs_mocks/no_primary_found_tests.js @@ -1,9 +1,8 @@ 'use strict'; -var assign = require('../../../../lib/utils').assign, - co = require('co'), - Connection = require('../../../../lib/connection/connection'), - mock = require('../../../mock'), - ConnectionSpy = require('../shared').ConnectionSpy; +const co = require('co'); +const Connection = require('../../../../lib/connection/connection'); +const mock = require('../../../mock'); +const ConnectionSpy = require('../shared').ConnectionSpy; let test = {}; describe('ReplSet No Primary Found (mocks)', function() { @@ -31,7 +30,7 @@ describe('ReplSet No Primary Found (mocks)', function() { var ReplSet = this.configuration.mongo.ReplSet, ObjectId = this.configuration.mongo.BSON.ObjectId; - var defaultFields = assign({}, mock.DEFAULT_ISMASTER, { + var defaultFields = Object.assign({}, mock.DEFAULT_ISMASTER, { setName: 'rs', setVersion: 1, electionId: new ObjectId(), @@ -41,7 +40,7 @@ describe('ReplSet No Primary Found (mocks)', function() { // Primary server states var primary = [ - assign({}, defaultFields, { + Object.assign({}, defaultFields, { ismaster: true, secondary: false, me: 'localhost:32000', @@ -51,7 +50,7 @@ describe('ReplSet No Primary Found (mocks)', function() { // Primary server states var firstSecondary = [ - assign({}, defaultFields, { + Object.assign({}, defaultFields, { ismaster: false, secondary: true, me: 'localhost:32001', @@ -61,7 +60,7 @@ describe('ReplSet No Primary Found (mocks)', function() { // Primary server states var secondSecondary = [ - assign({}, defaultFields, { + Object.assign({}, defaultFields, { ismaster: false, secondary: true, me: 'localhost:32002', @@ -71,7 +70,7 @@ describe('ReplSet No Primary Found (mocks)', function() { // Primary server states var arbiter = [ - assign({}, defaultFields, { + Object.assign({}, defaultFields, { ismaster: false, secondary: false, arbiterOnly: true, diff --git a/test/tests/functional/rs_mocks/operation_tests.js b/test/tests/functional/rs_mocks/operation_tests.js index 213406939..f378aa00a 100644 --- a/test/tests/functional/rs_mocks/operation_tests.js +++ b/test/tests/functional/rs_mocks/operation_tests.js @@ -1,9 +1,8 @@ 'use strict'; -var assign = require('../../../../lib/utils').assign, - co = require('co'), - Connection = require('../../../../lib/connection/connection'), - mock = require('../../../mock'), - ConnectionSpy = require('../shared').ConnectionSpy; +const co = require('co'); +const Connection = require('../../../../lib/connection/connection'); +const mock = require('../../../mock'); +const ConnectionSpy = require('../shared').ConnectionSpy; let test = {}; describe('ReplSet Operations (mocks)', function() { @@ -32,7 +31,7 @@ describe('ReplSet Operations (mocks)', function() { ObjectId = this.configuration.mongo.BSON.ObjectId; var currentIsMasterIndex = 0; - var defaultFields = assign({}, mock.DEFAULT_ISMASTER, { + var defaultFields = Object.assign({}, mock.DEFAULT_ISMASTER, { setName: 'rs', setVersion: 1, electionId: new ObjectId(), @@ -41,7 +40,7 @@ describe('ReplSet Operations (mocks)', function() { // Primary server states var primary = [ - assign({}, defaultFields, { + Object.assign({}, defaultFields, { ismaster: true, secondary: false, me: 'localhost:32000', @@ -104,7 +103,7 @@ describe('ReplSet Operations (mocks)', function() { ReadPreference = this.configuration.mongo.ReadPreference; var currentIsMasterIndex = 0; - var defaultFields = assign({}, mock.DEFAULT_ISMASTER, { + var defaultFields = Object.assign({}, mock.DEFAULT_ISMASTER, { setName: 'rs', setVersion: 1, electionId: new ObjectId(), @@ -113,7 +112,7 @@ describe('ReplSet Operations (mocks)', function() { // Primary server states var primary = [ - assign({}, defaultFields, { + Object.assign({}, defaultFields, { ismaster: true, secondary: false, me: 'localhost:32000', diff --git a/test/tests/functional/rs_mocks/primary_loses_network_tests.js b/test/tests/functional/rs_mocks/primary_loses_network_tests.js index 10578b145..0ea074971 100644 --- a/test/tests/functional/rs_mocks/primary_loses_network_tests.js +++ b/test/tests/functional/rs_mocks/primary_loses_network_tests.js @@ -1,9 +1,8 @@ 'use strict'; -var assign = require('../../../../lib/utils').assign, - co = require('co'), - Connection = require('../../../../lib/connection/connection'), - mock = require('../../../mock'), - ConnectionSpy = require('../shared').ConnectionSpy; +const co = require('co'); +const Connection = require('../../../../lib/connection/connection'); +const mock = require('../../../mock'); +const ConnectionSpy = require('../shared').ConnectionSpy; let test = {}; describe('ReplSet Primary Loses Network (mocks)', function() { @@ -33,7 +32,7 @@ describe('ReplSet Primary Loses Network (mocks)', function() { var currentIsMasterIndex = 0; var step = 0; - var defaultFields = assign({}, mock.DEFAULT_ISMASTER, { + var defaultFields = Object.assign({}, mock.DEFAULT_ISMASTER, { setName: 'rs', setVersion: 1, electionId: new ObjectId(), @@ -42,14 +41,14 @@ describe('ReplSet Primary Loses Network (mocks)', function() { // Primary server states var primary = [ - assign({}, defaultFields, { + Object.assign({}, defaultFields, { ismaster: true, secondary: false, me: 'localhost:32000', primary: 'localhost:32000', tags: { loc: 'ny' } }), - assign({}, defaultFields, { + Object.assign({}, defaultFields, { ismaster: true, secondary: false, me: 'localhost:32000', @@ -60,14 +59,14 @@ describe('ReplSet Primary Loses Network (mocks)', function() { // Primary server states var firstSecondary = [ - assign({}, defaultFields, { + Object.assign({}, defaultFields, { ismaster: false, secondary: true, me: 'localhost:32001', primary: 'localhost:32000', tags: { loc: 'sf' } }), - assign({}, defaultFields, { + Object.assign({}, defaultFields, { ismaster: false, secondary: true, me: 'localhost:32001', @@ -78,14 +77,14 @@ describe('ReplSet Primary Loses Network (mocks)', function() { // Primary server states var secondSecondary = [ - assign({}, defaultFields, { + Object.assign({}, defaultFields, { ismaster: false, secondary: true, me: 'localhost:32002', primary: 'localhost:32000', tags: { loc: 'sf' } }), - assign({}, defaultFields, { + Object.assign({}, defaultFields, { ismaster: true, secondary: false, me: 'localhost:32002', diff --git a/test/tests/functional/rs_mocks/read_preferences_tests.js b/test/tests/functional/rs_mocks/read_preferences_tests.js index 8b2929360..241b6e35a 100644 --- a/test/tests/functional/rs_mocks/read_preferences_tests.js +++ b/test/tests/functional/rs_mocks/read_preferences_tests.js @@ -1,6 +1,5 @@ 'use strict'; var expect = require('chai').expect, - assign = require('../../../../lib/utils').assign, co = require('co'), Connection = require('../../../../lib/connection/connection'), mock = require('../../../mock'), @@ -35,7 +34,7 @@ describe('ReplSet Read Preferences (mocks)', function() { Long = this.configuration.mongo.BSON.Long; var electionIds = [new ObjectId(), new ObjectId()]; - var defaultFields = assign({}, mock.DEFAULT_ISMASTER, { + var defaultFields = Object.assign({}, mock.DEFAULT_ISMASTER, { setName: 'rs', setVersion: 1, electionId: electionIds[0], @@ -44,7 +43,7 @@ describe('ReplSet Read Preferences (mocks)', function() { // Primary server states var primary = [ - assign({}, defaultFields, { + Object.assign({}, defaultFields, { ismaster: true, secondary: false, me: 'localhost:32000', @@ -55,7 +54,7 @@ describe('ReplSet Read Preferences (mocks)', function() { // Primary server states var firstSecondary = [ - assign({}, defaultFields, { + Object.assign({}, defaultFields, { ismaster: false, secondary: true, me: 'localhost:32001', @@ -66,7 +65,7 @@ describe('ReplSet Read Preferences (mocks)', function() { // Primary server states var secondSecondary = [ - assign({}, defaultFields, { + Object.assign({}, defaultFields, { ismaster: false, secondary: true, me: 'localhost:32002', @@ -175,7 +174,7 @@ describe('ReplSet Read Preferences (mocks)', function() { Long = this.configuration.mongo.BSON.Long; var electionIds = [new ObjectId(), new ObjectId()]; - var defaultFields = assign({}, mock.DEFAULT_ISMASTER, { + var defaultFields = Object.assign({}, mock.DEFAULT_ISMASTER, { setName: 'rs', setVersion: 1, electionId: electionIds[0], @@ -184,7 +183,7 @@ describe('ReplSet Read Preferences (mocks)', function() { // Primary server states var primary = [ - assign({}, defaultFields, { + Object.assign({}, defaultFields, { ismaster: true, secondary: false, me: 'localhost:32000', @@ -195,7 +194,7 @@ describe('ReplSet Read Preferences (mocks)', function() { // Primary server states var firstSecondary = [ - assign({}, defaultFields, { + Object.assign({}, defaultFields, { ismaster: false, secondary: true, me: 'localhost:32001', @@ -206,7 +205,7 @@ describe('ReplSet Read Preferences (mocks)', function() { // Primary server states var secondSecondary = [ - assign({}, defaultFields, { + Object.assign({}, defaultFields, { ismaster: false, secondary: true, me: 'localhost:32002', @@ -314,7 +313,7 @@ describe('ReplSet Read Preferences (mocks)', function() { Long = this.configuration.mongo.BSON.Long; var electionIds = [new ObjectId(), new ObjectId()]; - var defaultFields = assign({}, mock.DEFAULT_ISMASTER, { + var defaultFields = Object.assign({}, mock.DEFAULT_ISMASTER, { setName: 'rs', setVersion: 1, electionId: electionIds[0], @@ -323,7 +322,7 @@ describe('ReplSet Read Preferences (mocks)', function() { // Primary server states var primary = [ - assign({}, defaultFields, { + Object.assign({}, defaultFields, { ismaster: true, secondary: false, me: 'localhost:32000', @@ -334,7 +333,7 @@ describe('ReplSet Read Preferences (mocks)', function() { // Primary server states var firstSecondary = [ - assign({}, defaultFields, { + Object.assign({}, defaultFields, { ismaster: false, secondary: true, me: 'localhost:32001', @@ -345,7 +344,7 @@ describe('ReplSet Read Preferences (mocks)', function() { // Primary server states var secondSecondary = [ - assign({}, defaultFields, { + Object.assign({}, defaultFields, { ismaster: false, secondary: true, me: 'localhost:32002', @@ -488,7 +487,7 @@ describe('ReplSet Read Preferences (mocks)', function() { MongoError = this.configuration.mongo.MongoError; var electionIds = [new ObjectId(), new ObjectId()]; - var defaultFields = assign({}, mock.DEFAULT_ISMASTER, { + var defaultFields = Object.assign({}, mock.DEFAULT_ISMASTER, { setName: 'rs', setVersion: 1, electionId: electionIds[0], @@ -497,7 +496,7 @@ describe('ReplSet Read Preferences (mocks)', function() { // Primary server states var primary = [ - assign({}, defaultFields, { + Object.assign({}, defaultFields, { ismaster: true, secondary: false, me: 'localhost:32000', @@ -507,7 +506,7 @@ describe('ReplSet Read Preferences (mocks)', function() { // Primary server states var firstSecondary = [ - assign({}, defaultFields, { + Object.assign({}, defaultFields, { ismaster: false, secondary: true, me: 'localhost:32001', @@ -645,7 +644,7 @@ describe('ReplSet Read Preferences (mocks)', function() { Long = this.configuration.mongo.BSON.Long; var electionIds = [new ObjectId(), new ObjectId()]; - var defaultFields = assign({}, mock.DEFAULT_ISMASTER, { + var defaultFields = Object.assign({}, mock.DEFAULT_ISMASTER, { setName: 'rs', setVersion: 1, electionId: electionIds[0], @@ -654,7 +653,7 @@ describe('ReplSet Read Preferences (mocks)', function() { // Primary server states var primary = [ - assign({}, defaultFields, { + Object.assign({}, defaultFields, { ismaster: true, secondary: false, me: 'localhost:32000', @@ -665,7 +664,7 @@ describe('ReplSet Read Preferences (mocks)', function() { // Primary server states var firstSecondary = [ - assign({}, defaultFields, { + Object.assign({}, defaultFields, { ismaster: false, secondary: true, me: 'localhost:32001', @@ -676,7 +675,7 @@ describe('ReplSet Read Preferences (mocks)', function() { // Primary server states var secondSecondary = [ - assign({}, defaultFields, { + Object.assign({}, defaultFields, { ismaster: false, secondary: true, me: 'localhost:32002', @@ -816,7 +815,7 @@ describe('ReplSet Read Preferences (mocks)', function() { Long = this.configuration.mongo.BSON.Long; var electionIds = [new ObjectId(), new ObjectId()]; - var defaultFields = assign({}, mock.DEFAULT_ISMASTER, { + var defaultFields = Object.assign({}, mock.DEFAULT_ISMASTER, { setName: 'rs', setVersion: 1, electionId: electionIds[0], @@ -825,7 +824,7 @@ describe('ReplSet Read Preferences (mocks)', function() { // Primary server states var primary = [ - assign({}, defaultFields, { + Object.assign({}, defaultFields, { ismaster: true, secondary: false, me: 'localhost:32000', @@ -836,7 +835,7 @@ describe('ReplSet Read Preferences (mocks)', function() { // Primary server states var firstSecondary = [ - assign({}, defaultFields, { + Object.assign({}, defaultFields, { ismaster: false, secondary: true, me: 'localhost:32001', @@ -847,7 +846,7 @@ describe('ReplSet Read Preferences (mocks)', function() { // Primary server states var secondSecondary = [ - assign({}, defaultFields, { + Object.assign({}, defaultFields, { ismaster: false, secondary: true, me: 'localhost:32002', @@ -964,7 +963,7 @@ describe('ReplSet Read Preferences (mocks)', function() { Long = this.configuration.mongo.BSON.Long; var electionIds = [new ObjectId(), new ObjectId()]; - var defaultFields = assign({}, mock.DEFAULT_ISMASTER, { + var defaultFields = Object.assign({}, mock.DEFAULT_ISMASTER, { setName: 'rs', setVersion: 1, electionId: electionIds[0], @@ -973,7 +972,7 @@ describe('ReplSet Read Preferences (mocks)', function() { // Primary server states var primary = [ - assign({}, defaultFields, { + Object.assign({}, defaultFields, { ismaster: true, secondary: false, me: 'localhost:32000', @@ -984,7 +983,7 @@ describe('ReplSet Read Preferences (mocks)', function() { // Primary server states var firstSecondary = [ - assign({}, defaultFields, { + Object.assign({}, defaultFields, { ismaster: false, secondary: true, me: 'localhost:32001', @@ -995,7 +994,7 @@ describe('ReplSet Read Preferences (mocks)', function() { // Primary server states var secondSecondary = [ - assign({}, defaultFields, { + Object.assign({}, defaultFields, { ismaster: false, secondary: true, me: 'localhost:32002', @@ -1112,7 +1111,7 @@ describe('ReplSet Read Preferences (mocks)', function() { Long = this.configuration.mongo.BSON.Long; var electionIds = [new ObjectId(), new ObjectId()]; - var defaultFields = assign({}, mock.DEFAULT_ISMASTER, { + var defaultFields = Object.assign({}, mock.DEFAULT_ISMASTER, { setName: 'rs', setVersion: 1, electionId: electionIds[0], @@ -1121,7 +1120,7 @@ describe('ReplSet Read Preferences (mocks)', function() { // Primary server states var primary = [ - assign({}, defaultFields, { + Object.assign({}, defaultFields, { ismaster: true, secondary: false, me: 'localhost:32000', @@ -1203,7 +1202,7 @@ describe('ReplSet Read Preferences (mocks)', function() { Long = this.configuration.mongo.BSON.Long; var electionIds = [new ObjectId(), new ObjectId()]; - var defaultFields = assign({}, mock.DEFAULT_ISMASTER, { + var defaultFields = Object.assign({}, mock.DEFAULT_ISMASTER, { setName: 'rs', setVersion: 1, electionId: electionIds[0], @@ -1212,7 +1211,7 @@ describe('ReplSet Read Preferences (mocks)', function() { // Primary server states var primary = [ - assign({}, defaultFields, { + Object.assign({}, defaultFields, { ismaster: true, secondary: false, me: 'localhost:32000', @@ -1223,7 +1222,7 @@ describe('ReplSet Read Preferences (mocks)', function() { // Primary server states var firstSecondary = [ - assign({}, defaultFields, { + Object.assign({}, defaultFields, { ismaster: false, secondary: true, me: 'localhost:32001', @@ -1234,7 +1233,7 @@ describe('ReplSet Read Preferences (mocks)', function() { // Primary server states var secondSecondary = [ - assign({}, defaultFields, { + Object.assign({}, defaultFields, { ismaster: false, secondary: true, me: 'localhost:32002', diff --git a/test/tests/functional/sdam_monitoring_mocks/mongos_topology_tests.js b/test/tests/functional/sdam_monitoring_mocks/mongos_topology_tests.js index b14ad1f53..62c07f53b 100644 --- a/test/tests/functional/sdam_monitoring_mocks/mongos_topology_tests.js +++ b/test/tests/functional/sdam_monitoring_mocks/mongos_topology_tests.js @@ -1,6 +1,5 @@ 'use strict'; var expect = require('chai').expect, - assign = require('../../../../lib/utils').assign, co = require('co'), mock = require('../../../mock'); @@ -36,7 +35,7 @@ describe.skip('Mongos SDAM Monitoring (mocks)', function() { }; // Primary server states - var serverIsMaster = [assign({}, defaultFields)]; + var serverIsMaster = [Object.assign({}, defaultFields)]; // Boot the mock co(function*() { mongos1 = yield mock.createServer(62000, 'localhost'); @@ -248,7 +247,7 @@ describe.skip('Mongos SDAM Monitoring (mocks)', function() { }; // Primary server states - var serverIsMaster = [assign({}, defaultFields)]; + var serverIsMaster = [Object.assign({}, defaultFields)]; // Boot the mock co(function*() { mongos1 = yield mock.createServer(62002, 'localhost'); @@ -451,7 +450,7 @@ describe.skip('Mongos SDAM Monitoring (mocks)', function() { }; // Primary server states - var serverIsMaster = [assign({}, defaultFields)]; + var serverIsMaster = [Object.assign({}, defaultFields)]; // Boot the mock co(function*() { mongos1 = yield mock.createServer(62004, 'localhost'); diff --git a/test/tests/functional/sdam_monitoring_mocks/replset_topology_tests.js b/test/tests/functional/sdam_monitoring_mocks/replset_topology_tests.js index deb810cbb..9907310d1 100644 --- a/test/tests/functional/sdam_monitoring_mocks/replset_topology_tests.js +++ b/test/tests/functional/sdam_monitoring_mocks/replset_topology_tests.js @@ -1,6 +1,5 @@ 'use strict'; var expect = require('chai').expect, - assign = require('../../../../lib/utils').assign, co = require('co'), mock = require('../../../mock'); @@ -43,21 +42,21 @@ describe.skip('ReplSet SDAM Monitoring (mocks)', function() { // Primary server states var primary = [ - assign({}, defaultFields, { + Object.assign({}, defaultFields, { ismaster: true, secondary: false, me: 'localhost:32000', primary: 'localhost:32000', tags: { loc: 'ny' } }), - assign({}, defaultFields, { + Object.assign({}, defaultFields, { ismaster: false, secondary: true, me: 'localhost:32000', primary: 'localhost:32000', tags: { loc: 'ny' } }), - assign({}, defaultFields, { + Object.assign({}, defaultFields, { ismaster: false, secondary: true, me: 'localhost:32000', @@ -68,21 +67,21 @@ describe.skip('ReplSet SDAM Monitoring (mocks)', function() { // Primary server states var firstSecondary = [ - assign({}, defaultFields, { + Object.assign({}, defaultFields, { ismaster: false, secondary: true, me: 'localhost:32001', primary: 'localhost:32000', tags: { loc: 'sf' } }), - assign({}, defaultFields, { + Object.assign({}, defaultFields, { ismaster: false, secondary: true, me: 'localhost:32001', primary: 'localhost:32000', tags: { loc: 'sf' } }), - assign({}, defaultFields, { + Object.assign({}, defaultFields, { ismaster: true, secondary: false, me: 'localhost:32001', @@ -93,21 +92,21 @@ describe.skip('ReplSet SDAM Monitoring (mocks)', function() { // Primary server states var arbiter = [ - assign({}, defaultFields, { + Object.assign({}, defaultFields, { ismaster: false, secondary: false, arbiterOnly: true, me: 'localhost:32002', primary: 'localhost:32000' }), - assign({}, defaultFields, { + Object.assign({}, defaultFields, { ismaster: false, secondary: false, arbiterOnly: true, me: 'localhost:32002', primary: 'localhost:32000' }), - assign({}, defaultFields, { + Object.assign({}, defaultFields, { ismaster: false, secondary: false, arbiterOnly: true, diff --git a/test/tests/functional/sdam_monitoring_mocks/single_topology_tests.js b/test/tests/functional/sdam_monitoring_mocks/single_topology_tests.js index 2cdef8b2d..e7c4b9b0e 100644 --- a/test/tests/functional/sdam_monitoring_mocks/single_topology_tests.js +++ b/test/tests/functional/sdam_monitoring_mocks/single_topology_tests.js @@ -1,6 +1,5 @@ 'use strict'; var expect = require('chai').expect, - assign = require('../../../../lib/utils').assign, co = require('co'), mock = require('../../../mock'); @@ -34,7 +33,7 @@ describe.skip('Single SDAM Monitoring (mocks)', function() { }; // Primary server states - var serverIsMaster = [assign({}, defaultFields)]; + var serverIsMaster = [Object.assign({}, defaultFields)]; // Boot the mock var mockServer; @@ -181,7 +180,7 @@ describe.skip('Single SDAM Monitoring (mocks)', function() { }; // Primary server states - var serverIsMaster = [assign({}, defaultFields)]; + var serverIsMaster = [Object.assign({}, defaultFields)]; // Boot the mock var mockServer; diff --git a/test/tests/functional/single_mocks/compression_tests.js b/test/tests/functional/single_mocks/compression_tests.js index ac5f55857..bc9899b2b 100644 --- a/test/tests/functional/single_mocks/compression_tests.js +++ b/test/tests/functional/single_mocks/compression_tests.js @@ -2,8 +2,7 @@ var Server = require('../../../../lib/topologies/server'), expect = require('chai').expect, co = require('co'), - mock = require('../../../mock'), - assign = require('../../../../lib/utils').assign; + mock = require('../../../mock'); // NOTE: eventually use `this.configuration.mongo.Server` instead of direct import when // https://github.com/malexandert/mongodb-test-runner/issues/3 is fixed @@ -21,7 +20,7 @@ describe('Single Compression (mocks)', function() { test: function(done) { // Prepare the server's response - var serverResponse = assign({}, mock.DEFAULT_ISMASTER); + var serverResponse = Object.assign({}, mock.DEFAULT_ISMASTER); // Boot the mock co(function*() { @@ -66,7 +65,7 @@ describe('Single Compression (mocks)', function() { var currentStep = 0; // Prepare the server's response - let serverResponse = assign({}, mock.DEFAULT_ISMASTER); + let serverResponse = Object.assign({}, mock.DEFAULT_ISMASTER); // Boot the mock co(function*() { @@ -159,7 +158,7 @@ describe('Single Compression (mocks)', function() { var currentStep = 0; // Prepare the server's response - var serverResponse = assign({}, mock.DEFAULT_ISMASTER, { + var serverResponse = Object.assign({}, mock.DEFAULT_ISMASTER, { compression: ['snappy'] }); @@ -255,7 +254,7 @@ describe('Single Compression (mocks)', function() { var currentStep = 0; // Prepare the server's response - var serverResponse = assign({}, mock.DEFAULT_ISMASTER, { + var serverResponse = Object.assign({}, mock.DEFAULT_ISMASTER, { compression: ['zlib'] }); @@ -349,7 +348,7 @@ describe('Single Compression (mocks)', function() { var currentStep = 0; // Prepare the server's response - var serverResponse = assign({}, mock.DEFAULT_ISMASTER, { + var serverResponse = Object.assign({}, mock.DEFAULT_ISMASTER, { compression: ['snappy'] }); diff --git a/test/tests/functional/single_mocks/timeout_tests.js b/test/tests/functional/single_mocks/timeout_tests.js index 1047a96c8..67c0093d9 100644 --- a/test/tests/functional/single_mocks/timeout_tests.js +++ b/test/tests/functional/single_mocks/timeout_tests.js @@ -1,6 +1,5 @@ 'use strict'; var expect = require('chai').expect, - assign = require('../../../../lib/utils').assign, co = require('co'), mock = require('../../../mock'); @@ -24,10 +23,10 @@ describe('Single Timeout (mocks)', function() { var stopRespondingPrimary = false; // Default message fields - var defaultFields = assign({}, mock.DEFAULT_ISMASTER); + var defaultFields = Object.assign({}, mock.DEFAULT_ISMASTER); // Primary server states - var serverIsMaster = [assign({}, defaultFields)]; + var serverIsMaster = [Object.assign({}, defaultFields)]; // Boot the mock co(function*() { @@ -119,10 +118,10 @@ describe('Single Timeout (mocks)', function() { var brokenPipe = false; // Default message fields - var defaultFields = assign({}, mock.DEFAULT_ISMASTER); + var defaultFields = Object.assign({}, mock.DEFAULT_ISMASTER); // Primary server states - var serverIsMaster = [assign({}, defaultFields)]; + var serverIsMaster = [Object.assign({}, defaultFields)]; co(function*() { const mockServer = yield mock.createServer(37017, 'localhost', { @@ -272,10 +271,10 @@ describe('Single Timeout (mocks)', function() { var currentStep = 0; // Default message fields - var defaultFields = assign({}, mock.DEFAULT_ISMASTER); + var defaultFields = Object.assign({}, mock.DEFAULT_ISMASTER); // Primary server states - var serverIsMaster = [assign({}, defaultFields)]; + var serverIsMaster = [Object.assign({}, defaultFields)]; // Boot the mock co(function*() { diff --git a/test/tests/unit/common.js b/test/tests/unit/common.js index d18808978..933fc8047 100644 --- a/test/tests/unit/common.js +++ b/test/tests/unit/common.js @@ -1,10 +1,9 @@ 'use strict'; -var assign = require('../../../lib/utils').assign, - mock = require('../../mock'), - ObjectId = require('bson').ObjectId, - Timestamp = require('bson').Timestamp, - Binary = require('bson').Binary; +const mock = require('../../mock'); +const ObjectId = require('bson').ObjectId; +const Timestamp = require('bson').Timestamp; +const Binary = require('bson').Binary; class ReplSetFixture { constructor() { @@ -22,7 +21,7 @@ class ReplSetFixture { this.firstSecondaryServer = servers[1]; this.arbiterServer = servers[2]; - this.defaultFields = assign({}, ismaster, { + this.defaultFields = Object.assign({}, ismaster, { setName: 'rs', setVersion: 1, electionId: this.electionIds[0], @@ -38,7 +37,7 @@ class ReplSetFixture { defineReplSetStates() { this.primaryStates = [ - assign({}, this.defaultFields, { + Object.assign({}, this.defaultFields, { ismaster: true, secondary: false, me: this.primaryServer.uri(), @@ -48,7 +47,7 @@ class ReplSetFixture { ]; this.firstSecondaryStates = [ - assign({}, this.defaultFields, { + Object.assign({}, this.defaultFields, { ismaster: false, secondary: true, me: this.firstSecondaryServer.uri(), @@ -58,7 +57,7 @@ class ReplSetFixture { ]; this.arbiterStates = [ - assign({}, this.defaultFields, { + Object.assign({}, this.defaultFields, { ismaster: false, secondary: false, arbiterOnly: true, diff --git a/test/tests/unit/mongos/sessions_tests.js b/test/tests/unit/mongos/sessions_tests.js index a00eb1f6d..1c6d60ec7 100644 --- a/test/tests/unit/mongos/sessions_tests.js +++ b/test/tests/unit/mongos/sessions_tests.js @@ -1,7 +1,6 @@ 'use strict'; var Mongos = require('../../../../lib/topologies/mongos'), expect = require('chai').expect, - assign = require('../../../../lib/utils').assign, mock = require('../../../mock'), genClusterTime = require('../common').genClusterTime; @@ -20,7 +19,7 @@ describe('Sessions (Mongos)', function() { const clusterTime = genClusterTime(Date.now()); test.server.setMessageHandler(request => { request.reply( - assign({}, mock.DEFAULT_ISMASTER, { + Object.assign({}, mock.DEFAULT_ISMASTER, { msg: 'isdbgrid', $clusterTime: clusterTime }) @@ -51,7 +50,7 @@ describe('Sessions (Mongos)', function() { const clusterTime = genClusterTime(Date.now()); test.server.setMessageHandler(request => { request.reply( - assign({}, mock.DEFAULT_ISMASTER, { + Object.assign({}, mock.DEFAULT_ISMASTER, { msg: 'isdbgrid', $clusterTime: clusterTime }) @@ -89,7 +88,7 @@ describe('Sessions (Mongos)', function() { const doc = request.document; if (doc.ismaster) { request.reply( - assign({}, mock.DEFAULT_ISMASTER, { + Object.assign({}, mock.DEFAULT_ISMASTER, { msg: 'isdbgrid', $clusterTime: clusterTime }) @@ -138,7 +137,7 @@ describe('Sessions (Mongos)', function() { test: function(done) { test.server.setMessageHandler(request => { request.reply( - assign({}, mock.DEFAULT_ISMASTER, { + Object.assign({}, mock.DEFAULT_ISMASTER, { msg: 'isdbgrid', logicalSessionTimeoutMinutes: 10 }) diff --git a/test/tests/unit/single/sessions_tests.js b/test/tests/unit/single/sessions_tests.js index cd883198c..3c4e97f58 100644 --- a/test/tests/unit/single/sessions_tests.js +++ b/test/tests/unit/single/sessions_tests.js @@ -4,7 +4,6 @@ var Server = require('../../../../lib/topologies/server'), ObjectId = require('bson').ObjectId, Timestamp = require('bson').Timestamp, expect = require('chai').expect, - assign = require('../../../../lib/utils').assign, mock = require('../../../mock'), genClusterTime = require('../common').genClusterTime, ClientSession = require('../../../../lib/sessions').ClientSession, @@ -25,7 +24,7 @@ describe('Sessions (Single)', function() { const clusterTime = genClusterTime(Date.now()); test.server.setMessageHandler(request => { request.reply( - assign({}, mock.DEFAULT_ISMASTER, { + Object.assign({}, mock.DEFAULT_ISMASTER, { $clusterTime: clusterTime }) ); @@ -53,7 +52,7 @@ describe('Sessions (Single)', function() { const doc = request.document; if (doc.ismaster) { request.reply( - assign({}, mock.DEFAULT_ISMASTER, { + Object.assign({}, mock.DEFAULT_ISMASTER, { $clusterTime: clusterTime }) ); @@ -98,7 +97,7 @@ describe('Sessions (Single)', function() { const doc = request.document; if (doc.ismaster) { request.reply( - assign({}, mock.DEFAULT_ISMASTER, { + Object.assign({}, mock.DEFAULT_ISMASTER, { $clusterTime: clusterTime }) ); @@ -153,7 +152,7 @@ describe('Sessions (Single)', function() { sentIsMaster = true; request.reply( - assign({}, mock.DEFAULT_ISMASTER, { + Object.assign({}, mock.DEFAULT_ISMASTER, { maxWireVersion: 6, $clusterTime: clusterTime }) @@ -192,7 +191,7 @@ describe('Sessions (Single)', function() { sentIsMaster = true; request.reply( - assign({}, mock.DEFAULT_ISMASTER, { + Object.assign({}, mock.DEFAULT_ISMASTER, { maxWireVersion: 6, $clusterTime: clusterTime }) @@ -230,7 +229,7 @@ describe('Sessions (Single)', function() { sentIsMaster = true; request.reply( - assign({}, mock.DEFAULT_ISMASTER, { + Object.assign({}, mock.DEFAULT_ISMASTER, { maxWireVersion: 6, logicalSessionTimeoutMinutes: 10 }) @@ -275,7 +274,7 @@ describe('Sessions (Single)', function() { test: function(done) { test.server.setMessageHandler(request => { request.reply( - assign({}, mock.DEFAULT_ISMASTER, { + Object.assign({}, mock.DEFAULT_ISMASTER, { logicalSessionTimeoutMinutes: 10 }) ); @@ -314,7 +313,7 @@ describe('Sessions (Single)', function() { sentIsMaster = true; request.reply( - assign({}, mock.DEFAULT_ISMASTER, { + Object.assign({}, mock.DEFAULT_ISMASTER, { maxWireVersion: 6, logicalSessionTimeoutMinutes: 10 }) @@ -349,7 +348,7 @@ describe('Sessions (Single)', function() { const doc = request.document; if (doc.ismaster) { request.reply( - assign({}, mock.DEFAULT_ISMASTER, { + Object.assign({}, mock.DEFAULT_ISMASTER, { maxWireVersion: 6 }) ); @@ -421,7 +420,7 @@ describe('Sessions (Single)', function() { const doc = request.document; if (doc.ismaster) { request.reply( - assign({}, mock.DEFAULT_ISMASTER, { + Object.assign({}, mock.DEFAULT_ISMASTER, { maxWireVersion: 6 }) ); @@ -494,7 +493,7 @@ describe('Sessions (Single)', function() { const doc = request.document; if (doc.ismaster) { request.reply( - assign({}, mock.DEFAULT_ISMASTER, { + Object.assign({}, mock.DEFAULT_ISMASTER, { maxWireVersion: 6 }) ); @@ -522,7 +521,7 @@ describe('Sessions (Single)', function() { const doc = request.document; if (doc.ismaster) { request.reply( - assign({}, mock.DEFAULT_ISMASTER, { + Object.assign({}, mock.DEFAULT_ISMASTER, { maxWireVersion: 6 }) ); @@ -557,7 +556,7 @@ describe('Sessions (Single)', function() { const doc = request.document; if (doc.ismaster) { request.reply( - assign({}, mock.DEFAULT_ISMASTER, { + Object.assign({}, mock.DEFAULT_ISMASTER, { maxWireVersion: 6 }) ); @@ -637,7 +636,7 @@ describe('Sessions (Single)', function() { const doc = request.document; if (doc.ismaster) { request.reply( - assign({}, mock.DEFAULT_ISMASTER, { + Object.assign({}, mock.DEFAULT_ISMASTER, { maxWireVersion: 6 }) );