chore(deps): update dependency @types/sinon to v7.0.9 (#553)

Author: renovate[bot]

package.json

@@ -87,7 +87,7 @@
     "@types/mocha": "^5.2.5",
     "@types/p-retry": "^3.0.0",
     "@types/proxyquire": "^1.3.28",
-    "@types/sinon": "7.0.8",
+    "@types/sinon": "^7.0.9",
     "@types/stack-trace": "0.0.29",
     "@types/through2": "^2.0.34",
     "@types/time-span": "^2.0.0",

test/database.ts

@@ -28,6 +28,7 @@ import {util} from '@google-cloud/common-grpc';
 import * as pfy from '@google-cloud/promisify';
 import * as db from '../src/database';
 import {Instance} from '../src';
+import {TimestampBounds} from '../src/transaction';
 
 let promisified = false;
 const fakePfy = extend({}, pfy, {
@@ -1256,9 +1257,9 @@ describe('Database', () => {
     let fakeSnapshot: FakeTransaction;
     let fakeStream: Transform;
 
-    let getReadSessionStub: sinon.SinonStub;
-    let snapshotStub: sinon.SinonStub;
-    let runStreamStub: sinon.SinonStub;
+    let getReadSessionStub: sinon.SinonStub<[ReadSessionCallback], void>;
+    let snapshotStub: sinon.SinonStub<[TimestampBounds?], FakeTransaction>;
+    let runStreamStub: sinon.SinonStub<[string|{}], Transform>;
 
     beforeEach(() => {
       fakePool = database.pool_;
@@ -1521,9 +1522,9 @@ describe('Database', () => {
     let fakeSession: FakeSession;
     let fakeSnapshot: FakeTransaction;
 
-    let beginSnapshotStub: sinon.SinonStub;
-    let getReadSessionStub: sinon.SinonStub;
-    let snapshotStub: sinon.SinonStub;
+    let beginSnapshotStub: sinon.SinonStub<[Function], void>;
+    let getReadSessionStub: sinon.SinonStub<[ReadSessionCallback], void>;
+    let snapshotStub: sinon.SinonStub<[TimestampBounds?], FakeTransaction>;
 
     beforeEach(() => {
       fakePool = database.pool_;
@@ -1618,7 +1619,7 @@ describe('Database', () => {
     let fakeSession: FakeSession;
     let fakeTransaction: FakeTransaction;
 
-    let getWriteSessionStub: sinon.SinonStub;
+    let getWriteSessionStub: sinon.SinonStub<[WriteSessionCallback], void>;
 
     beforeEach(() => {
       fakePool = database.pool_;
@@ -1750,10 +1751,10 @@ describe('Database', () => {
     let fakeSession: FakeSession;
     let fakePartitionedDml: FakeTransaction;
 
-    let getReadSessionStub: sinon.SinonStub;
-    let partitionedDmlStub: sinon.SinonStub;
-    let beginStub: sinon.SinonStub;
-    let runUpdateStub: sinon.SinonStub;
+    let getReadSessionStub: sinon.SinonStub<[ReadSessionCallback], void>;
+    let partitionedDmlStub: sinon.SinonStub<[], FakeTransaction>;
+    let beginStub: sinon.SinonStub<[Function], void>;
+    let runUpdateStub: sinon.SinonStub<[string|{}, Function], void>;
 
     beforeEach(() => {
       fakePool = database.pool_;

test/session-pool.ts

@@ -442,7 +442,7 @@ describe('SessionPool', () => {
   });
 
   describe('open', () => {
-    let fillStub: sinon.SinonStub;
+    let fillStub: sinon.SinonStub<[], Promise<void>>;
 
     beforeEach(() => {
       sessionPool._stopHouseKeeping = sandbox.stub();
@@ -479,7 +479,7 @@ describe('SessionPool', () => {
   });
 
   describe('release', () => {
-    let prepStub: sinon.SinonStub;
+    let prepStub: sinon.SinonStub<[Session], Promise<void>>;
 
     beforeEach(() => {
       prepStub = sandbox.stub(sessionPool, '_prepareTransaction').resolves();
@@ -880,7 +880,7 @@ describe('SessionPool', () => {
   });
 
   describe('_evictIdleSessions', () => {
-    let destroyStub: sinon.SinonStub;
+    let destroyStub: sinon.SinonStub<[Session], Promise<void>>;
     let fakeSessions;
 
     beforeEach(() => {
@@ -939,8 +939,8 @@ describe('SessionPool', () => {
   });
 
   describe('_fill', () => {
-    let readonly: sinon.SinonStub;
-    let readwrite: sinon.SinonStub;
+    let readonly: sinon.SinonStub<[types], Promise<void>>;
+    let readwrite: sinon.SinonStub<[types], Promise<void>>;
 
     beforeEach(() => {
       const stub = sandbox.stub(sessionPool, '_createSessionInBackground');
@@ -983,7 +983,7 @@ describe('SessionPool', () => {
       const end = timeSpan();
 
       const delayedResolve = () =>
-          new Promise(resolve => setTimeout(resolve, delay));
+          new Promise<void>(resolve => setTimeout(resolve, delay));
 
       readonly.callsFake(delayedResolve);
       readwrite.callsFake(delayedResolve);

test/table.ts

@@ -24,6 +24,8 @@ import {split} from 'split-array-stream';
 import {Transform} from 'stream';
 import * as through from 'through2';
 
+import {TimestampBounds} from '../src/transaction';
+
 let promisified = false;
 const fakePfy = extend({}, pfy, {
   promisifyAll(klass, options) {
@@ -35,6 +37,26 @@ const fakePfy = extend({}, pfy, {
   },
 });
 
+class FakeTransaction {
+  commit(callback) {
+    callback(null, {});
+  }
+  createReadStream() {
+    return through.obj();
+  }
+  deleteRows(name, keys) {}
+  end() {}
+  insert(table, row) {}
+  replace(table, row) {}
+  upsert(table, row) {}
+  update(table, row) {}
+}
+
+interface GetSnapshotCallback {
+  (err: Error, snapshot?: null): void;
+  (err: null, snapshot: FakeTransaction): void;
+}
+
 describe('Table', () => {
   const sandbox = sinon.createSandbox();
 
@@ -43,21 +65,11 @@ describe('Table', () => {
   // tslint:disable-next-line no-any variable-name
   let TableCached: any;
   let table;
+  let transaction: FakeTransaction;
 
   const DATABASE = {
-    runTransaction: callback => callback(null, TRANSACTION),
-    getSnapshot: (options, callback) => callback(null, TRANSACTION),
-  };
-
-  const TRANSACTION = {
-    commit: callback => callback(),
-    createReadStream: () => through.obj(),
-    deleteRows: (name, keys) => {},
-    end: () => {},
-    insert: (table, row) => {},
-    replace: (table, row) => {},
-    upsert: (table, row) => {},
-    update: (table, row) => {},
+    runTransaction: callback => callback(null, transaction),
+    getSnapshot: (options, callback) => callback(null, transaction),
   };
 
   const NAME = 'table-name';
@@ -72,6 +84,7 @@ describe('Table', () => {
   beforeEach(() => {
     extend(Table, TableCached);
     table = new Table(DATABASE, NAME);
+    transaction = new FakeTransaction();
   });
 
   afterEach(() => sandbox.restore());
@@ -107,16 +120,16 @@ describe('Table', () => {
 
   describe('createReadStream', () => {
     let fakeReadStream: Transform;
-    let getSnapshotStub: sinon.SinonStub;
+    let getSnapshotStub: sinon.SinonStub<[TimestampBounds, GetSnapshotCallback], void>;
 
     const REQUEST = {keys: ['key']};
 
     beforeEach(() => {
       fakeReadStream = through.obj();
-      sandbox.stub(TRANSACTION, 'createReadStream').returns(fakeReadStream);
+      sandbox.stub(transaction, 'createReadStream').returns(fakeReadStream);
       getSnapshotStub =
           sandbox.stub(DATABASE, 'getSnapshot')
-              .callsFake((_, callback) => callback(null, TRANSACTION));
+              .callsFake((_, callback) => callback(null, transaction));
     });
 
     it('should destroy the user stream if unable to get a snapshot', done => {
@@ -141,7 +154,7 @@ describe('Table', () => {
     });
 
     it('should destroy the user stream and end the txn on error', done => {
-      const endStub = sandbox.stub(TRANSACTION, 'end');
+      const endStub = sandbox.stub(transaction, 'end');
       const fakeError = new Error('err');
 
       table.createReadStream(REQUEST).on('error', err => {
@@ -170,7 +183,7 @@ describe('Table', () => {
     });
 
     it('should end the transaction on stream end', done => {
-      sandbox.stub(TRANSACTION, 'end').callsFake(done);
+      sandbox.stub(transaction, 'end').callsFake(done);
       table.createReadStream(REQUEST).on('error', done);
       fakeReadStream.end();
     });
@@ -219,9 +232,9 @@ describe('Table', () => {
 
     it('should delete the rows via transaction', done => {
       const stub =
-          sandbox.stub(TRANSACTION, 'deleteRows').withArgs(table.name, KEYS);
+          sandbox.stub(transaction, 'deleteRows').withArgs(table.name, KEYS);
 
-      sandbox.stub(TRANSACTION, 'commit').callsFake(callback => callback());
+      sandbox.stub(transaction, 'commit').callsFake(callback => callback());
 
       table.deleteRows(KEYS, err => {
         assert.ifError(err);
@@ -263,7 +276,7 @@ describe('Table', () => {
 
     it('should insert via transaction', done => {
       const stub =
-          sandbox.stub(TRANSACTION, 'insert').withArgs(table.name, ROW);
+          sandbox.stub(transaction, 'insert').withArgs(table.name, ROW);
 
       table.insert(ROW, err => {
         assert.ifError(err);
@@ -354,7 +367,7 @@ describe('Table', () => {
 
     it('should replace via transaction', done => {
       const stub =
-          sandbox.stub(TRANSACTION, 'replace').withArgs(table.name, ROW);
+          sandbox.stub(transaction, 'replace').withArgs(table.name, ROW);
 
       table.replace(ROW, err => {
         assert.ifError(err);
@@ -381,7 +394,7 @@ describe('Table', () => {
 
     it('should update via transaction', done => {
       const stub =
-          sandbox.stub(TRANSACTION, 'update').withArgs(table.name, ROW);
+          sandbox.stub(transaction, 'update').withArgs(table.name, ROW);
 
       table.update(ROW, err => {
         assert.ifError(err);
@@ -408,7 +421,7 @@ describe('Table', () => {
 
     it('should upsert via transaction', done => {
       const stub =
-          sandbox.stub(TRANSACTION, 'upsert').withArgs(table.name, ROW);
+          sandbox.stub(transaction, 'upsert').withArgs(table.name, ROW);
 
       table.upsert(ROW, err => {
         assert.ifError(err);