From 9f23fb39f6b114c7e8e8660e2a71761b1f9829f8 Mon Sep 17 00:00:00 2001 From: Pavel Krymets Date: Fri, 3 Mar 2023 13:08:57 -0800 Subject: [PATCH 1/4] Remove extra test directory --- test/Error.spec.ts | 2 +- test/Integration.spec.ts | 2 +- test/PlatformFunctions.spec.ts | 2 +- test/RequestSender.spec.js | 4 ++-- test/StripeResource.spec.js | 4 ++-- test/Webhook.spec.ts | 2 +- test/autoPagination.spec.js | 2 +- test/flows.spec.ts | 2 +- test/stripe.spec.ts | 2 +- test/telemetry.spec.js | 2 +- testUtils/index.js => test/testUtils.js | 0 test/utils.spec.ts | 2 +- testUtils/.eslintrc.js | 12 ------------ testUtils/await.node7.js | 17 ----------------- testUtils/forAwait.node10.js | 15 --------------- 15 files changed, 13 insertions(+), 57 deletions(-) rename testUtils/index.js => test/testUtils.js (100%) delete mode 100644 testUtils/.eslintrc.js delete mode 100644 testUtils/await.node7.js delete mode 100644 testUtils/forAwait.node10.js diff --git a/test/Error.spec.ts b/test/Error.spec.ts index 91c251c9..baef1de7 100644 --- a/test/Error.spec.ts +++ b/test/Error.spec.ts @@ -1,6 +1,6 @@ 'use strict'; -require('../testUtils'); +require('./testUtils.js'); import Error = require('../src/Error'); import {expect} from 'chai'; diff --git a/test/Integration.spec.ts b/test/Integration.spec.ts index 92f2a9f4..44e012d2 100644 --- a/test/Integration.spec.ts +++ b/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); diff --git a/test/PlatformFunctions.spec.ts b/test/PlatformFunctions.spec.ts index fde5537d..c50e8124 100644 --- a/test/PlatformFunctions.spec.ts +++ b/test/PlatformFunctions.spec.ts @@ -1,6 +1,6 @@ 'use strict'; -require('../testUtils'); +require('./testUtils.js'); import fs = require('fs'); import path = require('path'); diff --git a/test/RequestSender.spec.js b/test/RequestSender.spec.js index a5be2a3b..db297c05 100644 --- a/test/RequestSender.spec.js +++ b/test/RequestSender.spec.js @@ -1,11 +1,11 @@ 'use strict'; -const stripe = require('../testUtils').getSpyableStripe(); +const stripe = require('./testUtils.js').getSpyableStripe(); const expect = require('chai').expect; const RequestSender = require('../lib/RequestSender'); const {HttpClientResponse} = require('../lib/net/HttpClient'); -const utils = require('../testUtils'); +const utils = require('./testUtils.js'); const nock = require('nock'); const { diff --git a/test/StripeResource.spec.js b/test/StripeResource.spec.js index 793e9706..999126e8 100644 --- a/test/StripeResource.spec.js +++ b/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; diff --git a/test/Webhook.spec.ts b/test/Webhook.spec.ts index b14ce753..cd9eaaf8 100644 --- a/test/Webhook.spec.ts +++ b/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'; diff --git a/test/autoPagination.spec.js b/test/autoPagination.spec.js index fc65b170..c18c5709 100644 --- a/test/autoPagination.spec.js +++ b/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') diff --git a/test/flows.spec.ts b/test/flows.spec.ts index 6818ef0a..89e52fef 100644 --- a/test/flows.spec.ts +++ b/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(), diff --git a/test/stripe.spec.ts b/test/stripe.spec.ts index 69dfc043..3e980399 100644 --- a/test/stripe.spec.ts +++ b/test/stripe.spec.ts @@ -7,7 +7,7 @@ import {NodeHttpClient} from '../lib/net/NodeHttpClient'; import {createStripe} from '../lib/stripe.common'; import {getMockPlatformFunctions} from '../testUtils'; -const testUtils = require('../testUtils'); +const testUtils = require('./testUtils.js'); const Stripe = require('../lib/stripe.node'); const stripe = require('../lib/stripe.node')( testUtils.getUserStripeKey(), diff --git a/test/telemetry.spec.js b/test/telemetry.spec.js index a334ffbd..a0fcf97a 100644 --- a/test/telemetry.spec.js +++ b/test/telemetry.spec.js @@ -1,6 +1,6 @@ 'use strict'; -require('../testUtils'); +require('./testUtils.js'); const http = require('http'); const expect = require('chai').expect; diff --git a/testUtils/index.js b/test/testUtils.js similarity index 100% rename from testUtils/index.js rename to test/testUtils.js diff --git a/test/utils.spec.ts b/test/utils.spec.ts index 46ae8159..b6781182 100644 --- a/test/utils.spec.ts +++ b/test/utils.spec.ts @@ -1,6 +1,6 @@ 'use strict'; -require('../testUtils'); +require('./testUtils.js'); import {expect} from 'chai'; import utils = require('../lib/utils'); diff --git a/testUtils/.eslintrc.js b/testUtils/.eslintrc.js deleted file mode 100644 index 0848ed54..00000000 --- a/testUtils/.eslintrc.js +++ /dev/null @@ -1,12 +0,0 @@ -module.exports = { - env: { - mocha: true, - }, - plugins: ['chai-friendly'], - rules: { - 'no-loop-func': 'off', - 'no-sync': 'off', - 'no-unused-expressions': 0, - 'chai-friendly/no-unused-expressions': 2, - }, -}; diff --git a/testUtils/await.node7.js b/testUtils/await.node7.js deleted file mode 100644 index aaa9e012..00000000 --- a/testUtils/await.node7.js +++ /dev/null @@ -1,17 +0,0 @@ -'use strict'; - -module.exports.awaitUntil = async function awaitUntil(iterator, limit) { - const items = []; - while (true) { - 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; -} diff --git a/testUtils/forAwait.node10.js b/testUtils/forAwait.node10.js deleted file mode 100644 index 0cf0dd0d..00000000 --- a/testUtils/forAwait.node10.js +++ /dev/null @@ -1,15 +0,0 @@ -'use strict'; - -module.exports.forAwaitUntil = 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; -} From 95da1e0b80d52403a29ab4425e97fb67c5e89036 Mon Sep 17 00:00:00 2001 From: Pavel Krymets Date: Mon, 6 Mar 2023 09:17:19 -0800 Subject: [PATCH 2/4] inline helpers --- test/autoPagination.spec.js | 91 +++++++++++++++++++++++-------------- test/testUtils.js | 4 -- 2 files changed, 58 insertions(+), 37 deletions(-) diff --git a/test/autoPagination.spec.js b/test/autoPagination.spec.js index a3aa238d..37b741cf 100644 --- a/test/autoPagination.spec.js +++ b/test/autoPagination.spec.js @@ -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) => { + (paginator.for, 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, {}); diff --git a/test/testUtils.js b/test/testUtils.js index 0965ed1e..202b188f 100644 --- a/test/testUtils.js +++ b/test/testUtils.js @@ -289,10 +289,6 @@ const utils = (module.exports = { .slice(2); }, - envSupportsForAwait: () => { - return typeof Symbol !== 'undefined' && Symbol.asyncIterator; - }, - FakeCryptoProvider: class extends CryptoProvider { computeHMACSignature(payload, secret) { return 'fake signature'; From 5460b302c1f72c269cef2892f68449198fa4f913 Mon Sep 17 00:00:00 2001 From: Pavel Krymets Date: Mon, 6 Mar 2023 09:26:51 -0800 Subject: [PATCH 3/4] tests --- test/autoPagination.spec.js | 2 +- test/resources/Account.spec.js | 2 +- test/resources/AccountLinks.spec.js | 2 +- test/resources/ApplePayDomains.spec.js | 2 +- test/resources/ApplicationFees.spec.js | 2 +- test/resources/Balance.spec.js | 2 +- test/resources/BalanceTransactions.spec.js | 2 +- test/resources/BillingPortal/Configurations.spec.js | 2 +- test/resources/BillingPortal/Sessions.spec.js | 2 +- test/resources/Charges.spec.js | 2 +- test/resources/Checkout/Sessions.spec.js | 2 +- test/resources/CountrySpecs.spec.js | 2 +- test/resources/Coupons.spec.js | 2 +- test/resources/CreditNotes.spec.js | 2 +- test/resources/Customers.spec.js | 2 +- test/resources/Disputes.spec.js | 2 +- test/resources/EphemeralKeys.spec.js | 2 +- test/resources/Events.spec.js | 2 +- test/resources/ExchangeRates.spec.js | 2 +- test/resources/FileLinks.spec.js | 2 +- test/resources/Files.spec.js | 2 +- test/resources/Identity/VerificationReport.spec.js | 2 +- test/resources/Identity/VerificationSession.spec.js | 2 +- test/resources/Integration.spec.js | 2 +- test/resources/InvoiceItems.spec.js | 2 +- test/resources/Invoices.spec.js | 2 +- test/resources/Issuing/Authorization.spec.js | 2 +- test/resources/Issuing/Cardholders.spec.js | 2 +- test/resources/Issuing/Cards.spec.js | 2 +- test/resources/Issuing/Disputes.spec.js | 2 +- test/resources/Issuing/Transactions.spec.js | 2 +- test/resources/Mandates.spec.js | 2 +- test/resources/OAuth.spec.js | 2 +- test/resources/PaymentIntents.spec.js | 2 +- test/resources/PaymentMethods.spec.js | 2 +- test/resources/Payouts.spec.js | 2 +- test/resources/Plans.spec.js | 2 +- test/resources/Prices.spec.js | 2 +- test/resources/Products.spec.js | 2 +- test/resources/PromotionCodes.spec.js | 2 +- test/resources/Quotes.spec.js | 4 ++-- test/resources/Radar/EarlyFraudWarnings.spec.js | 2 +- test/resources/Radar/ValueListItems.spec.js | 2 +- test/resources/Radar/ValueLists.spec.js | 2 +- test/resources/Refunds.spec.js | 2 +- test/resources/Reporting/ReportRuns.spec.js | 2 +- test/resources/Reporting/ReportTypes.spec.js | 2 +- test/resources/Reviews.spec.js | 2 +- test/resources/SetupAttempts.spec.js | 2 +- test/resources/SetupIntents.spec.js | 2 +- test/resources/Sigma/ScheduledQueryRuns.spec.js | 2 +- test/resources/Sources.spec.js | 2 +- test/resources/SubscriptionItems.spec.js | 2 +- test/resources/SubscriptionSchedule.spec.js | 2 +- test/resources/Subscriptions.spec.js | 2 +- test/resources/TaxCodes.spec.js | 2 +- test/resources/TaxRates.spec.js | 2 +- test/resources/Terminal/ConnectionTokens.spec.js | 2 +- test/resources/Terminal/Locations.spec.js | 2 +- test/resources/Terminal/Readers.spec.js | 2 +- test/resources/TestHelpers/Terminal/Readers.spec.js | 2 +- test/resources/Tokens.spec.js | 2 +- test/resources/Topups.spec.js | 2 +- test/resources/Transfers.spec.js | 2 +- test/resources/WebhookEndpoints.spec.js | 2 +- test/resources/generated_examples_test.spec.js | 2 +- 66 files changed, 67 insertions(+), 67 deletions(-) diff --git a/test/autoPagination.spec.js b/test/autoPagination.spec.js index 37b741cf..aede6a36 100644 --- a/test/autoPagination.spec.js +++ b/test/autoPagination.spec.js @@ -357,7 +357,7 @@ describe('auto pagination', function() { return expect( new Promise((resolve, reject) => { - (paginator.for, TOTAL_OBJECTS + 1) + forAwaitUntil(paginator, TOTAL_OBJECTS + 1) .then((customers) => { resolve(customers.map((customer) => customer.id)); }) diff --git a/test/resources/Account.spec.js b/test/resources/Account.spec.js index 6ceb2984..d81d209a 100644 --- a/test/resources/Account.spec.js +++ b/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'; diff --git a/test/resources/AccountLinks.spec.js b/test/resources/AccountLinks.spec.js index 1e5415e9..3c762631 100644 --- a/test/resources/AccountLinks.spec.js +++ b/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', () => { diff --git a/test/resources/ApplePayDomains.spec.js b/test/resources/ApplePayDomains.spec.js index 3b9d66d4..139650dc 100644 --- a/test/resources/ApplePayDomains.spec.js +++ b/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', () => { diff --git a/test/resources/ApplicationFees.spec.js b/test/resources/ApplicationFees.spec.js index 95b5d9db..af65e85e 100644 --- a/test/resources/ApplicationFees.spec.js +++ b/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', () => { diff --git a/test/resources/Balance.spec.js b/test/resources/Balance.spec.js index 1fa3f3d1..87cf3cc4 100644 --- a/test/resources/Balance.spec.js +++ b/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', () => { diff --git a/test/resources/BalanceTransactions.spec.js b/test/resources/BalanceTransactions.spec.js index c4081a3e..d30758b1 100644 --- a/test/resources/BalanceTransactions.spec.js +++ b/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() { diff --git a/test/resources/BillingPortal/Configurations.spec.js b/test/resources/BillingPortal/Configurations.spec.js index 6bb6a474..77e5ef5d 100644 --- a/test/resources/BillingPortal/Configurations.spec.js +++ b/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; diff --git a/test/resources/BillingPortal/Sessions.spec.js b/test/resources/BillingPortal/Sessions.spec.js index eb6ae366..7676d76a 100644 --- a/test/resources/BillingPortal/Sessions.spec.js +++ b/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; diff --git a/test/resources/Charges.spec.js b/test/resources/Charges.spec.js index d724a482..5f158734 100644 --- a/test/resources/Charges.spec.js +++ b/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', () => { diff --git a/test/resources/Checkout/Sessions.spec.js b/test/resources/Checkout/Sessions.spec.js index 9b7c35b5..21ea451e 100644 --- a/test/resources/Checkout/Sessions.spec.js +++ b/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; diff --git a/test/resources/CountrySpecs.spec.js b/test/resources/CountrySpecs.spec.js index 7deeea02..1f7bc262 100644 --- a/test/resources/CountrySpecs.spec.js +++ b/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', () => { diff --git a/test/resources/Coupons.spec.js b/test/resources/Coupons.spec.js index 8f27d919..0ac6c47d 100644 --- a/test/resources/Coupons.spec.js +++ b/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', () => { diff --git a/test/resources/CreditNotes.spec.js b/test/resources/CreditNotes.spec.js index 95f4a8e3..31405905 100644 --- a/test/resources/CreditNotes.spec.js +++ b/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', () => { diff --git a/test/resources/Customers.spec.js b/test/resources/Customers.spec.js index 49afe581..dc2c69da 100644 --- a/test/resources/Customers.spec.js +++ b/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'; diff --git a/test/resources/Disputes.spec.js b/test/resources/Disputes.spec.js index 3edeef7b..b0a8ad63 100644 --- a/test/resources/Disputes.spec.js +++ b/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', () => { diff --git a/test/resources/EphemeralKeys.spec.js b/test/resources/EphemeralKeys.spec.js index e77866ea..3c4f2d42 100644 --- a/test/resources/EphemeralKeys.spec.js +++ b/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) { diff --git a/test/resources/Events.spec.js b/test/resources/Events.spec.js index 00d35aab..98e1f91a 100644 --- a/test/resources/Events.spec.js +++ b/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', () => { diff --git a/test/resources/ExchangeRates.spec.js b/test/resources/ExchangeRates.spec.js index 84035985..2f37cb33 100644 --- a/test/resources/ExchangeRates.spec.js +++ b/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', () => { diff --git a/test/resources/FileLinks.spec.js b/test/resources/FileLinks.spec.js index fc269b7b..5b0f459f 100644 --- a/test/resources/FileLinks.spec.js +++ b/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', () => { diff --git a/test/resources/Files.spec.js b/test/resources/Files.spec.js index ed8cd10e..a5d2b4c3 100644 --- a/test/resources/Files.spec.js +++ b/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'); diff --git a/test/resources/Identity/VerificationReport.spec.js b/test/resources/Identity/VerificationReport.spec.js index 18bfa7c5..fac94cc4 100644 --- a/test/resources/Identity/VerificationReport.spec.js +++ b/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', () => { diff --git a/test/resources/Identity/VerificationSession.spec.js b/test/resources/Identity/VerificationSession.spec.js index 4b93e9ae..b821e323 100644 --- a/test/resources/Identity/VerificationSession.spec.js +++ b/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', () => { diff --git a/test/resources/Integration.spec.js b/test/resources/Integration.spec.js index 292a73a2..6b4dafeb 100644 --- a/test/resources/Integration.spec.js +++ b/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', () => { diff --git a/test/resources/InvoiceItems.spec.js b/test/resources/InvoiceItems.spec.js index 779c34c2..814655c2 100644 --- a/test/resources/InvoiceItems.spec.js +++ b/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', () => { diff --git a/test/resources/Invoices.spec.js b/test/resources/Invoices.spec.js index 529bad20..f8bb96db 100644 --- a/test/resources/Invoices.spec.js +++ b/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', () => { diff --git a/test/resources/Issuing/Authorization.spec.js b/test/resources/Issuing/Authorization.spec.js index 3e9205a5..6c2010ae 100644 --- a/test/resources/Issuing/Authorization.spec.js +++ b/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', () => { diff --git a/test/resources/Issuing/Cardholders.spec.js b/test/resources/Issuing/Cardholders.spec.js index 42d523d5..b9da5623 100644 --- a/test/resources/Issuing/Cardholders.spec.js +++ b/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; diff --git a/test/resources/Issuing/Cards.spec.js b/test/resources/Issuing/Cards.spec.js index 7a7a230a..6cd6f4c9 100644 --- a/test/resources/Issuing/Cards.spec.js +++ b/test/resources/Issuing/Cards.spec.js @@ -1,6 +1,6 @@ 'use strict'; -const stripe = require('../../../testUtils').getSpyableStripe(); +const stripe = require('../../testUtils.js').getSpyableStripe(); const expect = require('chai').expect; diff --git a/test/resources/Issuing/Disputes.spec.js b/test/resources/Issuing/Disputes.spec.js index b4ef0fcd..84fba910 100644 --- a/test/resources/Issuing/Disputes.spec.js +++ b/test/resources/Issuing/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; diff --git a/test/resources/Issuing/Transactions.spec.js b/test/resources/Issuing/Transactions.spec.js index 8fc7fee5..ef5f7cd0 100644 --- a/test/resources/Issuing/Transactions.spec.js +++ b/test/resources/Issuing/Transactions.spec.js @@ -1,6 +1,6 @@ 'use strict'; -const stripe = require('../../../testUtils').getSpyableStripe(); +const stripe = require('../../testUtils.js').getSpyableStripe(); const expect = require('chai').expect; diff --git a/test/resources/Mandates.spec.js b/test/resources/Mandates.spec.js index 9ff1cba7..e3966f61 100644 --- a/test/resources/Mandates.spec.js +++ b/test/resources/Mandates.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 MANDATE_TEST_ID = 'mandate_123'; diff --git a/test/resources/OAuth.spec.js b/test/resources/OAuth.spec.js index 95388d79..fba0499f 100644 --- a/test/resources/OAuth.spec.js +++ b/test/resources/OAuth.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 URL = require('url'); diff --git a/test/resources/PaymentIntents.spec.js b/test/resources/PaymentIntents.spec.js index 41c34e2b..019fb896 100644 --- a/test/resources/PaymentIntents.spec.js +++ b/test/resources/PaymentIntents.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 PAYMENT_INTENT_TEST_ID = 'pi_123'; diff --git a/test/resources/PaymentMethods.spec.js b/test/resources/PaymentMethods.spec.js index 15921441..fb19c4bb 100644 --- a/test/resources/PaymentMethods.spec.js +++ b/test/resources/PaymentMethods.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('PaymentMethods Resource', () => { diff --git a/test/resources/Payouts.spec.js b/test/resources/Payouts.spec.js index 62a16908..1344927a 100644 --- a/test/resources/Payouts.spec.js +++ b/test/resources/Payouts.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 PAYOUT_TEST_ID = 'po_testid1'; diff --git a/test/resources/Plans.spec.js b/test/resources/Plans.spec.js index 3757f7df..2f875a0e 100644 --- a/test/resources/Plans.spec.js +++ b/test/resources/Plans.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('Plans Resource', () => { diff --git a/test/resources/Prices.spec.js b/test/resources/Prices.spec.js index 2b368812..c0c299a1 100644 --- a/test/resources/Prices.spec.js +++ b/test/resources/Prices.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('Plans Resource', () => { diff --git a/test/resources/Products.spec.js b/test/resources/Products.spec.js index c452b1f9..f3728853 100644 --- a/test/resources/Products.spec.js +++ b/test/resources/Products.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('Product Resource', () => { diff --git a/test/resources/PromotionCodes.spec.js b/test/resources/PromotionCodes.spec.js index bbcc012e..7092b2f3 100644 --- a/test/resources/PromotionCodes.spec.js +++ b/test/resources/PromotionCodes.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('PromotionCodes Resource', () => { diff --git a/test/resources/Quotes.spec.js b/test/resources/Quotes.spec.js index 9f3bb684..379b6371 100644 --- a/test/resources/Quotes.spec.js +++ b/test/resources/Quotes.spec.js @@ -1,7 +1,7 @@ 'use strict'; -const stripe = require('../../testUtils').getSpyableStripe(); -const testUtils = require('../../testUtils'); +const stripe = require('../testUtils.js').getSpyableStripe(); +const testUtils = require('../testUtils.js'); const expect = require('chai').expect; const QUOTE_TEST_ID = 'qt_123'; diff --git a/test/resources/Radar/EarlyFraudWarnings.spec.js b/test/resources/Radar/EarlyFraudWarnings.spec.js index 9ca77c79..bff8fe7e 100644 --- a/test/resources/Radar/EarlyFraudWarnings.spec.js +++ b/test/resources/Radar/EarlyFraudWarnings.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('Radar', () => { diff --git a/test/resources/Radar/ValueListItems.spec.js b/test/resources/Radar/ValueListItems.spec.js index 5ca9455e..08209ed3 100644 --- a/test/resources/Radar/ValueListItems.spec.js +++ b/test/resources/Radar/ValueListItems.spec.js @@ -1,6 +1,6 @@ 'use strict'; -const stripe = require('../../../testUtils').getSpyableStripe(); +const stripe = require('../../testUtils.js').getSpyableStripe(); const expect = require('chai').expect; diff --git a/test/resources/Radar/ValueLists.spec.js b/test/resources/Radar/ValueLists.spec.js index 918af13f..65a0a6b9 100644 --- a/test/resources/Radar/ValueLists.spec.js +++ b/test/resources/Radar/ValueLists.spec.js @@ -1,6 +1,6 @@ 'use strict'; -const stripe = require('../../../testUtils').getSpyableStripe(); +const stripe = require('../../testUtils.js').getSpyableStripe(); const expect = require('chai').expect; diff --git a/test/resources/Refunds.spec.js b/test/resources/Refunds.spec.js index 7852dea5..48cc85ea 100644 --- a/test/resources/Refunds.spec.js +++ b/test/resources/Refunds.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('Refund Resource', () => { diff --git a/test/resources/Reporting/ReportRuns.spec.js b/test/resources/Reporting/ReportRuns.spec.js index 4a50d7e3..a12fb402 100644 --- a/test/resources/Reporting/ReportRuns.spec.js +++ b/test/resources/Reporting/ReportRuns.spec.js @@ -1,6 +1,6 @@ 'use strict'; -const stripe = require('../../../testUtils').getSpyableStripe(); +const stripe = require('../../testUtils.js').getSpyableStripe(); const expect = require('chai').expect; diff --git a/test/resources/Reporting/ReportTypes.spec.js b/test/resources/Reporting/ReportTypes.spec.js index a797dbf6..b0e436cd 100644 --- a/test/resources/Reporting/ReportTypes.spec.js +++ b/test/resources/Reporting/ReportTypes.spec.js @@ -1,6 +1,6 @@ 'use strict'; -const stripe = require('../../../testUtils').getSpyableStripe(); +const stripe = require('../../testUtils.js').getSpyableStripe(); const expect = require('chai').expect; diff --git a/test/resources/Reviews.spec.js b/test/resources/Reviews.spec.js index 2640dbe3..212c06c7 100644 --- a/test/resources/Reviews.spec.js +++ b/test/resources/Reviews.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('Review Resource', () => { diff --git a/test/resources/SetupAttempts.spec.js b/test/resources/SetupAttempts.spec.js index 660a50d4..89b80d17 100644 --- a/test/resources/SetupAttempts.spec.js +++ b/test/resources/SetupAttempts.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('Setup Attempts Resource', () => { diff --git a/test/resources/SetupIntents.spec.js b/test/resources/SetupIntents.spec.js index ba520c0d..a8296776 100644 --- a/test/resources/SetupIntents.spec.js +++ b/test/resources/SetupIntents.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 SETUP_INTENT_TEST_ID = 'seti_123'; diff --git a/test/resources/Sigma/ScheduledQueryRuns.spec.js b/test/resources/Sigma/ScheduledQueryRuns.spec.js index f713bce5..d9861e4a 100644 --- a/test/resources/Sigma/ScheduledQueryRuns.spec.js +++ b/test/resources/Sigma/ScheduledQueryRuns.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('Sigma', () => { diff --git a/test/resources/Sources.spec.js b/test/resources/Sources.spec.js index d0874917..916db34b 100644 --- a/test/resources/Sources.spec.js +++ b/test/resources/Sources.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('Sources Resource', () => { diff --git a/test/resources/SubscriptionItems.spec.js b/test/resources/SubscriptionItems.spec.js index 2023157c..92fe6db5 100644 --- a/test/resources/SubscriptionItems.spec.js +++ b/test/resources/SubscriptionItems.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('SubscriptionItems Resource', () => { diff --git a/test/resources/SubscriptionSchedule.spec.js b/test/resources/SubscriptionSchedule.spec.js index 4a6aa815..fcaf9afc 100644 --- a/test/resources/SubscriptionSchedule.spec.js +++ b/test/resources/SubscriptionSchedule.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 SCHEDULE_TEST_ID = 'sub_sched_123'; diff --git a/test/resources/Subscriptions.spec.js b/test/resources/Subscriptions.spec.js index 4e2d29b0..ddd4543a 100644 --- a/test/resources/Subscriptions.spec.js +++ b/test/resources/Subscriptions.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('subscriptions Resource', () => { diff --git a/test/resources/TaxCodes.spec.js b/test/resources/TaxCodes.spec.js index 190d627b..a7f3dca2 100644 --- a/test/resources/TaxCodes.spec.js +++ b/test/resources/TaxCodes.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('TaxCodes Resource', () => { diff --git a/test/resources/TaxRates.spec.js b/test/resources/TaxRates.spec.js index 9b7318b1..af98e175 100644 --- a/test/resources/TaxRates.spec.js +++ b/test/resources/TaxRates.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('TaxRates Resource', () => { diff --git a/test/resources/Terminal/ConnectionTokens.spec.js b/test/resources/Terminal/ConnectionTokens.spec.js index a13e9109..19d62dd9 100644 --- a/test/resources/Terminal/ConnectionTokens.spec.js +++ b/test/resources/Terminal/ConnectionTokens.spec.js @@ -1,6 +1,6 @@ 'use strict'; -const stripe = require('../../../testUtils').getSpyableStripe(); +const stripe = require('../../testUtils.js').getSpyableStripe(); const expect = require('chai').expect; diff --git a/test/resources/Terminal/Locations.spec.js b/test/resources/Terminal/Locations.spec.js index a8e70d9d..dbb3b1c7 100644 --- a/test/resources/Terminal/Locations.spec.js +++ b/test/resources/Terminal/Locations.spec.js @@ -1,6 +1,6 @@ 'use strict'; -const stripe = require('../../../testUtils').getSpyableStripe(); +const stripe = require('../../testUtils.js').getSpyableStripe(); const expect = require('chai').expect; diff --git a/test/resources/Terminal/Readers.spec.js b/test/resources/Terminal/Readers.spec.js index b13c8bbf..086de593 100644 --- a/test/resources/Terminal/Readers.spec.js +++ b/test/resources/Terminal/Readers.spec.js @@ -1,6 +1,6 @@ 'use strict'; -const stripe = require('../../../testUtils').getSpyableStripe(); +const stripe = require('../../testUtils.js').getSpyableStripe(); const expect = require('chai').expect; diff --git a/test/resources/TestHelpers/Terminal/Readers.spec.js b/test/resources/TestHelpers/Terminal/Readers.spec.js index e6c49945..6be1a90c 100644 --- a/test/resources/TestHelpers/Terminal/Readers.spec.js +++ b/test/resources/TestHelpers/Terminal/Readers.spec.js @@ -1,6 +1,6 @@ 'use strict'; -const stripe = require('../../../../testUtils').getSpyableStripe(); +const stripe = require('../../../testUtils.js').getSpyableStripe(); const expect = require('chai').expect; diff --git a/test/resources/Tokens.spec.js b/test/resources/Tokens.spec.js index fb36fffa..bf2a2cd8 100644 --- a/test/resources/Tokens.spec.js +++ b/test/resources/Tokens.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('Tokens Resource', () => { diff --git a/test/resources/Topups.spec.js b/test/resources/Topups.spec.js index 0f93a4d8..fa8f8fb6 100644 --- a/test/resources/Topups.spec.js +++ b/test/resources/Topups.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('Topup Resource', () => { diff --git a/test/resources/Transfers.spec.js b/test/resources/Transfers.spec.js index 4bcde7bb..1372c2e9 100644 --- a/test/resources/Transfers.spec.js +++ b/test/resources/Transfers.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('Transfers Resource', () => { diff --git a/test/resources/WebhookEndpoints.spec.js b/test/resources/WebhookEndpoints.spec.js index c1cd5bda..6ed38bd3 100644 --- a/test/resources/WebhookEndpoints.spec.js +++ b/test/resources/WebhookEndpoints.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('WebhookEndpoints Resource', () => { diff --git a/test/resources/generated_examples_test.spec.js b/test/resources/generated_examples_test.spec.js index 0e914821..6e4fc84d 100644 --- a/test/resources/generated_examples_test.spec.js +++ b/test/resources/generated_examples_test.spec.js @@ -2,7 +2,7 @@ 'use strict'; -const testUtils = require('../../testUtils'); +const testUtils = require('../testUtils.js'); const stripe = testUtils.getStripeMockClient(); const expect = require('chai').expect; From 5c9f8fd2730d62f9b6f0b47ac75a3d9e6581b239 Mon Sep 17 00:00:00 2001 From: Pavel Krymets Date: Mon, 6 Mar 2023 09:38:13 -0800 Subject: [PATCH 4/4] one more --- test/stripe.spec.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/test/stripe.spec.ts b/test/stripe.spec.ts index 3e980399..53120024 100644 --- a/test/stripe.spec.ts +++ b/test/stripe.spec.ts @@ -5,7 +5,7 @@ import {FetchHttpClient} from '../lib/net/FetchHttpClient'; import {NodeHttpClient} from '../lib/net/NodeHttpClient'; import {createStripe} from '../lib/stripe.common'; -import {getMockPlatformFunctions} from '../testUtils'; +import {getMockPlatformFunctions} from './testUtils.js'; const testUtils = require('./testUtils.js'); const Stripe = require('../lib/stripe.node');