Merge branch 'develop' into fix/CXSPA-8711

SAP · Oct 23, 2024 · 81c0612 · 81c0612
2 parents f62c275 + 40dc598
commit 81c0612
Show file tree

Hide file tree

Showing 4 changed files with 5 additions and 19 deletions.
diff --git a/...ypes/multi-selection-image/configurator-attribute-multi-selection-image.component.spec.ts b/...ypes/multi-selection-image/configurator-attribute-multi-selection-image.component.spec.ts
@@ -241,6 +241,7 @@ describe('ConfiguratorAttributeMultiSelectionImageComponent', () => {
     expect(description.nativeElement.innerText).toBe(
       (component.attribute.values ?? [{ description: '' }])[1]?.description
     );
+    infoButton.click(); // hide popover after test again
   });
 
   it('should mark two values as selected', () => {

diff --git a/...es/single-selection-image/configurator-attribute-single-selection-image.component.spec.ts b/...es/single-selection-image/configurator-attribute-single-selection-image.component.spec.ts
@@ -222,6 +222,7 @@ describe('ConfiguratorAttributeSingleSelectionImageComponent', () => {
     expect(description.nativeElement.innerText).toBe(
       (component.attribute.values ?? [{}])[1].description
     );
+    infoButton.click(); // hide popover after test again
   });
 
   it('should init with val3', () => {

diff --git a/...figurator/rulebased/components/overview-menu/configurator-overview-menu.component.spec.ts b/...figurator/rulebased/components/overview-menu/configurator-overview-menu.component.spec.ts
@@ -124,10 +124,6 @@ describe('ConfigurationOverviewMenuComponent', () => {
     }).compileComponents();
   }));
 
-  afterEach(() => {
-    document.body.removeChild(htmlElem);
-  });
-
   it('should create component', () => {
     initialize();
     expect(component).toBeDefined();
@@ -417,12 +413,6 @@ describe('ConfigurationOverviewMenuComponent', () => {
       initialize();
     });
 
-    afterEach(() => {
-      groups?.forEach((group: any) => {
-        ConfiguratorTestUtils.remove(group);
-      });
-    });
-
     it('should not get menu item to highlight because getElements method return undefined', () => {
       spyOn(configuratorStorefrontUtilsService, 'getElements').and.returnValue(
         undefined
@@ -435,10 +425,7 @@ describe('ConfigurationOverviewMenuComponent', () => {
     it('should not get menu item to highlight because getScrollY method return undefined', () => {
       groups = createElements('div');
 
-      document.querySelectorAll = jasmine
-        .createSpy('div.cx-group')
-        .and.returnValue(groups);
-
+      spyOn(document, 'querySelectorAll').and.returnValue(groups);
       spyOn(configuratorStorefrontUtilsService, 'getElements').and.returnValue(
         groups
       );
@@ -456,10 +443,7 @@ describe('ConfigurationOverviewMenuComponent', () => {
     it('should get menu item to highlight', () => {
       groups = createElements('div');
 
-      document.querySelectorAll = jasmine
-        .createSpy('div.cx-group')
-        .and.returnValue(groups);
-
+      spyOn(document, 'querySelectorAll').and.returnValue(groups);
       spyOn(configuratorStorefrontUtilsService, 'getElements').and.returnValue(
         groups
       );

diff --git a/...t-configurator/rulebased/components/service/configurator-storefront-utils.service.spec.ts b/...t-configurator/rulebased/components/service/configurator-storefront-utils.service.spec.ts
@@ -609,7 +609,7 @@ describe('ConfiguratorStorefrontUtilsService', () => {
       spyOn(windowRef, 'isBrowser').and.returnValue(true);
       const elements: Array<HTMLElement> = createElements('section', 10);
 
-      asSpy(windowRef.document.querySelectorAll).and.returnValue(<any>elements);
+      spyOn(document, 'querySelectorAll').and.returnValue(<any>elements);
 
       const htmlElements = classUnderTest.getElements('section');