test: address comments

Author: fredericoo

e2e/fixtures/assertions.ts

@@ -0,0 +1,9 @@
+import {expect} from '@playwright/test';
+
+/** Asserts that a condition is truthy while narrowing its type */
+export default function assert(
+  condition: any,
+  message?: string,
+): asserts condition {
+  expect(condition, message).toBeTruthy();
+}

e2e/fixtures/cart-utils.ts

@@ -1,4 +1,5 @@
 import {expect, Locator, Page} from '@playwright/test';
+import assert from './assertions';
 
 const CART_ID_PREFIX = 'gid://shopify/Cart/';
 
@@ -30,14 +31,13 @@ export class CartUtil {
     const nextValue = enabledOptionValues.find(
       (value) => value !== initialValue,
     );
-    if (!nextValue) {
-      throw new Error(
-        'Expected option select to have at least two different values',
-      );
-    }
+    assert(
+      nextValue,
+      'Expected option select to have at least two different values',
+    );
 
     await optionSelect.selectOption(nextValue);
-    await expect.poll(async () => optionSelect.inputValue()).toBe(nextValue);
+    await expect(optionSelect).toHaveValue(nextValue);
 
     return {optionName, nextValue};
   }

e2e/specs/recipes/custom-cart-method.spec.ts

@@ -1,4 +1,5 @@
 import {test, expect, setRecipeFixture} from '../../fixtures';
+import assert from '../../fixtures/assertions';
 import {CartUtil} from '../../fixtures/cart-utils';
 
 setRecipeFixture({
@@ -70,28 +71,20 @@ test.describe('Custom Cart Method Recipe', () => {
         name: KNOWN_PRODUCT_WITH_VARIANTS.name,
       });
       const initialUrl = await productLink.getAttribute('href');
-      expect(initialUrl).toBeTruthy();
+      assert(initialUrl);
 
       const optionSelect = (
         await cart.waitForOptionSelectors(firstLineItem)
       ).first();
       const {optionName, nextValue} =
         await cart.selectDifferentOption(optionSelect);
 
-      await expect
-        .poll(async () => {
-          const href = await productLink.getAttribute('href');
-          if (!href) {
-            return false;
-          }
-
-          const updatedProductUrl = new URL(href, page.url());
-          return (
-            href !== initialUrl &&
-            updatedProductUrl.searchParams.get(optionName) === nextValue
-          );
-        })
-        .toBe(true);
+      const href = await productLink.getAttribute('href');
+      assert(href);
+
+      const updatedProductUrl = new URL(href, page.url());
+      expect(href).not.toBe(initialUrl);
+      expect(updatedProductUrl.searchParams.get(optionName)).toBe(nextValue);
     });
 
     test('maintains single line item when changing variants', async ({
@@ -117,12 +110,9 @@ test.describe('Custom Cart Method Recipe', () => {
       await cart.selectDifferentOption(optionSelect);
 
       // Wait for the cart update to complete before checking preservation
-      await expect
-        .poll(async () => {
-          const href = await productLink.getAttribute('href');
-          return href !== null && href !== initialUrl;
-        })
-        .toBe(true);
+      const href = await productLink.getAttribute('href');
+      assert(href);
+      expect(href).not.toBe(initialUrl);
 
       await expect(cart.getLineItems()).toHaveCount(1);
       await expect(firstLineItem).toContainText('Quantity: 2');
@@ -147,12 +137,9 @@ test.describe('Custom Cart Method Recipe', () => {
       await cart.selectDifferentOption(optionSelect);
 
       // Verify the cart update completed without navigating away
-      await expect
-        .poll(async () => {
-          const href = await productLink.getAttribute('href');
-          return href !== null && href !== initialProductUrl;
-        })
-        .toBe(true);
+      const href = await productLink.getAttribute('href');
+      assert(href);
+      expect(href).not.toBe(initialProductUrl);
 
       expect(page.url()).toBe(initialPageUrl);
       await expect(cartDialog).toBeVisible();