Merge branch 'develop-6.6.x' into My-Account-bug-2

SAP · Oct 30, 2023 · 036ee85 · 036ee85
2 parents 1a3933f + c573c23
commit 036ee85
Show file tree

Hide file tree

Showing 4 changed files with 69 additions and 11 deletions.
diff --git a/.../product-image-zoom/product-image-zoom-dialog/product-image-zoom-dialog.component.spec.ts b/.../product-image-zoom/product-image-zoom-dialog/product-image-zoom-dialog.component.spec.ts
@@ -1,27 +1,52 @@
+import { Component, Input } from '@angular/core';
 import { ComponentFixture, TestBed } from '@angular/core/testing';
-import { LaunchDialogService } from '@spartacus/storefront';
-import { ProductImageZoomDialogComponent } from './product-image-zoom-dialog.component';
 import { I18nTestingModule } from '@spartacus/core';
+import {
+  ICON_TYPE,
+  KeyboardFocusTestingModule,
+  LaunchDialogService,
+} from '@spartacus/storefront';
+import { ProductImageZoomDialogComponent } from './product-image-zoom-dialog.component';
 
 class MockLaunchDialogService {
   closeDialog() {}
 }
 
+@Component({
+  selector: 'cx-icon',
+  template: '',
+})
+class MockCxIconComponent {
+  @Input() type: ICON_TYPE;
+}
+
+@Component({
+  selector: 'cx-product-image-zoom-view',
+  template: '',
+})
+class MockProductImageZoomViewComponent {
+  @Input() galleryIndex: number;
+}
+
 describe('ProductImageZoomDialogComponent', () => {
   let component: ProductImageZoomDialogComponent;
   let fixture: ComponentFixture<ProductImageZoomDialogComponent>;
   let launchDialogService: LaunchDialogService;
 
   beforeEach(() => {
     TestBed.configureTestingModule({
-      imports: [I18nTestingModule],
+      imports: [I18nTestingModule, KeyboardFocusTestingModule],
       providers: [
         {
           provide: LaunchDialogService,
           useClass: MockLaunchDialogService,
         },
       ],
-      declarations: [ProductImageZoomDialogComponent],
+      declarations: [
+        ProductImageZoomDialogComponent,
+        MockCxIconComponent,
+        MockProductImageZoomViewComponent,
+      ],
     }).compileComponents();
 
     fixture = TestBed.createComponent(ProductImageZoomDialogComponent);

diff --git a/...oom/product-image-zoom-product-images/product-image-zoom-product-images.component.spec.ts b/...oom/product-image-zoom-product-images/product-image-zoom-product-images.component.spec.ts
@@ -1,4 +1,4 @@
-import { Component, Input } from '@angular/core';
+import { Component, EventEmitter, Input, Output } from '@angular/core';
 import { ComponentFixture, TestBed, waitForAsync } from '@angular/core/testing';
 import { By } from '@angular/platform-browser';
 import { I18nTestingModule, ImageGroup, Product } from '@spartacus/core';
@@ -68,7 +68,7 @@ class MockCurrentProductService {
   template: '',
 })
 class MockMediaComponent {
-  @Input() container;
+  @Input() container: any;
 }
 
 @Component({
@@ -82,10 +82,20 @@ class MockMediaComponent {
   `,
 })
 class MockCarouselComponent {
-  @Input() items;
-  @Input() itemWidth;
-  @Input() template;
-  @Input() hideIndicators;
+  @Input() items: any;
+  @Input() itemWidth: any;
+  @Input() template: any;
+  @Input() hideIndicators: any;
+}
+
+@Component({
+  selector: 'cx-product-image-zoom-trigger',
+  template: ``,
+})
+class MockProductImageZoomTriggerComponent {
+  @Input() expandImage: any;
+  @Input() galleryIndex: any;
+  @Output() dialogClose = new EventEmitter<void>();
 }
 
 describe('ProductImagesComponent', () => {
@@ -101,6 +111,7 @@ describe('ProductImagesComponent', () => {
           ProductImageZoomProductImagesComponent,
           MockMediaComponent,
           MockCarouselComponent,
+          MockProductImageZoomTriggerComponent,
         ],
         providers: [
           {

diff --git a/...ents/product-image-zoom/product-image-zoom-view/product-image-zoom-view.component.spec.ts b/...ents/product-image-zoom/product-image-zoom-view/product-image-zoom-view.component.spec.ts
@@ -1,4 +1,10 @@
-import { Component, ElementRef, Input } from '@angular/core';
+import {
+  Component,
+  ElementRef,
+  EventEmitter,
+  Input,
+  Output,
+} from '@angular/core';
 import { ComponentFixture, TestBed, waitForAsync } from '@angular/core/testing';
 import { By } from '@angular/platform-browser';
 import { ImageGroup, Product } from '@spartacus/core';
@@ -94,6 +100,16 @@ class MockIconComponent {
   @Input() type;
 }
 
+@Component({
+  selector: 'cx-product-image-zoom-thumbnails',
+  template: '',
+})
+export class MockProductImageZoomThumbnailsComponent {
+  @Output() productImage = new EventEmitter<{ image: any; index: number }>();
+  @Input() thumbs$: Observable<ThumbnailsGroup[]>;
+  @Input() activeThumb: EventEmitter<ImageGroup>;
+}
+
 describe('ProductImageZoomViewComponent', () => {
   let productImageZoomViewComponent: ProductImageZoomViewComponent;
   let fixture: ComponentFixture<ProductImageZoomViewComponent>;
@@ -106,6 +122,7 @@ describe('ProductImageZoomViewComponent', () => {
         MockIconComponent,
         MockMediaComponent,
         MockProductThumbnailsComponent,
+        MockProductImageZoomThumbnailsComponent,
       ],
       providers: [
         { provide: CurrentProductService, useClass: MockCurrentProductService },

diff --git a/projects/storefrontapp-e2e-cypress/cypress/helpers/product-configurator-cart-vc.ts b/projects/storefrontapp-e2e-cypress/cypress/helpers/product-configurator-cart-vc.ts
@@ -86,6 +86,11 @@ export function checkout(): void {
       cy.get('cx-delivery-mode').should('be.visible');
     });
 
+  cy.log('choose first delivery method');
+  cy.get('cx-delivery-mode input#deliveryMode-premium-gross').first().click({
+    force: true,
+  });
+
   cy.log("Navigate to the next step 'Payment details' tab");
   cy.get('button.btn-primary')
     .contains('Continue')