Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

CXSPA-8725: fix test isolation #19442

Open
wants to merge 3 commits into
base: develop
Choose a base branch
from
Open

CXSPA-8725: fix test isolation #19442

Changes from 1 commit
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
3ca23b3
CXSPA-8725: fix test isolation
Uli-Tiger Oct 24, 2024
8dd3372
review feedback
Uli-Tiger Oct 25, 2024
82660f2
Merge branch 'develop' into feature/CXSPA-8725
Uli-Tiger Oct 25, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
34 changes: 21 additions & 13 deletions ...t-configurator/rulebased/components/service/configurator-storefront-utils.service.spec.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,8 +17,8 @@ import { KeyboardFocusService } from '@spartacus/storefront';
import { Observable, of } from 'rxjs';
import { ConfiguratorGroupsService } from '../../core/facade/configurator-groups.service';
import { Configurator } from '../../core/model/configurator.model';
import { ConfiguratorStorefrontUtilsService } from './configurator-storefront-utils.service';
import { ConfiguratorTestUtils } from '../../testing/configurator-test-utils';
import { ConfiguratorStorefrontUtilsService } from './configurator-storefront-utils.service';

let mockedWindow: {
innerWidth?: number;
Expand All @@ -42,11 +42,12 @@ const testSelector = 'test-configurator-overview-menu';

const PRODUCT_CODE = 'CONF_LAPTOP';
const CONFIGURATOR_ROUTE = 'configureCPQCONFIGURATOR';
const mockRouterState: any = {
const mockRouterStateTemplate: any = {
state: {
params: {
entityKey: PRODUCT_CODE,
ownerType: CommonConfigurator.OwnerType.PRODUCT,
displayOnly: false,
},
queryParams: {},
semanticRoute: CONFIGURATOR_ROUTE,
Expand Down Expand Up @@ -122,11 +123,12 @@ class MockProductService {
}
}

describe('ConfiguratorStorefrontUtilsService', () => {
fdescribe('ConfiguratorStorefrontUtilsService', () => {
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Please, remove f- prefix to run all tests. ;)

let classUnderTest: ConfiguratorStorefrontUtilsService;
let fixture: ComponentFixture<MockComponent>;
let htmlElem: HTMLElement;
let focusedElements: any;
let mockRouterState: any;
const owner = ConfiguratorModelUtils.createOwner(
CommonConfigurator.OwnerType.PRODUCT,
'testProduct'
Expand All @@ -135,7 +137,7 @@ describe('ConfiguratorStorefrontUtilsService', () => {
let keyboardFocusService: KeyboardFocusService;

beforeEach(() => {
mockRouterState.state.params.displayOnly = false;
mockRouterState = structuredClone(mockRouterStateTemplate);
routerStateObservable = of(mockRouterState);

TestBed.configureTestingModule({
Expand Down Expand Up @@ -385,7 +387,6 @@ describe('ConfiguratorStorefrontUtilsService', () => {
haveBeenCalledTimes = 0,
focusedElementIndex?: number
): void {
classUnderTest.focusValue(attribute);
expect(keyboardFocusService.findFocusable).toHaveBeenCalledTimes(
haveBeenCalledTimes
);
Expand All @@ -399,28 +400,30 @@ describe('ConfiguratorStorefrontUtilsService', () => {
});
}

let attribute: Configurator.Attribute = {
name: 'ATTR_1',
uiType: Configurator.UiType.RADIOBUTTON,
values: [],
};
let attribute: Configurator.Attribute;
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Please, move this attribute to the top, namely declare this attribute directly after describe('focusValue', () => {
line 369.


beforeEach(() => {
attribute = {
name: 'ATTR_1',
uiType: Configurator.UiType.RADIOBUTTON,
values: [],
};
focusedElements = fixture.debugElement
.queryAll(By.css('label'))
.map((el) => el.nativeNode);

spyOn(windowRef.document, 'querySelector').and.returnValue(
focusedElements
);
});

it('should not set focus because attribute does not contain any values', () => {
it('should set focus because attribute exists', () => {
spyOn(windowRef, 'isBrowser').and.returnValue(true);
spyFocusForFocusedElements(focusedElements);
spyOn(keyboardFocusService, 'findFocusable').and.returnValue(
focusedElements
);

classUnderTest.focusValue(attribute);
verify(focusedElements, 1, 0);
});

Expand All @@ -436,6 +439,7 @@ describe('ConfiguratorStorefrontUtilsService', () => {
const value3 = createValue('value_3', false);
attribute.values = [value1, value2, value3];

classUnderTest.focusValue(attribute);
verify(focusedElements, 1, 1);
});

Expand All @@ -454,6 +458,7 @@ describe('ConfiguratorStorefrontUtilsService', () => {
const value3 = createValue('value_3', false);
attribute.values = [value1, value2, value3];

classUnderTest.focusValue(attribute);
verify(focusedElements, 1, 0);
});

Expand All @@ -465,6 +470,7 @@ describe('ConfiguratorStorefrontUtilsService', () => {
);
attribute.name = 'NO_ATTR_2';

classUnderTest.focusValue(attribute);
verify(focusedElements, 1);
});

Expand All @@ -476,6 +482,7 @@ describe('ConfiguratorStorefrontUtilsService', () => {
);
asSpy(windowRef.document.querySelector).and.returnValue(undefined);

classUnderTest.focusValue(attribute);
verify(focusedElements);
});

Expand All @@ -486,6 +493,7 @@ describe('ConfiguratorStorefrontUtilsService', () => {
focusedElements
);

classUnderTest.focusValue(attribute);
verify(focusedElements);
});
});
Expand Down Expand Up @@ -935,7 +943,7 @@ describe('ConfiguratorStorefrontUtilsService', () => {

it('should return `false` in case the product is `undefined`', () => {
mockRouterState.state.params.displayOnly = true;
mockRouterState.state.queryParams.productCode = PRODUCT_CODE;
mockRouterState.state.queryParams.productCode = undefined;
fixture.detectChanges();

classUnderTest
Expand Down
Loading