test: remove --proxyquire-shim from common, bigquery, datastore, and dns

core/common/package.json

@@ -20,7 +20,7 @@
   ],
   "scripts": {
     "docs": "jsdoc -c .jsdoc.js",
-    "test": "node ../../bin/run-test.cjs --proxyquire-shim build/test",
+    "test": "node ../../bin/run-test.cjs build/test",
     "prepare": "npm run compile",
     "pretest": "npm run compile",
     "compile": "tsc -p .",
@@ -57,6 +57,7 @@
     "@types/tmp": "^0.2.6",
     "c8": "^10.1.3",
     "codecov": "^3.8.3",
+    "google-test-utils": "^0.4.0",
     "gts": "^6.0.2",
     "jsdoc": "^4.0.4",
     "jsdoc-fresh": "^6.1.0",

core/common/test/service-object.ts

@@ -20,7 +20,8 @@
 import * as assert from 'assert';
 import {describe, it, beforeEach, afterEach} from 'mocha';
 import * as extend from 'extend';
-import * as proxyquire from 'proxyquire';
+import {proxyquire} from 'google-test-utils';
+// eslint-disable-next-line import/namespace
 import * as r from 'teeny-request';
 import * as sinon from 'sinon';
 
@@ -298,7 +299,7 @@
           );
           assert.strictEqual((reqOpts as DecorateRequestOptions).uri, '');
           done();
           (callback as any)(null, null, {} as r.Response);
         });
       serviceObject.delete(assert.ifError);
     });
@@ -313,7 +314,7 @@
             options,
           );
           done();
           (callback as any)(null, null, {} as r.Response);
         });
       serviceObject.delete(options, assert.ifError);
     });
@@ -344,7 +345,7 @@
             'PATCH',
           );
           done();
           (callback as any)(null, null, null!);
         });
 
       const serviceObject = new ServiceObject(CONFIG) as FakeServiceObject;
@@ -384,7 +385,7 @@
             undefined,
           );
           done();
           (callback as any)(null, null, {} as r.Response);
         });
       serviceObject.delete(options, assert.ifError);
     });
@@ -414,7 +415,7 @@
             thisPropertyWasOverridden: true,
           });
           done();
           (callback as any)(null, null, null!);
         });
 
       const serviceObject = new ServiceObject(CONFIG) as FakeServiceObject;
@@ -459,7 +460,7 @@
         .callsFake((options_, callback) => {
           assert.deepStrictEqual(options_, options);
           done();
           (callback as any)(null, null, {} as r.Response);
         });
       serviceObject.exists(options, assert.ifError);
     });
@@ -664,7 +665,7 @@
         assert.strictEqual(this, serviceObject);
         assert.strictEqual((reqOpts as DecorateRequestOptions).uri, '');
         done();
         (callback as any)(null, null, {} as r.Response);
       });
       void serviceObject.getMetadata(() => {});
     });
@@ -679,7 +680,7 @@
             options,
           );
           done();
           (callback as any)(null, null, {} as r.Response);
         });
       serviceObject.getMetadata(options, assert.ifError);
     });
@@ -705,7 +706,7 @@
             'v2',
           );
           done();
           (callback as any)(null, null, null!);
         });
 
       const serviceObject = new ServiceObject(CONFIG) as FakeServiceObject;

core/common/test/service.ts

@@ -15,7 +15,7 @@
 import * as assert from 'assert';
 import {describe, it, before, beforeEach, after} from 'mocha';
 import * as extend from 'extend';
-import * as proxyquire from 'proxyquire';
+import {proxyquire} from 'google-test-utils';
 import {Request} from 'teeny-request';
 import {AuthClient, GoogleAuth, OAuth2Client} from 'google-auth-library';
 

core/common/test/util.ts

@@ -26,7 +26,7 @@ import {
   OAuth2Client,
 } from 'google-auth-library';
 import * as nock from 'nock';
-import * as proxyquire from 'proxyquire';
+import {proxyquire} from 'google-test-utils';
 import * as retryRequest from 'retry-request';
 import * as sinon from 'sinon';
 import * as stream from 'stream';

handwritten/bigquery/package.json

@@ -36,7 +36,7 @@
     "docs": "jsdoc -c .jsdoc.js",
     "lint": "gts check",
     "samples-test": "cd samples/ && pnpm link ../ && pnpm test && cd ../",
-    "test": "node ../../bin/run-test.cjs --proxyquire-shim build/test",
+    "test": "node ../../bin/run-test.cjs build/test",
     "system-test": "node ../../bin/run-test.cjs build/system-test --timeout 600000",
     "presystem-test": "pnpm run compile",
     "clean": "gts clean",
@@ -91,6 +91,7 @@
     "codecov": "^3.8.3",
     "discovery-tsd": "^0.3.0",
     "eslint-plugin-prettier": "^5.2.6",
+    "google-test-utils": "^0.4.0",
     "gts": "^6.0.2",
     "jsdoc": "^4.0.4",
     "jsdoc-fresh": "^6.1.0",

handwritten/bigquery/system-test/arrow.ts

@@ -562,7 +562,8 @@ describe('Arrow Query Results', () => {
 
   it('should raise the same error as query() when a jobs.insert query fails during execution', async () => {
     const failingQuery = {
-      query: 'SELECT 1 / 0',
+      query:
+        'DECLARE n INT64 DEFAULT 50; SELECT 1 / (x - 50) FROM UNNEST(GENERATE_ARRAY(1, n)) AS x ORDER BY x;',
       jobTimeoutMs: 60000,
       useQueryCache: false,
     };

handwritten/bigquery/test/bigquery.ts

@@ -24,7 +24,7 @@ import * as assert from 'assert';
 import {describe, it, after, afterEach, before, beforeEach} from 'mocha';
 import * as Big from 'big.js';
 import * as extend from 'extend';
-import * as proxyquire from 'proxyquire';
+import {proxyquire} from 'google-test-utils';
 import * as sinon from 'sinon';
 import * as crypto from 'crypto';
 

handwritten/bigquery/test/dataset.ts

@@ -22,7 +22,7 @@ import * as pfy from '@google-cloud/promisify';
 import * as assert from 'assert';
 import {describe, it, before, beforeEach} from 'mocha';
 import * as extend from 'extend';
-import * as proxyquire from 'proxyquire';
+import {proxyquire} from 'google-test-utils';
 
 import * as _root from '../src';
 import {toArray} from '../src/util';

handwritten/bigquery/test/job.ts

@@ -16,7 +16,7 @@ import {DecorateRequestOptions, util} from '@google-cloud/common';
 import * as pfy from '@google-cloud/promisify';
 import * as assert from 'assert';
 import {describe, it, beforeEach, afterEach, before} from 'mocha';
-import * as proxyquire from 'proxyquire';
+import {proxyquire} from 'google-test-utils';
 import * as sinon from 'sinon';
 
 import {BigQuery} from '../src/bigquery';

handwritten/bigquery/test/model.ts

@@ -15,7 +15,7 @@
 import * as assert from 'assert';
 import {describe, it, before, beforeEach, afterEach} from 'mocha';
 import * as sinon from 'sinon';
-import * as proxyquire from 'proxyquire';
+import {proxyquire} from 'google-test-utils';
 import * as pfy from '@google-cloud/promisify';
 import {EventEmitter} from 'events';
 import {JobOptions} from '../src/job';

handwritten/bigquery/test/routine.ts

@@ -17,7 +17,7 @@ import * as pfy from '@google-cloud/promisify';
 import * as assert from 'assert';
 import {describe, it, before, beforeEach} from 'mocha';
 import * as extend from 'extend';
-import * as proxyquire from 'proxyquire';
+import {proxyquire} from 'google-test-utils';
 
 import * as _root from '../src';
 

handwritten/bigquery/test/rowQueue.ts

@@ -16,7 +16,7 @@ import {util} from '@google-cloud/common';
 import * as assert from 'assert';
 import {describe, it, before, beforeEach, afterEach} from 'mocha';
 import {Duplex, Stream} from 'stream';
-import * as proxyquire from 'proxyquire';
+import {proxyquire} from 'google-test-utils';
 import * as sinon from 'sinon';
 import * as q from '../src/rowQueue';
 import * as t from '../src/table';

handwritten/bigquery/test/table.ts

@@ -26,7 +26,7 @@ import {describe, it, afterEach, beforeEach, before, after} from 'mocha';
 import * as Big from 'big.js';
 import {EventEmitter} from 'events';
 import * as extend from 'extend';
-import * as proxyquire from 'proxyquire';
+import {proxyquire} from 'google-test-utils';
 import * as sinon from 'sinon';
 import * as stream from 'stream';
 import * as crypto from 'crypto';

handwritten/datastore/package.json

@@ -38,7 +38,7 @@
     "presystem-test": "npm run compile",
     "system-test": "node ../../bin/run-test.cjs build/system-test --timeout 600000",
     "pretest": "npm run compile",
-    "test": "node ../../bin/run-test.cjs --proxyquire-shim build/test",
+    "test": "node ../../bin/run-test.cjs build/test",
     "precompile": "gts clean"
   },
   "dependencies": {
@@ -68,6 +68,7 @@
     "async": "^3.2.6",
     "c8": "^10.1.3",
     "gapic-tools": "^2.2.0",
+    "google-test-utils": "^0.4.0",
     "gts": "^6.0.2",
     "js-yaml": "^4.1.0",
     "jsdoc": "^4.0.4",

handwritten/datastore/system-test/transaction-spy.ts

@@ -12,7 +12,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-import * as proxyquire from 'proxyquire';
+import {proxyquire} from 'google-test-utils';
 import {DatastoreRequest} from '../src';
 import {RequestCallback, RequestConfig} from '../src/request';
 

handwritten/datastore/test/gapic-mocks/client-initialization-testing.ts

@@ -21,7 +21,7 @@ import {
   DatastoreOptions,
 } from '../../src';
 import * as assert from 'assert';
-import * as proxyquire from 'proxyquire';
+import {proxyquire} from 'google-test-utils';
 import {Callback, CallOptions} from 'google-gax';
 import * as protos from '../../src/protos';
 import * as ds from '../../src';

handwritten/datastore/test/index-class.ts

@@ -15,7 +15,7 @@
 import * as promisify from '@google-cloud/promisify';
 import * as assert from 'assert';
 import {before, beforeEach, describe, it} from 'mocha';
-import * as proxyquire from 'proxyquire';
+import {proxyquire} from 'google-test-utils';
 
 import * as ds from '../src';
 

handwritten/datastore/test/index.ts

@@ -15,7 +15,7 @@
 import * as assert from 'assert';
 import {before, beforeEach, after, afterEach, describe, it} from 'mocha';
 import * as gax from 'google-gax';
-import * as proxyquire from 'proxyquire';
+import {proxyquire} from 'google-test-utils';
 import {PassThrough, Readable} from 'stream';
 
 import * as ds from '../src';

handwritten/datastore/test/request.ts

@@ -18,7 +18,7 @@ import {after, afterEach, before, beforeEach, describe, it} from 'mocha';
 import * as extend from 'extend';
 import * as gax from 'google-gax';
 import * as is from 'is';
-import * as proxyquire from 'proxyquire';
+import {proxyquire} from 'google-test-utils';
 import * as sinon from 'sinon';
 import {PassThrough, Transform} from 'stream';
 

handwritten/datastore/test/transaction.ts

@@ -16,7 +16,7 @@ import * as pfy from '@google-cloud/promisify';
 import arrify = require('arrify');
 import * as assert from 'assert';
 import {afterEach, beforeEach, before, describe, it} from 'mocha';
-import * as proxyquire from 'proxyquire';
+import {proxyquire} from 'google-test-utils';
 import {
   Datastore,
   DatastoreOptions,

handwritten/google-cloud-dns/package.json

@@ -33,7 +33,7 @@
   "scripts": {
     "docs": "jsdoc -c .jsdoc.js",
     "lint": "gts check",
-    "test": "node ../../bin/run-test.cjs --proxyquire-shim build/test",
+    "test": "node ../../bin/run-test.cjs build/test",
     "samples-test": "pnpm run compile && cd samples/ && pnpm link ../ && pnpm i && pnpm test",
     "presystem-test": "pnpm run compile",
     "system-test": "pnpm run compile && node ../../bin/run-test.cjs build/system-test",
@@ -64,6 +64,7 @@
     "@types/tmp": "^0.2.6",
     "c8": "^10.1.3",
     "codecov": "^3.8.3",
+    "google-test-utils": "^0.4.0",
     "gts": "^6.0.2",
     "jsdoc": "^4.0.4",
     "jsdoc-fresh": "^6.1.0",

handwritten/google-cloud-dns/test/change.ts

@@ -20,7 +20,7 @@ import {
 import * as promisify from '@google-cloud/promisify';
 import * as assert from 'assert';
 import {describe, it, before, beforeEach} from 'mocha';
-import * as proxyquire from 'proxyquire';
+import {proxyquire} from 'google-test-utils';
 import {Change} from '../src/change';
 
 let promisified = false;
@@ -119,7 +119,7 @@ describe('Change', () => {
             assert.strictEqual(change, null);
             assert.strictEqual(apiResponse_, apiResponse);
             done();
-          }
+          },
         );
       });
     });
@@ -145,7 +145,7 @@ describe('Change', () => {
             assert.strictEqual(change_, change);
             assert.strictEqual(apiResponse_, apiResponse);
             done();
-          }
+          },
         );
       });
 

handwritten/google-cloud-dns/test/index.ts

@@ -22,7 +22,7 @@ import * as promisify from '@google-cloud/promisify';
 import arrify = require('arrify');
 import * as assert from 'assert';
 import {describe, it, before, beforeEach} from 'mocha';
-import * as proxyquire from 'proxyquire';
+import {proxyquire} from 'google-test-utils';
 import {CoreOptions, OptionsWithUri, Response} from 'request';
 
 import {Zone} from '../src';
@@ -135,7 +135,7 @@ describe('DNS', () => {
       assert.deepStrictEqual(
         calledWith.packageJson,
         // eslint-disable-next-line @typescript-eslint/no-var-requires
-        require('../../package.json')
+        require('../../package.json'),
       );
     });
 
@@ -226,7 +226,7 @@ describe('DNS', () => {
             assert.strictEqual(zone, null);
             assert.strictEqual(apiResponse_, apiResponse);
             done();
-          }
+          },
         );
       });
     });
@@ -265,7 +265,7 @@ describe('DNS', () => {
             assert.strictEqual(apiResponse_, apiResponse);
 
             done();
-          }
+          },
         );
       });
 
@@ -318,15 +318,15 @@ describe('DNS', () => {
             err: Error,
             zones: Zone[],
             nextQuery: {},
-            apiResponse_: Response
+            apiResponse_: Response,
           ) => {
             assert.strictEqual(err, error);
             assert.strictEqual(zones, null);
             assert.strictEqual(nextQuery, null);
             assert.strictEqual(apiResponse_, apiResponse);
 
             done();
-          }
+          },
         );
       });
     });
@@ -377,7 +377,7 @@ describe('DNS', () => {
             nextQuery,
             Object.assign({}, query, {
               pageToken: apiResponseWithNextPageToken.nextPageToken,
-            })
+            }),
           );
 
           done();
@@ -391,15 +391,15 @@ describe('DNS', () => {
             err: Error,
             zones: Zone[],
             nextQuery: {},
-            apiResponse_: Response
+            apiResponse_: Response,
           ) => {
             assert.ifError(err);
             assert.strictEqual(zones[0], zone);
             assert.strictEqual(nextQuery, null);
             assert.strictEqual(apiResponse_, apiResponse);
 
             done();
-          }
+          },
         );
       });
 

handwritten/google-cloud-dns/test/record.ts

@@ -15,7 +15,7 @@
 import * as promisify from '@google-cloud/promisify';
 import * as assert from 'assert';
 import {describe, it, before, beforeEach} from 'mocha';
-import * as proxyquire from 'proxyquire';
+import {proxyquire} from 'google-test-utils';
 
 // eslint-disable-next-line @typescript-eslint/no-unused-vars
 import {Record} from '../src';
@@ -297,7 +297,7 @@
   });
 
   describe('delete', () => {
     it('should call zone.deleteRecords', (done: any) => {
       record.zone_.deleteRecords = (records: Record[], callback: Function) => {
         assert.strictEqual(records, record);
         callback();