Merge branch 'develop' into feature/CXSPA-9645

Author: uroslates

.github/workflows/pr-title-check.yml

@@ -6,17 +6,20 @@ on:
 
 jobs:
   check-pr-title:
+    name: PR - Check PR title
     runs-on: ubuntu-latest
     steps:
       - name: Validate PR title
         id: validate
         env:
           PR_TITLE: ${{ github.event.pull_request.title }}
         run: |
-          echo "Checking PR title: $PR_TITLE"
+          echo "Checking PR title: ${PR_TITLE}"
 
-          if [[ ! "$PR_TITLE" =~ ^(docs|feat|fix|perf|refactor|style|test|chore):\ .+ ]]; then
-            echo "❌ PR title is invalid."
+          REGEX='^(docs|feat|fix|perf|refactor|style|test|chore)(\([^)]*\))?:\ .+'
+
+          if [[ ! "$PR_TITLE" =~ $REGEX ]]; then
+            echo "❌ PR title is invalid. Example of a valid title: \`feat: Add user authentication\`, \`chore(deps): update dependency babel-loader to v10\`. Allowed prefixes: docs, feat, fix, perf, refactor, style, test, chore"
             exit 1
           fi
 

package-lock.json

@@ -293,5 +293,22 @@ describe('OAuthLibWrapperService', () => {
         tokenReceived: false,
       });
     });
+
+    it('should reject promise if oAuthService.tryLogin throws an error', async () => {
+      const error = new Error('Login failed');
+
+      spyOn(oAuthService, 'tryLogin').and.returnValue(Promise.reject(error));
+
+      try {
+        await service.tryLogin();
+        fail('Expected tryLogin() to throw');
+      } catch (err) {
+        expect(err).toEqual(error);
+      }
+
+      expect(oAuthService.tryLogin).toHaveBeenCalledWith({
+        disableOAuth2StateCheck: true,
+      });
+    });
   });
 });

projects/core/src/auth/user-auth/services/oauth-lib-wrapper.service.spec.ts

@@ -132,7 +132,7 @@ export class OAuthLibWrapperService {
    * In cases where we don't receive this event, the token has been obtained from storage.
    */
   tryLogin(): Promise<OAuthTryLoginResult> {
-    return new Promise((resolve) => {
+    return new Promise((resolve, reject) => {
       // We use the 'token_received' event to check if we have returned
       // from the auth server.
       let tokenReceivedEvent: OAuthEvent | undefined;
@@ -154,6 +154,9 @@ export class OAuthLibWrapperService {
             tokenReceived: !!tokenReceivedEvent,
           });
         })
+        .catch((error) => {
+          reject(error);
+        })
         .finally(() => {
           subscription.unsubscribe();
         });

projects/core/src/auth/user-auth/services/oauth-lib-wrapper.service.ts

@@ -4,39 +4,60 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
+import { viewportContext } from '../../helpers/viewport-context';
 import { standardUser } from '../../sample-data/shared-users';
 
-describe('Header and Footer Continuum tests', () => {
+describe('Header and Footer Continuum tests', { testIsolation: false }, () => {
   beforeEach(() => {
     cy.a11yContinuumSetup();
-    cy.visit('/');
-    cy.get('[section="header"]').as('header');
-    cy.get('[section="footer"]').as('footer');
+    cy.clearLocalStorage();
+    cy.clearCookies();
   });
+
+  context('Footer', () => {
+    it('Main footer body', () => {
+      cy.visit('/');
+      cy.get('footer a');
+      cy.get('footer').a11yRunContinuumTest();
+    });
+
+    it('Consent Management dialog', () => {
+      cy.get('footer').get('button').contains(' Consent Management').click();
+      cy.get('.modal-dialog').contains(' Select all ').click();
+      cy.get('.modal-dialog').a11yRunContinuumTest();
+      cy.get('.close').first().click();
+    });
+  });
+
   context('Header', () => {
     it('Main header body', () => {
-      cy.get('@header').get('a').contains('Brands');
-      cy.get('@header').a11yRunContinuumTest();
+      cy.get('header').get('nav button[aria-label="Brands"]').click();
+      cy.get('header').get('a').contains('Canon');
+      cy.get('header').a11yRunContinuumTest();
     });
 
     it('My Account dropdown', () => {
       cy.requireLoggedIn(standardUser);
       cy.reload();
-      cy.get('@header')
-        .get('nav[aria-label="My Account"]')
-        .a11yRunContinuumTest();
+      cy.get('header').get('.accNavComponent button').click();
+      cy.get('nav a').contains(' Order History ');
+      cy.get('nav[aria-label="My Account"]').a11yRunContinuumTest();
     });
-  });
 
-  context('Footer', () => {
-    it('Main footer body', () => {
-      cy.get('@footer').a11yRunContinuumTest();
-    });
+    viewportContext(['mobile'], () => {
+      it('Hamburger menu', () => {
+        cy.get('cx-hamburger-menu button').click();
+        cy.get('a').contains('Brands');
+        cy.get('header').a11yRunContinuumTest();
 
-    it('Consent Management dialog', () => {
-      cy.get('@footer').get('button').contains(' Consent Management').click();
-      cy.get('.modal-dialog').contains(' Select all ').click();
-      cy.get('.modal-dialog').a11yRunContinuumTest();
+        cy.get('button[aria-label="Brands"]').click();
+        cy.get('button').contains('Cameras');
+        cy.get('nav[aria-label="Category menu"]').a11yRunContinuumTest();
+
+        cy.get('button').contains('Cameras').click();
+        cy.get('a').contains('Canon');
+        cy.get('nav[aria-label="Category menu"]').a11yRunContinuumTest();
+      });
     });
   });
 });

projects/storefrontapp-e2e-cypress/cypress/e2e/accessibility/header-and-footer.a11y-e2e.cy.ts

@@ -0,0 +1,49 @@
+/*
+ * SPDX-FileCopyrightText: 2025 SAP Spartacus team <spartacus-team@sap.com>
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+import { viewportContext } from '../../helpers/viewport-context';
+
+describe('Product Search Page', { testIsolation: false }, () => {
+  beforeEach(() => {
+    cy.a11yContinuumSetup();
+  });
+
+  it('Searchbar', () => {
+    cy.visit('/search/camera');
+    cy.get('cx-product-list-item');
+    cy.get('cx-searchbox input').type('cam').get('.products a');
+    cy.get('cx-searchbox').a11yRunContinuumTest();
+    cy.get('body').click(0, 0);
+  });
+
+  it('Page content with list view', () => {
+    cy.get('cx-product-list').a11yRunContinuumTest();
+  });
+
+  it('Grid view', () => {
+    cy.get('button.cx-product-grid').first().click();
+    cy.get('#product-results-list').a11yRunContinuumTest();
+  });
+
+  it('Sorting dropdown', () => {
+    cy.get('cx-sorting').first().click();
+    cy.get('ng-dropdown-panel').a11yRunContinuumTest();
+  });
+
+  it('Facets', () => {
+    cy.visit('/search/camera?query=camera:relevance:availableInStores:Chiba');
+    cy.get('cx-active-facets a');
+    cy.get('cx-product-facet-navigation').a11yRunContinuumTest();
+  });
+
+  viewportContext(['mobile'], () => {
+    it('Facets Modal', () => {
+      cy.get('cx-product-facet-navigation .dialog-trigger').click();
+      cy.get('cx-facet-list .value');
+      cy.get('.dialog.active').a11yRunContinuumTest();
+    });
+  });
+});

projects/storefrontapp-e2e-cypress/cypress/e2e/accessibility/product-search-page.a11y-e2e.cy.ts

@@ -22,31 +22,30 @@ context('Product search', { testIsolation: false }, () => {
     });
 
     describe('Pagination', () => {
-      it('should navigate to the next page and display results', () => {
+      it('should test pagination and display results', () => {
+        cy.log('NAVIGATE TO NEXT PAGE AND DISPLAY RESULTS:');
         productSearchFlow.verifyNextPage(2);
-      });
 
-      it('should be able navigate to the specified page number and display results', () => {
+        cy.log('NAVIGATE TO A SPECIFIED PAGE AND DISPLAY RESULTS:');
         productSearchFlow.verifyChoosePage(3);
-      });
 
-      it('should navigate to the previous page and display results', () => {
+        cy.log('NAVIGATE TO PREVIOUS PAGE AND DISPLAY RESULTS:');
         productSearchFlow.verifyPreviousPage(2);
       });
     });
 
-    describe('product list view mode', () => {
+    describe('Product list view mode', () => {
       it('should be able to switch to grid mode', () => {
         productSearchFlow.viewMode();
       });
     });
 
     describe('Facets', () => {
-      it('should filter results using facet filtering', () => {
+      it('should filter results using facet filtering and clear active facet', () => {
+        cy.log('FILTER RESULTS USING FACET FILTERING:');
         productSearchFlow.filterUsingFacetFiltering();
-      });
 
-      it('should be able to clear active facet', () => {
+        cy.log('CLEAR ACTIVE FACET:');
         productSearchFlow.clearActiveFacet();
       });
     });
@@ -56,27 +55,23 @@ context('Product search', { testIsolation: false }, () => {
         cy.visit('/');
       });
 
-      it('should be able to sort by lowest price', () => {
+      it('should be able to sort by different sort options', () => {
+        cy.log('SORT BY LOWEST PRICE:');
         productSearchFlow.sortByLowestPrice();
-      });
 
-      it('should be able to sort by highest price', () => {
+        cy.log('SORT BY HIGHEST PRICE:');
         productSearchFlow.sortByHighestPrice();
-      });
 
-      it('should be able to sort by name ascending', () => {
+        cy.log('SORT BY NAME ASCENDING:');
         productSearchFlow.sortByNameAscending();
-      });
 
-      it('should be able to sort by name descending', () => {
+        cy.log('SORT BY NAME DESCENDING:');
         productSearchFlow.sortByNameDescending();
-      });
 
-      it('should be able to sort by relevance', () => {
+        cy.log('SORT BY RELEVANCE:');
         productSearchFlow.sortByRelevance();
-      });
 
-      it('should be able to sort by top rated', () => {
+        cy.log('SORT BY TOP RATED:');
         productSearchFlow.sortByTopRated();
       });
     });

projects/storefrontapp-e2e-cypress/cypress/e2e/regression/product-search/product-search.core-e2e.cy.ts

@@ -93,7 +93,7 @@ export function testCheckoutMultiDAsGuest() {
 }
 
 export function testCheckoutMultiDAsGuestAndVerifyCart() {
-  it('should perform checkout as guest, create an account and verify guest data, and verify cart persists after registering', () => {
+  it.skip('should perform checkout as guest, create an account and verify guest data, and verify cart persists after registering', () => {
     const multiDUser = getSampleUser();
 
     checkout.visitHomePage();

projects/storefrontapp-e2e-cypress/cypress/helpers/checkout-multi-dimensional.ts

@@ -1,7 +1,7 @@
 <ng-container *ngIf="mode$ | async as mode">
   <!-- Tab List is the list of buttons to open tabs -->
   <div
-    [attr.role]="mode === TAB_MODE.ACCORDIAN ? 'presentation' : 'tablist'"
+    [attr.role]="mode === TAB_MODE.ACCORDIAN ? 'null' : 'tablist'"
     [attr.aria-label]="config.label | cxTranslate"
     [class]="mode.toLowerCase()"
   >

projects/storefrontlib/cms-components/content/tab/tab.component.html

@@ -352,7 +352,7 @@ describe('TabComponent', () => {
 
     it('should display menu buttons for tabs', () => {
       const accordianEl = document.querySelector('div[class="accordian"]');
-      expect(accordianEl?.role).toEqual('presentation');
+      expect(accordianEl?.role).toEqual('null');
       const buttonEls = document.querySelectorAll('button[role="button"]');
       expect(buttonEls.length).toEqual(4);