Merge 5c9f8fd into 7bf59df

test/Error.spec.ts

@@ -1,6 +1,6 @@
 'use strict';
 
-require('../testUtils');
+require('./testUtils.js');
 
 import * as Error from '../src/Error';
 import {expect} from 'chai';

test/Integration.spec.ts

@@ -2,7 +2,7 @@
 
 import * as childProcess from 'child_process';
 
-const testUtils = require('../testUtils');
+const testUtils = require('./testUtils.js');
 
 describe('Integration test', function() {
   this.timeout(50000);

test/PlatformFunctions.spec.ts

@@ -1,6 +1,6 @@
 'use strict';
 
-require('../testUtils');
+require('./testUtils.js');
 
 import * as fs from 'fs';
 import * as path from 'path';

test/RequestSender.spec.js

@@ -2,11 +2,11 @@
 
 const {RequestSender} = require('../lib/RequestSender');
 
-const stripe = require('../testUtils').getSpyableStripe();
+const stripe = require('./testUtils.js').getSpyableStripe();
 const expect = require('chai').expect;
 
 const {HttpClientResponse} = require('../lib/net/HttpClient');
-const utils = require('../testUtils');
+const utils = require('./testUtils.js');
 const nock = require('nock');
 
 const {

test/StripeResource.spec.js

@@ -2,9 +2,9 @@
 
 const nock = require('nock');
 
-const stripe = require('../testUtils').getSpyableStripe();
+const stripe = require('./testUtils.js').getSpyableStripe();
 const expect = require('chai').expect;
-const testUtils = require('../testUtils');
+const testUtils = require('./testUtils.js');
 
 const {StripeResource} = require('../lib/StripeResource');
 const stripeMethod = StripeResource.method;

test/Webhook.spec.ts

@@ -1,7 +1,7 @@
 'use strict';
 
 const {StripeSignatureVerificationError} = require('../lib/Error');
-const {getSpyableStripe, FakeCryptoProvider} = require('../testUtils');
+const {getSpyableStripe, FakeCryptoProvider} = require('./testUtils.js');
 const stripe = getSpyableStripe();
 import {expect} from 'chai';
 

test/autoPagination.spec.js

@@ -2,7 +2,7 @@
 
 /* eslint-disable callback-return */
 
-const testUtils = require('../testUtils');
+const testUtils = require('./testUtils.js');
 const {StripeResource} = require('../lib/StripeResource');
 
 const {makeAutoPaginationMethods} = require('../lib/autoPagination');
@@ -305,42 +305,67 @@ describe('auto pagination', function() {
     });
 
     describe('async iterators', () => {
-      if (testUtils.envSupportsForAwait()) {
-        // `for await` throws a syntax error everywhere but node 10,
-        // so we must conditionally require it.
-        const forAwaitUntil = require('../testUtils/forAwait.node10')
-          .forAwaitUntil;
-
-        it('works with `for await` when that feature exists (user break)', () => {
-          const {paginator} = mockPagination(ID_PAGES, {});
-
-          return expect(
-            new Promise((resolve, reject) => {
-              forAwaitUntil(paginator, LIMIT)
-                .then((customers) => {
-                  resolve(customers.map((customer) => customer.id));
-                })
-                .catch(reject);
-            })
-          ).to.eventually.deep.equal(OBJECT_IDS.slice(0, LIMIT));
-        });
-
-        it('works with `for await` when that feature exists (end of list)', () => {
-          const {paginator} = mockPagination(ID_PAGES, {});
+      async function awaitUntil(iterator, limit) {
+        const items = [];
+        while (true) {
+          // eslint-disable-next-line no-await-in-loop
+          const {value, done} = await iterator.next();
+          if (done) {
+            break;
+          }
+          items.push(value);
+          if (items.length === limit) {
+            break;
+          }
+          if (items.length > limit) {
+            throw Error('Kept iterating after break.');
+          }
+        }
+        return items;
+      }
 
-          return expect(
-            new Promise((resolve, reject) => {
-              forAwaitUntil(paginator, TOTAL_OBJECTS + 1)
-                .then((customers) => {
-                  resolve(customers.map((customer) => customer.id));
-                })
-                .catch(reject);
-            })
-          ).to.eventually.deep.equal(OBJECT_IDS);
-        });
+      async function forAwaitUntil(iterator, limit) {
+        const items = [];
+        for await (const item of iterator) {
+          items.push(item);
+          if (items.length === limit) {
+            break;
+          }
+          if (items.length > limit) {
+            throw Error('Kept iterating after break.');
+          }
+        }
+        return items;
       }
 
-      const awaitUntil = require('../testUtils/await.node7').awaitUntil;
+      it('works with `for await` when that feature exists (user break)', () => {
+        const {paginator} = mockPagination(ID_PAGES, {});
+
+        return expect(
+          new Promise((resolve, reject) => {
+            forAwaitUntil(paginator, LIMIT)
+              .then((customers) => {
+                resolve(customers.map((customer) => customer.id));
+              })
+              .catch(reject);
+          })
+        ).to.eventually.deep.equal(OBJECT_IDS.slice(0, LIMIT));
+      });
+
+      it('works with `for await` when that feature exists (end of list)', () => {
+        const {paginator} = mockPagination(ID_PAGES, {});
+
+        return expect(
+          new Promise((resolve, reject) => {
+            forAwaitUntil(paginator, TOTAL_OBJECTS + 1)
+              .then((customers) => {
+                resolve(customers.map((customer) => customer.id));
+              })
+              .catch(reject);
+          })
+        ).to.eventually.deep.equal(OBJECT_IDS);
+      });
+
       it('works with `await` and a while loop when await exists', () => {
         const {paginator} = mockPagination(ID_PAGES, {});
 

test/flows.spec.ts

@@ -1,6 +1,6 @@
 'use strict';
 
-const testUtils = require('../testUtils');
+const testUtils = require('./testUtils.js');
 const chai = require('chai');
 const stripe = require('../lib/stripe.node')(
   testUtils.getUserStripeKey(),

test/resources/Account.spec.js

@@ -1,6 +1,6 @@
 'use strict';
 
-const stripe = require('../../testUtils').getSpyableStripe();
+const stripe = require('../testUtils.js').getSpyableStripe();
 const expect = require('chai').expect;
 
 const TEST_AUTH_KEY = 'aGN0bIwXnHdw5645VABjPdSn8nWY7G11';

test/resources/AccountLinks.spec.js

@@ -1,6 +1,6 @@
 'use strict';
 
-const stripe = require('../../testUtils').getSpyableStripe();
+const stripe = require('../testUtils.js').getSpyableStripe();
 const expect = require('chai').expect;
 
 describe('AccountLinks Resource', () => {

test/resources/ApplePayDomains.spec.js

@@ -1,6 +1,6 @@
 'use strict';
 
-const stripe = require('../../testUtils').getSpyableStripe();
+const stripe = require('../testUtils.js').getSpyableStripe();
 const expect = require('chai').expect;
 
 describe('ApplePayDomains Resource', () => {

test/resources/ApplicationFees.spec.js

@@ -1,6 +1,6 @@
 'use strict';
 
-const stripe = require('../../testUtils').getSpyableStripe();
+const stripe = require('../testUtils.js').getSpyableStripe();
 const expect = require('chai').expect;
 
 describe('ApplicationFee Resource', () => {

test/resources/Balance.spec.js

@@ -1,6 +1,6 @@
 'use strict';
 
-const stripe = require('../../testUtils').getSpyableStripe();
+const stripe = require('../testUtils.js').getSpyableStripe();
 const expect = require('chai').expect;
 
 describe('Balance Resource', () => {

test/resources/BalanceTransactions.spec.js

@@ -1,6 +1,6 @@
 'use strict';
 
-const stripe = require('../../testUtils').getSpyableStripe();
+const stripe = require('../testUtils.js').getSpyableStripe();
 const expect = require('chai').expect;
 
 describe('BalanceTransactions Resource', function() {

test/resources/BillingPortal/Configurations.spec.js

@@ -1,6 +1,6 @@
 'use strict';
 
-const stripe = require('../../../testUtils').getSpyableStripe();
+const stripe = require('../../testUtils.js').getSpyableStripe();
 
 const expect = require('chai').expect;
 

test/resources/BillingPortal/Sessions.spec.js

@@ -1,6 +1,6 @@
 'use strict';
 
-const stripe = require('../../../testUtils').getSpyableStripe();
+const stripe = require('../../testUtils.js').getSpyableStripe();
 
 const expect = require('chai').expect;
 

test/resources/Charges.spec.js

@@ -1,6 +1,6 @@
 'use strict';
 
-const stripe = require('../../testUtils').getSpyableStripe();
+const stripe = require('../testUtils.js').getSpyableStripe();
 const expect = require('chai').expect;
 
 describe('Charge Resource', () => {

test/resources/Checkout/Sessions.spec.js

@@ -1,6 +1,6 @@
 'use strict';
 
-const stripe = require('../../../testUtils').getSpyableStripe();
+const stripe = require('../../testUtils.js').getSpyableStripe();
 
 const expect = require('chai').expect;
 

test/resources/CountrySpecs.spec.js

@@ -1,6 +1,6 @@
 'use strict';
 
-const stripe = require('../../testUtils').getSpyableStripe();
+const stripe = require('../testUtils.js').getSpyableStripe();
 const expect = require('chai').expect;
 
 describe('CountrySpecs Resource', () => {

test/resources/Coupons.spec.js

@@ -1,6 +1,6 @@
 'use strict';
 
-const stripe = require('../../testUtils').getSpyableStripe();
+const stripe = require('../testUtils.js').getSpyableStripe();
 const expect = require('chai').expect;
 
 describe('Coupons Resource', () => {

test/resources/CreditNotes.spec.js

@@ -1,6 +1,6 @@
 'use strict';
 
-const stripe = require('../../testUtils').getSpyableStripe();
+const stripe = require('../testUtils.js').getSpyableStripe();
 const expect = require('chai').expect;
 
 describe('CreditNotes Resource', () => {

test/resources/Customers.spec.js

@@ -1,6 +1,6 @@
 'use strict';
 
-const stripe = require('../../testUtils').getSpyableStripe();
+const stripe = require('../testUtils.js').getSpyableStripe();
 const expect = require('chai').expect;
 
 const TEST_AUTH_KEY = 'aGN0bIwXnHdw5645VABjPdSn8nWY7G11';

test/resources/Disputes.spec.js

@@ -1,6 +1,6 @@
 'use strict';
 
-const stripe = require('../../testUtils').getSpyableStripe();
+const stripe = require('../testUtils.js').getSpyableStripe();
 const expect = require('chai').expect;
 
 describe('Dispute Resource', () => {

test/resources/EphemeralKeys.spec.js

@@ -1,6 +1,6 @@
 'use strict';
 
-const getSpyableStripe = require('../../testUtils').getSpyableStripe;
+const getSpyableStripe = require('../testUtils.js').getSpyableStripe;
 const expect = require('chai').expect;
 
 function errorsOnNoStripeVersion(stripe) {

test/resources/Events.spec.js

@@ -1,6 +1,6 @@
 'use strict';
 
-const stripe = require('../../testUtils').getSpyableStripe();
+const stripe = require('../testUtils.js').getSpyableStripe();
 const expect = require('chai').expect;
 
 describe('Events Resource', () => {

test/resources/ExchangeRates.spec.js

@@ -1,6 +1,6 @@
 'use strict';
 
-const stripe = require('../../testUtils').getSpyableStripe();
+const stripe = require('../testUtils.js').getSpyableStripe();
 const expect = require('chai').expect;
 
 describe('ExchangeRates Resource', () => {

test/resources/FileLinks.spec.js

@@ -1,6 +1,6 @@
 'use strict';
 
-const stripe = require('../../testUtils').getSpyableStripe();
+const stripe = require('../testUtils.js').getSpyableStripe();
 const expect = require('chai').expect;
 
 describe('FileLinks Resource', () => {

test/resources/Files.spec.js

@@ -1,6 +1,6 @@
 'use strict';
 
-const stripe = require('../../testUtils').getSpyableStripe();
+const stripe = require('../testUtils.js').getSpyableStripe();
 const expect = require('chai').expect;
 const fs = require('fs');
 const path = require('path');

test/resources/Identity/VerificationReport.spec.js

@@ -1,6 +1,6 @@
 'use strict';
 
-const stripe = require('../../../testUtils').getSpyableStripe();
+const stripe = require('../../testUtils.js').getSpyableStripe();
 const expect = require('chai').expect;
 
 describe('Identity', () => {

test/resources/Identity/VerificationSession.spec.js

@@ -1,6 +1,6 @@
 'use strict';
 
-const stripe = require('../../../testUtils').getSpyableStripe();
+const stripe = require('../../testUtils.js').getSpyableStripe();
 const expect = require('chai').expect;
 
 describe('Identity', () => {

test/resources/Integration.spec.js

@@ -2,7 +2,7 @@
 
 // Resource integration tests which use stripe-mock.
 
-const stripe = require('../../testUtils').getStripeMockClient();
+const stripe = require('../testUtils.js').getStripeMockClient();
 const expect = require('chai').expect;
 
 describe('Customers Resource', () => {

test/resources/InvoiceItems.spec.js

@@ -1,6 +1,6 @@
 'use strict';
 
-const stripe = require('../../testUtils').getSpyableStripe();
+const stripe = require('../testUtils.js').getSpyableStripe();
 const expect = require('chai').expect;
 
 describe('InvoiceItems Resource', () => {

test/resources/Invoices.spec.js

@@ -1,6 +1,6 @@
 'use strict';
 
-const stripe = require('../../testUtils').getSpyableStripe();
+const stripe = require('../testUtils.js').getSpyableStripe();
 const expect = require('chai').expect;
 
 describe('Invoices Resource', () => {

test/resources/Issuing/Authorization.spec.js

@@ -1,6 +1,6 @@
 'use strict';
 
-const stripe = require('../../../testUtils').getSpyableStripe();
+const stripe = require('../../testUtils.js').getSpyableStripe();
 const expect = require('chai').expect;
 
 describe('Issuing', () => {

test/resources/Issuing/Cardholders.spec.js

@@ -1,6 +1,6 @@
 'use strict';
 
-const stripe = require('../../../testUtils').getSpyableStripe();
+const stripe = require('../../testUtils.js').getSpyableStripe();
 
 const expect = require('chai').expect;