Fix user login flows and order

Author: shethj

e2e/scripts/pageHelpers.js

@@ -272,10 +272,14 @@ export const loginShopper = async ({page, userCredentials}) => {
             .locator("input#password")
             .fill(userCredentials.password);
 
+        const loginResponsePromise=page.waitForResponse('**/shopper/auth/v1/organizations/**/oauth2/login')
         const tokenResponsePromise=page.waitForResponse('**/shopper/auth/v1/organizations/**/oauth2/token')
         await page.getByRole("button", { name: /Sign In/i }).click();
+        await loginResponsePromise;
+        expect((await loginResponsePromise).status()).toBe(303); // Login returns a 303 redirect to /callback with authCode and usid
         await tokenResponsePromise;
-        return await tokenResponsePromise.status() === 200;
+        expect((await tokenResponsePromise).status()).toBe(200);
+        return true;
     } catch {
         return false;
     }

e2e/tests/desktop/registered-shopper.spec.js

@@ -7,7 +7,7 @@
 
 const { test, expect } = require("@playwright/test");
 const config = require("../../config");
-const { 
+const {
   addProductToCart,
   registerShopper,
   validateOrderHistory,
@@ -20,19 +20,39 @@ const {
   getCreditCardExpiry,
 } = require("../../scripts/utils.js");
 
-const REGISTERED_USER_CREDENTIALS = generateUserCredentials();
+let REGISTERED_USER_CREDENTIALS = {};
+
+test.beforeAll(async () => {
+  // Generate credentials once and use throughout tests to avoid creating a new account
+  REGISTERED_USER_CREDENTIALS = generateUserCredentials();
+});
 
 /**
  * Test that registered shoppers can add a product to cart and go through the entire checkout process,
  * validating that shopper is able to get to the order summary section,
  * and that order shows up in order history
  */
 test("Registered shopper can checkout items", async ({ page }) => {
-  // register and login user
-  await registerShopper({page, userCredentials: REGISTERED_USER_CREDENTIALS});
+  // Since we're re-using the same account, we need to check if the user is already registered.
+  // This ensures the tests are independent and not dependent on the order they are run in.
+  const isLoggedIn = await loginShopper({
+    page,
+    userCredentials: REGISTERED_USER_CREDENTIALS,
+  });
+
+  if (!isLoggedIn) {
+    await registerShopper({
+      page,
+      userCredentials: REGISTERED_USER_CREDENTIALS,
+    });
+  }
+
+  await expect(
+    page.getByRole("heading", { name: /Account Details/i })
+  ).toBeVisible();
 
   // Shop for items as registered user
-  await addProductToCart({page});
+  await addProductToCart({ page });
 
   // cart
   await page.getByLabel(/My cart/i).click();
@@ -135,7 +155,7 @@ test("Registered shopper can checkout items", async ({ page }) => {
   ).toBeVisible();
 
   // order history
-  await validateOrderHistory({page});
+  await validateOrderHistory({ page });
 });
 
 /**
@@ -144,24 +164,31 @@ test("Registered shopper can checkout items", async ({ page }) => {
 test("Registered shopper can add item to wishlist", async ({ page }) => {
   const isLoggedIn = await loginShopper({
     page,
-    userCredentials: REGISTERED_USER_CREDENTIALS
-  })
+    userCredentials: REGISTERED_USER_CREDENTIALS,
+  });
 
-  if(!isLoggedIn) {
-    await registerShopper({page, userCredentials: generateUserCredentials() })
+  if (!isLoggedIn) {
+    await registerShopper({
+      page,
+      userCredentials: REGISTERED_USER_CREDENTIALS,
+    });
   }
 
+  await expect(
+    page.getByRole("heading", { name: /Account Details/i })
+  ).toBeVisible();
+
   // Navigate to PDP
-  await navigateToPDPDesktop({page});
+  await navigateToPDPDesktop({ page });
 
   // add product to wishlist
   await expect(
     page.getByRole("heading", { name: /Cotton Turtleneck Sweater/i })
   ).toBeVisible();
 
   await page.getByRole("radio", { name: "L", exact: true }).click();
-  await page.getByRole("button", { name: /Add to Wishlist/i }).click()
+  await page.getByRole("button", { name: /Add to Wishlist/i }).click();
 
   // wishlist
-  await validateWishlist({page})
+  await validateWishlist({ page });
 });

e2e/tests/mobile/registered-shopper.spec.js

@@ -13,30 +13,47 @@ const {
   validateOrderHistory,
   validateWishlist,
   loginShopper,
-  navigateToPDPMobile
+  navigateToPDPMobile,
 } = require("../../scripts/pageHelpers");
 const {
   generateUserCredentials,
   getCreditCardExpiry,
 } = require("../../scripts/utils.js");
 
-const REGISTERED_USER_CREDENTIALS = generateUserCredentials();
+let REGISTERED_USER_CREDENTIALS = {};
+
+test.beforeAll(async () => {
+  // Generate credentials once and use throughout tests to avoid creating a new account
+  REGISTERED_USER_CREDENTIALS = generateUserCredentials();
+});
 
 /**
  * Test that registered shoppers can add a product to cart and go through the entire checkout process,
  * validating that shopper is able to get to the order summary section,
  * and that order shows up in order history
  */
 test("Registered shopper can checkout items", async ({ page }) => {
-  // Create Account and Sign In
-  await registerShopper({
+  // Since we're re-using the same account, we need to check if the user is already registered.
+  // This ensures the tests are independent and not dependent on the order they are run in.
+  const isLoggedIn = await loginShopper({
     page,
     userCredentials: REGISTERED_USER_CREDENTIALS,
-    isMobile: true
-  })
+  });
+
+  if (!isLoggedIn) {
+    await registerShopper({
+      page,
+      userCredentials: REGISTERED_USER_CREDENTIALS,
+      isMobile: true,
+    });
+  }
+
+  await expect(
+    page.getByRole("heading", { name: /Account Details/i })
+  ).toBeVisible();
 
   // Shop for items as registered user
-  await addProductToCart({page, isMobile: true})
+  await addProductToCart({ page, isMobile: true });
 
   // cart
   await page.getByLabel(/My cart/i).click();
@@ -138,7 +155,7 @@ test("Registered shopper can checkout items", async ({ page }) => {
   ).toBeVisible();
 
   // order history
-  await validateOrderHistory({page});
+  await validateOrderHistory({ page });
 });
 
 /**
@@ -147,27 +164,31 @@ test("Registered shopper can checkout items", async ({ page }) => {
 test("Registered shopper can add item to wishlist", async ({ page }) => {
   const isLoggedIn = await loginShopper({
     page,
-    userCredentials: REGISTERED_USER_CREDENTIALS
-  })
+    userCredentials: REGISTERED_USER_CREDENTIALS,
+  });
 
-  if(!isLoggedIn) {
+  if (!isLoggedIn) {
     await registerShopper({
       page,
-      userCredentials: generateUserCredentials(),
-      isMobile: true
-    })
+      userCredentials: REGISTERED_USER_CREDENTIALS,
+      isMobile: true,
+    });
   }
 
+  await expect(
+    page.getByRole("heading", { name: /Account Details/i })
+  ).toBeVisible();
+
   // PDP
-  await navigateToPDPMobile({page});
+  await navigateToPDPMobile({ page });
 
   // add product to wishlist
   await expect(
     page.getByRole("heading", { name: /Cotton Turtleneck Sweater/i })
   ).toBeVisible();
   await page.getByRole("radio", { name: "L", exact: true }).click();
-  await page.getByRole("button", { name: /Add to Wishlist/i }).click()
+  await page.getByRole("button", { name: /Add to Wishlist/i }).click();
 
   // wishlist
-  await validateWishlist({page})
+  await validateWishlist({ page });
 });