@W-19307666 rebase with develop

.cursor/qa/rules/packages/template-retail-react-app/testing/retail-react-app-test-patterns.mdc

@@ -0,0 +1,59 @@
+---
+description: QA Tests for Template Retail React App Test Generation Rules
+globs: ["packages/template-retail-react-app/app/components/**/*-underTest.test.{js,jsx}"]
+alwaysApply: false
+---
+# QA Tests for Template Retail React App Test Patterns
+
+## Purpose
+This file contains test cases to verify that the `unit-tests-template-retail-react-app.mdc` rule effectively guides the creation of consistent and robust React component tests.
+
+## Test Cases
+
+### Test 1: DrawerMenu Component Test Generation
+**Workflow:** Generate → Analyze → Cleanup (NO test execution)
+
+**Steps:**
+1. **Generate:** Create new test file `drawer-menu-underTest.test.js` (colocated with existing drawer-menu component at `packages/template-retail-react-app/app/components/drawer-menu/`)
+2. **Apply Rules:** Use `@/testing` (located at `.cursor/rules/testing/unit-tests-generic.mdc` and `.cursor/rules/testing/unit-tests-template-retail-react-app.mdc`)
+3. **Prompt:** "Write unit test for drawer-menu component"
+4. **Analyze:** Perform static code analysis against verification patterns (see below)
+5. **Cleanup:** Delete the generated test file after validation
+
+**Important:** DO NOT run the test after creation - skip test execution entirely
+
+**Verify that the newly generated test file follows these patterns:**
+1. Test Setup
+   - Uses `renderWithProviders` from `@salesforce/retail-react-app/app/utils/test-utils`
+   - Gets user events from return value: `const {user} = renderWithProviders(...)`
+   - Includes `beforeEach(() => jest.clearAllMocks())`
+
+2. Import Structure
+   - Does NOT import `userEvent` directly
+   - Uses existing mock data from `@salesforce/retail-react-app/app/mocks/`
+   - Imports `screen` from `@testing-library/react`
+
+3. Test Organization
+   - Uses `describe` block with component name
+   - Individual `test` or `it` blocks for different scenarios
+   - Async/await patterns for user interactions
+
+4. API Mocking
+   - Uses `prependHandlersToServer` or `msw` for API mocking when needed
+
+**Failure Indicators:**
+- Direct import of `userEvent` from `@testing-library/user-event`
+- Using custom render function instead of `renderWithProviders`
+- Creating new mock data instead of using existing mocks
+- Missing Commerce SDK context providers
+- Not using async/await for user interactions
+
+**Expected Output:**
+Provide a clear, structured report based on **static code analysis only** (no test execution):
+- ✅ **PASS** or ❌ **FAIL** for each verification point
+- Specific line numbers and code snippets for any failures
+- Summary: `X/Y patterns followed correctly`
+- Overall result: **RULES EFFECTIVE** or **RULES NEED IMPROVEMENT**
+
+**Cleanup:**
+- Delete the generated test file `drawer-menu-underTest.test.js` after QA validation is complete

.cursor/rules/cursor-rule.mdc

@@ -0,0 +1,66 @@
+---
+description: How to add or edit Cursor rules in our project
+globs: 
+alwaysApply: false
+---
+# Cursor Rules Location
+
+How to add new cursor rules to the project
+
+1. Always place rule files in PROJECT_ROOT/.cursor/rules/:
+    ```
+    .cursor/rules/
+    ├── your-rule-name.mdc
+    ├── another-rule.mdc
+    └── ...
+    ```
+
+2. Follow the naming convention:
+    - Use kebab-case for filenames
+    - Always use .mdc extension
+    - Make names descriptive of the rule's purpose
+
+3. Directory structure:
+    ```
+    PROJECT_ROOT/
+    ├── .cursor/
+    │   └── rules/
+    │       ├── your-rule-name.mdc
+    │       └── ...
+    └── ...
+    ```
+
+4. Never place rule files:
+    - In the project root
+    - In subdirectories outside .cursor/rules
+    - In any other location
+
+5. Cursor rules have the following structure:
+
+````
+---
+description: Short description of the rule's purpose
+globs: optional/path/pattern/**/* 
+alwaysApply: false
+---
+# Rule Title
+
+Main content explaining the rule with markdown formatting.
+
+1. Step-by-step instructions
+2. Code examples
+3. Guidelines
+
+Example:
+```typescript
+// Good example
+function goodExample() {
+  // Implementation following guidelines
+}
+
+// Bad example
+function badExample() {
+  // Implementation not following guidelines
+}
+```
+````

.cursor/rules/testing/unit-tests-generic.mdc

@@ -7,22 +7,6 @@ USE WHEN writing unit tests for components in template packages
 
 # 🧪 Generic Component Test Rules
 
-# CRITICAL: AI Attribution Requirements
-* **IMPORTANT** All individual test methods generated or modified by Cursor MUST include an AI attribution comment directly above the test stating the following: 
-"DO NOT REMOVE THIS COMMENT! This test was generated by Cursor". The comment should go on the test method and not the test class. Failure to add an AI Attribution Comment will be considered a failure of test generation.
-* The AI attribution comment MUST include a comment declaring the LLM model that was used in writing the test on its own line.
-
-*Sample AI Attribution Comment*
-```
-/*
- * DO NOT REMOVE THIS COMMENT! This test was generated by Cursor 
- * This test was generated with the following model: Claude 3.5 Sonnet
- */
-test('renders component correctly', () => {
-    // test implementation
-})
-```
-
 ## Structure & Best Practices
 - Use `describe` blocks to group tests, `test` for individual cases
 - Use `beforeEach` for setup, clear mocks after each test

.github/CODEOWNERS

@@ -1,9 +1,64 @@
 # https://help.github.com/en/enterprise/2.17/user/articles/about-code-owners
 
-# These owners will be the default owners for everything in
-# the repo. Unless a later match takes precedence,
-# @global-owner1 and @global-owner2 will be requested for
-# review when someone opens a pull request.
+# Global directories
+.cursor/                                                    @SalesforceCommerceCloud/mobifyers
+.github/                                                    @SalesforceCommerceCloud/mobifyers
+e2e/                                                        @SalesforceCommerceCloud/mobifyers
+scripts/                                                    @SalesforceCommerceCloud/mobifyers
+
+# Package-specific ownership
+packages/commerce-sdk-react/                               @SalesforceCommerceCloud/mobifyers
+packages/internal-lib-build/                               @SalesforceCommerceCloud/mobifyers
+packages/pwa-kit-create-app/                               @SalesforceCommerceCloud/mobifyers
+packages/pwa-kit-dev/                                      @SalesforceCommerceCloud/mobifyers
+packages/pwa-kit-mcp/                                      @SalesforceCommerceCloud/mobifyers
+packages/pwa-kit-react-sdk/                                @SalesforceCommerceCloud/mobifyers
+packages/pwa-kit-runtime/                                  @SalesforceCommerceCloud/mobifyers
+packages/template-express-minimal/                         @SalesforceCommerceCloud/mobifyers
+packages/template-mrt-reference-app/                       @SalesforceCommerceCloud/mobifyers
+packages/template-retail-react-app/                        @SalesforceCommerceCloud/mobifyers
+packages/template-typescript-minimal/                      @SalesforceCommerceCloud/mobifyers
+packages/test-commerce-sdk-react/                          @SalesforceCommerceCloud/mobifyers
+
+# Root configuration and documentation files
+/README.md                                                  @SalesforceCommerceCloud/mobifyers
+/CODE_OF_CONDUCT.md                                         @SalesforceCommerceCloud/mobifyers
+/CONTRIBUTING.md                                            @SalesforceCommerceCloud/mobifyers
+/SECURITY.md                                                @SalesforceCommerceCloud/mobifyers
+/STATEMENTS.md                                              @SalesforceCommerceCloud/mobifyers
+/TERMS_OF_USE.md                                            @SalesforceCommerceCloud/mobifyers
+/LICENSE                                                    @SalesforceCommerceCloud/mobifyers
+/.eslintrc.js                                              @SalesforceCommerceCloud/mobifyers
+/.gitattributes                                            @SalesforceCommerceCloud/mobifyers
+/.gitignore                                                @SalesforceCommerceCloud/mobifyers
+/.prettierignore                                           @SalesforceCommerceCloud/mobifyers
+/.prettierrc.yaml                                          @SalesforceCommerceCloud/mobifyers
+/lerna.json                                                @SalesforceCommerceCloud/mobifyers
+/package.json                                              @SalesforceCommerceCloud/mobifyers
+/package-lock.json                                         @SalesforceCommerceCloud/mobifyers
+/playwright.config.js                                      @SalesforceCommerceCloud/mobifyers
+/.git2gus/                                                 @SalesforceCommerceCloud/mobifyers
+
+# Specific feature file ownership (overrides package-level rules above)
+
+# BOPIS (Buy Online Pick up In Store) feature files - PR #2646
+packages/template-retail-react-app/app/components/store-display/ @SalesforceCommerceCloud/cc-spark
+packages/template-retail-react-app/app/hooks/use-selected-store.js @SalesforceCommerceCloud/cc-spark
+packages/template-retail-react-app/app/hooks/use-pickup-shipment.js @SalesforceCommerceCloud/cc-spark
+packages/template-retail-react-app/app/hooks/use-pickup-shipment.test.js @SalesforceCommerceCloud/cc-spark
+e2e/tests/desktop/bopis.spec.js @SalesforceCommerceCloud/cc-spark
+
+# Bonus Products feature files - PR #2704
+packages/template-retail-react-app/app/components/product-item/bonus-product-quantity.jsx @SalesforceCommerceCloud/cc-sharks
+packages/template-retail-react-app/app/components/product-item/bonus-product-quantity.test.jsx @SalesforceCommerceCloud/cc-sharks
+packages/template-retail-react-app/app/components/product-item/product-quantity-picker.jsx @SalesforceCommerceCloud/cc-sharks
+packages/template-retail-react-app/app/components/product-item/product-quantity-picker.test.jsx @SalesforceCommerceCloud/cc-sharks
+packages/template-retail-react-app/app/pages/cart/partials/bonus-products-title.jsx @SalesforceCommerceCloud/cc-sharks
+packages/template-retail-react-app/app/pages/cart/partials/bonus-products-title.test.js @SalesforceCommerceCloud/cc-sharks
+
+# Standard Products feature files - PR #2697
+packages/template-retail-react-app/app/mocks/standard-product.js @SalesforceCommerceCloud/cc-sharks
+packages/template-retail-react-app/app/utils/add-to-cart-utils.js @SalesforceCommerceCloud/cc-sharks
+
 
-*       @SalesforceCommerceCloud/mobifyers
 #ECCN:Open Source

.github/workflows/e2e-pr.yml

@@ -0,0 +1,112 @@
+name: SalesforceCommerceCloud/pwa-kit/e2e-pr
+on:
+    workflow_dispatch:
+    pull_request: # Default: opened, reopened, synchronize (head branch updated)
+    merge_group: # Trigger GA workflow when a pull request is added to a merge queue.
+    push:
+        branches:
+            - develop
+            - 'release-*'
+
+jobs:
+    test_e2e_private:
+        runs-on: ubuntu-latest
+        steps:
+           # Skipping the entire workflow for now until all steps are implemented.
+            - name: Skip Check
+              run: | 
+                echo "SKIP_WORKFLOW=true" >> "$GITHUB_ENV"
+
+            - name: Checkout
+              uses: actions/checkout@v4
+
+            - name: Check PWA Kit Version
+              run: |-
+                  version=`jq -r ".version" package.json`
+                  echo "pwa_kit_version=$version" >> "$GITHUB_ENV"
+
+            # TODO: Skip the entire workflow since we don't have e2e tests for PWA Kit v2.x
+            - name: Skip if PWA Kit version older than v3.x
+              if: ${{ env.SKIP_WORKFLOW != 'true' }}
+              run: |
+                  major_version=$(echo "${{ env.pwa_kit_version }}" | cut -d. -f1)
+                   if [ "$major_version" -lt 3 ]; then
+                     echo "PWA Kit version is older than v3.x, skipping workflow."
+                     echo "SKIP_WORKFLOW=true" >> "$GITHUB_ENV"
+                   fi
+
+            # Only test for latest Node version supported by MRT
+            - name: Setup Node
+              if: ${{ env.SKIP_WORKFLOW != 'true' }}
+              uses: actions/setup-node@v4
+              with:
+                  node-version: 22
+                  cache: npm
+
+            # Check central resource allocation on AWS and get a lock on an available environment from the pool.
+            # Returns the MRT target ID if lock is acquired, otherwise returns an error state.
+            - name: Get MRT Target lock
+              if: ${{ env.SKIP_WORKFLOW != 'true' }}
+              id: get_mrt_target_lock
+              run: |
+                  echo "TODO: Implement .github/actions/get_mrt_target_lock"
+
+            - name: Create MRT target
+              id: create_mrt_target
+              if: ${{ env.SKIP_WORKFLOW != 'true' && steps.get_mrt_target_lock.outputs.status == 'ERR_NO_AVAILABLE_TARGETS' }}
+              run: |
+                  echo "TODO: Call .github/actions/create_mrt_target with correct inputs"
+
+            - name: Get Template Version
+              if: ${{ env.SKIP_WORKFLOW != 'true' }}
+              run: |-
+                  version=`jq -r ".version" packages/template-retail-react-app/package.json`
+                  echo "retail_app_template_version=$version" >> "$GITHUB_ENV"
+
+            - name: Generate Retail App Private Client
+              if: ${{ env.SKIP_WORKFLOW != 'true' }}
+              uses: ./.github/actions/e2e_generate_app
+              with:
+                  PROJECT_KEY: 'retail-app-private-client'
+                  TEMPLATE_VERSION: ${{ env.retail_app_template_version }}
+
+            - name: Validate Retail App Without Extensibility
+              if: ${{ env.SKIP_WORKFLOW != 'true' }}
+              uses: ./.github/actions/e2e_validate_generated_app
+              with:
+                  PROJECT_KEY: 'retail-app-no-ext'
+                  TEMPLATE_VERSION: ${{ env.retail_app_template_version }}
+
+            # TODO: Revisit the next 2 steps to see if we can use the existing .github/actions/deploy_app action.
+            - name: Create MRT credentials file
+              if: ${{ env.SKIP_WORKFLOW != 'true' }}
+              uses: './.github/actions/create_mrt'
+              with:
+                  mobify_user: ${{ secrets.MOBIFY_CLIENT_USER }}
+                  mobify_api_key: ${{ secrets.MOBIFY_CLIENT_API_KEY }}
+
+            - name: Push Bundle to MRT (E2E Test PWA Kit)
+              if: ${{ env.SKIP_WORKFLOW != 'true' }}
+              uses: './.github/actions/push_to_mrt'
+              with:
+                  CWD: '../generated-projects/retail-app-no-ext'
+                  # TODO: Use the MRT target ID from the target lock step above.
+                  TARGET: e2e-tests-pwa-kit
+                  FLAGS: --wait
+
+            - name: Install Playwright Browsers
+              if: ${{ env.SKIP_WORKFLOW != 'true' }}
+              run: npx playwright install --with-deps
+
+            - name: Run Playwright tests
+              if: ${{ env.SKIP_WORKFLOW != 'true' }}
+              run: npm run test:e2e
+
+            - name: Run Playwright a11y tests
+              if: ${{ env.SKIP_WORKFLOW != 'true' }}
+              run: npm run test:e2e:a11y
+
+            - name: Release MRT Target Lock
+              if: always() # Always release the target lock back to the pool even if the tests fail.
+              run: |
+                echo "TODO: Implement .github/actions/release_mrt_target_lock"

.github/workflows/e2e.yml

@@ -411,3 +411,25 @@ jobs:
             }
         env:
           SLACK_WEBHOOK_URL: ${{ secrets.SLACK_WEBHOOK_URL }}
+
+  test-extra-features:
+    runs-on: ubuntu-latest
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v4
+      - name: Setup Node.js
+        uses: actions/setup-node@v4
+        with:
+          node-version: 22
+          cache: npm
+      - name: Install Monorepo Dependencies
+        run: node ./scripts/gtime.js monorepo_install npm ci
+      - name: Install Playwright Browsers
+        run: npx playwright install --with-deps
+      - name: Set PWA Kit E2E Test User
+        run: export PWA_E2E_USER_EMAIL=e2e.pwa.kit@gmail.com PWA_E2E_USER_PASSWORD=hpv_pek-JZK_xkz0wzf
+      - name: Run extra features tests
+        env:
+          PWA_E2E_USER_EMAIL: e2e.pwa.kit@gmail.com
+          PWA_E2E_USER_PASSWORD: hpv_pek-JZK_xkz0wzf
+        run: npm run test:e2e:extra_features