From 7f67e98e28c3b9fa3282012e15f6d92e425a361f Mon Sep 17 00:00:00 2001
From: Sam Lord <sam@ghost.org>
Date: Mon, 16 Oct 2023 22:03:11 +0100
Subject: [PATCH] Memoized the `getStripeAccountId` function

no issue

Some flaky tests found, and it seems as though they're being caused by an invalid Stripe account id.

It's possible that by re-using the worker after a test which calls `setupStripe` could cause some Stripe functionality to not work.
---
 .../e2e-browser/utils/e2e-browser-utils.js    | 30 +++++++++++--------
 1 file changed, 17 insertions(+), 13 deletions(-)

diff --git a/ghost/core/test/e2e-browser/utils/e2e-browser-utils.js b/ghost/core/test/e2e-browser/utils/e2e-browser-utils.js
index e895031b9c..aecdea200e 100644
--- a/ghost/core/test/e2e-browser/utils/e2e-browser-utils.js
+++ b/ghost/core/test/e2e-browser/utils/e2e-browser-utils.js
@@ -463,13 +463,18 @@ const openTierModal = async (page, {slug}) => {
     });
 };
 
+// Memoized function to get the Stripe account ID
+let stripeAccountId;
 const getStripeAccountId = async () => {
+    if (stripeAccountId) {
+        return stripeAccountId;
+    }
+
     if (!('STRIPE_PUBLISHABLE_KEY' in process.env) || !('STRIPE_SECRET_KEY' in process.env)) {
         throw new Error('Missing STRIPE_PUBLISHABLE_KEY or STRIPE_SECRET_KEY environment variables');
     }
 
     const parallelIndex = process.env.TEST_PARALLEL_INDEX;
-    let accountId;
     const accountEmail = `test${parallelIndex}@example.com`;
 
     const secretKey = process.env.STRIPE_SECRET_KEY;
@@ -483,19 +488,18 @@ const getStripeAccountId = async () => {
             await stripe.accounts.del(account.id);
         }
     }
-    if (!accountId) {
-        const account = await stripe.accounts.create({
-            type: 'standard',
-            email: accountEmail,
-            business_type: 'company',
-            company: {
-                name: `Test Company ${parallelIndex}`
-            }
-        });
-        accountId = account.id;
-    }
 
-    return accountId;
+    const account = await stripe.accounts.create({
+        type: 'standard',
+        email: accountEmail,
+        business_type: 'company',
+        company: {
+            name: `Test Company ${parallelIndex}`
+        }
+    });
+    stripeAccountId = account.id;
+
+    return stripeAccountId;
 };
 
 const generateStripeIntegrationToken = async (accountId) => {