Upgrade sinon from 3.2.1 to 7.2.2

spy.reset() was deprecated, so we use spy.resetHistory() from now on

package.json

@@ -111,8 +111,8 @@
 		"prettier": "1.10.2",
 		"rewire": "4.0.1",
 		"rx": "4.1.0",
-		"sinon": "3.2.1",
-		"sinon-chai": "2.14.0",
+		"sinon": "7.2.2",
+		"sinon-chai": "3.3.0",
 		"snyk": "^1.122.0",
 		"stampit": "4.2.0",
 		"supertest": "3.3.0"

test/unit/api/ws/middleware/emit.js

@@ -43,7 +43,7 @@ describe('emitMiddleware', () => {
 		});
 
 		afterEach(() => {
-			return validNext.reset();
+			return validNext.resetHistory();
 		});
 
 		it('should call validNext', () => {

test/unit/api/ws/rpc/connect.js

@@ -102,8 +102,8 @@ describe('connect', () => {
 			});
 
 			afterEach(done => {
-				addConnectionOptionsSpySpy.reset();
-				addSocketSpy.reset();
+				addConnectionOptionsSpySpy.resetHistory();
+				addSocketSpy.resetHistory();
 				done();
 			});
 
@@ -220,7 +220,7 @@ describe('connect', () => {
 				done();
 			});
 			afterEach(done => {
-				scClientConnectStub.reset();
+				scClientConnectStub.resetHistory();
 				done();
 			});
 			after(done => {
@@ -269,7 +269,7 @@ describe('connect', () => {
 				done();
 			});
 			afterEach(done => {
-				upgradeToWAMPSpy.reset();
+				upgradeToWAMPSpy.resetHistory();
 				done();
 			});
 			after(done => {
@@ -304,8 +304,8 @@ describe('connect', () => {
 			});
 			beforeEach(done => {
 				const registerRPC = connectRewired.__get__('connectSteps.registerRPC');
-				validRPCSocket.call.reset();
-				validRPCSocket.emit.reset();
+				validRPCSocket.call.resetHistory();
+				validRPCSocket.emit.resetHistory();
 				validPeer.socket = validRPCSocket;
 				peerAsResult = registerRPC(validPeer, loggerMock, masterWAMPServerMock);
 				done();
@@ -341,7 +341,7 @@ describe('connect', () => {
 					});
 					beforeEach(beforeEachCb => {
 						peerAsResult.socket.call.resolves(validRPCResult);
-						validRPCCallback.reset();
+						validRPCCallback.resetHistory();
 						peerAsResult.rpc[validRPCProcedureName](
 							validRPCArgument,
 							(...args) => {
@@ -396,7 +396,7 @@ describe('connect', () => {
 					describe('when peer.socket.call failed', () => {
 						const validRPCError = 'valid rpc error';
 						beforeEach(beforeEachCb => {
-							validRPCCallback.reset();
+							validRPCCallback.resetHistory();
 							peerAsResult.socket.call.rejects(validRPCError);
 							peerAsResult.rpc[validRPCProcedureName](
 								validRPCArgument,
@@ -446,7 +446,7 @@ describe('connect', () => {
 				done();
 			});
 			beforeEach(done => {
-				validSocket.on.reset();
+				validSocket.on.resetHistory();
 				const registerSocketListeners = connectRewired.__get__(
 					'connectSteps.registerSocketListeners'
 				);

test/unit/api/ws/workers/peers_update_rules.js

@@ -44,7 +44,7 @@ describe('PeersUpdateRules', () => {
 		sinonSandbox
 			.stub(peersUpdateRules.slaveToMasterSender, 'send')
 			.callsArg(3, null);
-		actionCb.reset();
+		actionCb.resetHistory();
 		validPeer = _.clone(prefixedPeer);
 		connectionsTable.nonceToConnectionIdMap = {};
 		connectionsTable.connectionIdToNonceMap = {};
@@ -426,9 +426,9 @@ describe('PeersUpdateRules', () => {
 		});
 
 		beforeEach(done => {
-			insertStub.reset();
-			removeStub.reset();
-			blockStub.reset();
+			insertStub.resetHistory();
+			removeStub.resetHistory();
+			blockStub.resetHistory();
 			connectionsTable.getNonce.restore();
 			connectionsTable.getConnectionId.restore();
 			done();

test/unit/api/ws/workers/rules.js

@@ -25,9 +25,9 @@ describe('Rules', () => {
 
 	beforeEach(done => {
 		rules = new Rules(insertMock, removeMock, blockMock);
-		insertMock.reset();
-		removeMock.reset();
-		blockMock.reset();
+		insertMock.resetHistory();
+		removeMock.resetHistory();
+		blockMock.resetHistory();
 		done();
 	});
 

test/unit/helpers/ban_manager.js

@@ -75,7 +75,7 @@ describe('BanManager', () => {
 		});
 
 		beforeEach(done => {
-			onBanFinishedSpy.reset();
+			onBanFinishedSpy.resetHistory();
 			banManagerInstance.bannedPeers = {};
 			banManagerInstance.banTemporarily(validPeer, onBanFinishedSpy);
 			return done();

test/unit/helpers/http_api.js

@@ -79,18 +79,18 @@ describe('httpApi', () => {
 		});
 
 		afterEach(done => {
-			validNextSpy.reset();
-			spyConsoleTrace.reset();
+			validNextSpy.resetHistory();
+			spyConsoleTrace.resetHistory();
 			done();
 		});
 
 		after(done => {
-			loggerMock.trace.reset();
-			loggerMock.log.reset();
-			loggerMock.error.reset();
-			resMock.header.reset();
-			resMock.status.reset();
-			resMock.send.reset();
+			loggerMock.trace.resetHistory();
+			loggerMock.log.resetHistory();
+			loggerMock.error.resetHistory();
+			resMock.header.resetHistory();
+			resMock.status.resetHistory();
+			resMock.send.resetHistory();
 			done();
 		});