diff --git a/.npmignore b/.npmignore index 3ba6feeee01..b7599e66bb7 100644 --- a/.npmignore +++ b/.npmignore @@ -2,3 +2,4 @@ sonar-project.properties sub-folder/ .pipeline/ +tmp/** diff --git a/.prettierrc b/.prettierrc index 544138be456..c1a6f667131 100644 --- a/.prettierrc +++ b/.prettierrc @@ -1,3 +1,4 @@ { - "singleQuote": true + "singleQuote": true, + "trailingComma": "es5" } diff --git a/ci-scripts/publish-sample-data.sh b/ci-scripts/publish-sample-data.sh index 45a9c403557..d2e418599bf 100755 --- a/ci-scripts/publish-sample-data.sh +++ b/ci-scripts/publish-sample-data.sh @@ -4,8 +4,12 @@ TAG_NAME="sampledata" SAMPLE_DATA_ASSETS_FOLDER="sample-data-assets" STOREFRONT_FILE_NAME="spartacussampledata" -SAMPLE_DATA_UNRELEASED_BRANCH="release/6.x" -UNRELEASED_SPARTACUS_VERSION_NAME="$STOREFRONT_FILE_NAME-version-6-x" + +SAMPLE_DATA_UNRELEASED_BRANCH="release/2211.x" +UNRELEASED_SPARTACUS_VERSION_NAME="$STOREFRONT_FILE_NAME-version-2211-x" + +SAMPLE_DATA_UNRELEASED_BRANCH6="release/6.x" +UNRELEASED_SPARTACUS_VERSION_NAME6="$STOREFRONT_FILE_NAME-version-6-x" SAMPLE_DATA_CURRENT_BRANCH="release/5.x" CURRENT_SPARTACUS_VERSION_NAME="$STOREFRONT_FILE_NAME-version-5-x" @@ -23,12 +27,17 @@ function download_sample_data_from_spartacussample_repo { } echo "-----" -echo "Downloading UNRELEASED sample data for 6.x" +echo "Downloading PREVIOUS sample data for 6.x" download_sample_data_from_spartacussample_repo $SAMPLE_DATA_UNRELEASED_BRANCH $UNRELEASED_SPARTACUS_VERSION_NAME echo "-----" -echo "Downloading CURRENT sample data for 5.x" +echo "Downloading PREVIOUS sample data for 6.x" + +download_sample_data_from_spartacussample_repo $SAMPLE_DATA_UNRELEASED_BRANCH6 $UNRELEASED_SPARTACUS_VERSION_NAME6 + +echo "-----" +echo "Downloading PREVIOUS sample data for 5.x" download_sample_data_from_spartacussample_repo $SAMPLE_DATA_CURRENT_BRANCH $CURRENT_SPARTACUS_VERSION_NAME @@ -55,7 +64,8 @@ echo "-----" echo "Create a release with created tag" gh release create $TAG_NAME ./$SAMPLE_DATA_ASSETS_FOLDER/** --repo "https://$GH_TOKEN@github.com/SAP-samples/cloud-commerce-sample-setup.git" --title "Spartacus Sample Data" --notes "Spartacus sample data releases: -6-x: unreleased -5-x: current release +2211-x: current release +6-x: previous release +5-x: previous release 4-x: previous release -3-x: old release" +3-x: old release" \ No newline at end of file diff --git a/ci-scripts/release-packer.sh b/ci-scripts/release-packer.sh index 690df6b02f4..17583a51e24 100755 --- a/ci-scripts/release-packer.sh +++ b/ci-scripts/release-packer.sh @@ -5,12 +5,15 @@ set -e shopt -s extglob dotglob +# Build all the libraries and generate the dist folders to use when releasing +function build_libs { + npm ci && npm run build:libs +} + # Configure the project to move everything into a sub-folder to keep root clean for publishing function configure_project { mkdir sub-folder mv !(sub-folder) sub-folder - cd sub-folder - npm ci && npm run build:libs } # Clear root containing the old package so the next package can be published @@ -49,6 +52,8 @@ function pack { if [[ $1 == 'configure' ]]; then configure_project +elif [[ $1 == 'build' ]]; then + build_libs else clear_root pack "$1" diff --git a/core-libs/setup/package.json b/core-libs/setup/package.json index 461e30ae105..4c04c20fb8b 100644 --- a/core-libs/setup/package.json +++ b/core-libs/setup/package.json @@ -1,6 +1,6 @@ { "name": "@spartacus/setup", - "version": "2211.24.1", + "version": "2211.25.0-3", "description": "Includes features that makes Spartacus and it's setup easier and streamlined.", "keywords": [ "spartacus", @@ -21,10 +21,10 @@ "peerDependencies": { "@angular/core": "^17.0.5", "@angular/ssr": "^17.0.5", - "@spartacus/cart": "2211.24.1", - "@spartacus/core": "2211.24.1", - "@spartacus/order": "2211.24.1", - "@spartacus/user": "2211.24.1" + "@spartacus/cart": "2211.25.0-3", + "@spartacus/core": "2211.25.0-3", + "@spartacus/order": "2211.25.0-3", + "@spartacus/user": "2211.25.0-3" }, "optionalDependencies": { "@angular/platform-server": "^17.0.5", diff --git a/feature-libs/asm/components/asm-create-customer-form/asm-create-customer-form.component.html b/feature-libs/asm/components/asm-create-customer-form/asm-create-customer-form.component.html index 38e9cde6b90..c407d368005 100644 --- a/feature-libs/asm/components/asm-create-customer-form/asm-create-customer-form.component.html +++ b/feature-libs/asm/components/asm-create-customer-form/asm-create-customer-form.component.html @@ -102,19 +102,13 @@

{ 'removeVoucher', ]); - beforeEach( - waitForAsync(() => { - TestBed.configureTestingModule({ - imports: [I18nTestingModule], - declarations: [ - AppliedCouponsComponent, - MockCxIconComponent, - MockedCartCouponComponent, - ], - providers: [ - { provide: CartVoucherFacade, useValue: mockCartVoucherService }, - { - provide: FeaturesConfig, - useValue: { - features: { level: '5.1' }, - }, + beforeEach(waitForAsync(() => { + TestBed.configureTestingModule({ + imports: [I18nTestingModule], + declarations: [ + AppliedCouponsComponent, + MockCxIconComponent, + MockedCartCouponComponent, + ], + providers: [ + { provide: CartVoucherFacade, useValue: mockCartVoucherService }, + { + provide: FeaturesConfig, + useValue: { + features: { level: '5.1' }, }, - ], - }).compileComponents(); - }) - ); + }, + ], + }).compileComponents(); + })); beforeEach(() => { fixture = TestBed.createComponent(MockedCartCouponComponent); diff --git a/feature-libs/cart/base/components/cart-coupon/cart-coupon.component.spec.ts b/feature-libs/cart/base/components/cart-coupon/cart-coupon.component.spec.ts index bd4ff08e737..d8030b4275b 100644 --- a/feature-libs/cart/base/components/cart-coupon/cart-coupon.component.spec.ts +++ b/feature-libs/cart/base/components/cart-coupon/cart-coupon.component.spec.ts @@ -70,26 +70,24 @@ describe('CartCouponComponent', () => { const appliedVouchers: Voucher[] = [{ code: 'CustomerCoupon1' }]; - beforeEach( - waitForAsync(() => { - TestBed.configureTestingModule({ - imports: [I18nTestingModule, ReactiveFormsModule, FormErrorsModule], - declarations: [ - CartCouponComponent, - MockAppliedCouponsComponent, - MockFeatureDirective, - ], - providers: [ - { provide: ActiveCartFacade, useValue: mockActiveCartService }, - { provide: CartVoucherFacade, useValue: mockCartVoucherService }, - { - provide: CustomerCouponService, - useValue: mockCustomerCouponService, - }, - ], - }).compileComponents(); - }) - ); + beforeEach(waitForAsync(() => { + TestBed.configureTestingModule({ + imports: [I18nTestingModule, ReactiveFormsModule, FormErrorsModule], + declarations: [ + CartCouponComponent, + MockAppliedCouponsComponent, + MockFeatureDirective, + ], + providers: [ + { provide: ActiveCartFacade, useValue: mockActiveCartService }, + { provide: CartVoucherFacade, useValue: mockCartVoucherService }, + { + provide: CustomerCouponService, + useValue: mockCustomerCouponService, + }, + ], + }).compileComponents(); + })); beforeEach(() => { fixture = TestBed.createComponent(CartCouponComponent); diff --git a/feature-libs/cart/base/components/cart-coupon/cart-coupon.component.ts b/feature-libs/cart/base/components/cart-coupon/cart-coupon.component.ts index 3679213443c..7090a6550f8 100644 --- a/feature-libs/cart/base/components/cart-coupon/cart-coupon.component.ts +++ b/feature-libs/cart/base/components/cart-coupon/cart-coupon.component.ts @@ -71,7 +71,7 @@ export class CartCouponComponent implements OnInit, OnDestroy { ([cart, activeCardId, customerCoupons]: [ Cart, string, - CustomerCouponSearchResult + CustomerCouponSearchResult, ]) => { this.cartId = activeCardId; this.getApplicableCustomerCoupons( diff --git a/feature-libs/cart/base/components/cart-details/cart-details.component.spec.ts b/feature-libs/cart/base/components/cart-details/cart-details.component.spec.ts index 6a333f52337..e836e2abe5f 100644 --- a/feature-libs/cart/base/components/cart-details/cart-details.component.spec.ts +++ b/feature-libs/cart/base/components/cart-details/cart-details.component.spec.ts @@ -94,35 +94,33 @@ describe('CartDetailsComponent', () => { const mockRoutingService = jasmine.createSpyObj('RoutingService', ['go']); - beforeEach( - waitForAsync(() => { - TestBed.configureTestingModule({ - imports: [RouterTestingModule, PromotionsModule, I18nTestingModule], - declarations: [ - CartDetailsComponent, - MockCartItemListComponent, - MockCartCouponComponent, - MockCartValidationWarningsComponent, - ], - providers: [ - { provide: SelectiveCartFacade, useValue: mockSelectiveCartFacade }, - { provide: AuthService, useValue: mockAuthService }, - { provide: RoutingService, useValue: mockRoutingService }, - { - provide: ActiveCartFacade, - useClass: MockActiveCartService, - }, - { - provide: CartConfigService, - useValue: mockCartConfig, - }, - ], - }).compileComponents(); - - mockCartConfig.isSelectiveCartEnabled.and.returnValue(true); - mockSelectiveCartFacade.isStable.and.returnValue(of(true)); - }) - ); + beforeEach(waitForAsync(() => { + TestBed.configureTestingModule({ + imports: [RouterTestingModule, PromotionsModule, I18nTestingModule], + declarations: [ + CartDetailsComponent, + MockCartItemListComponent, + MockCartCouponComponent, + MockCartValidationWarningsComponent, + ], + providers: [ + { provide: SelectiveCartFacade, useValue: mockSelectiveCartFacade }, + { provide: AuthService, useValue: mockAuthService }, + { provide: RoutingService, useValue: mockRoutingService }, + { + provide: ActiveCartFacade, + useClass: MockActiveCartService, + }, + { + provide: CartConfigService, + useValue: mockCartConfig, + }, + ], + }).compileComponents(); + + mockCartConfig.isSelectiveCartEnabled.and.returnValue(true); + mockSelectiveCartFacade.isStable.and.returnValue(of(true)); + })); beforeEach(() => { fixture = TestBed.createComponent(CartDetailsComponent); diff --git a/feature-libs/cart/base/components/cart-page-layout-handler.ts b/feature-libs/cart/base/components/cart-page-layout-handler.ts index def400e4e8e..ac8befe7125 100644 --- a/feature-libs/cart/base/components/cart-page-layout-handler.ts +++ b/feature-libs/cart/base/components/cart-page-layout-handler.ts @@ -47,13 +47,13 @@ export class CartPageLayoutHandler implements PageLayoutHandler { 'EmptyCartMiddleContent', ]) : cart.totalItems - ? exclude(slots, ['EmptyCartMiddleContent']) - : selectiveCart?.totalItems - ? exclude(slots, [ - 'EmptyCartMiddleContent', - 'CenterRightContentSlot', - ]) - : exclude(slots, ['TopContent', 'CenterRightContentSlot']); + ? exclude(slots, ['EmptyCartMiddleContent']) + : selectiveCart?.totalItems + ? exclude(slots, [ + 'EmptyCartMiddleContent', + 'CenterRightContentSlot', + ]) + : exclude(slots, ['TopContent', 'CenterRightContentSlot']); }) ); } diff --git a/feature-libs/cart/base/components/cart-proceed-to-checkout/cart-proceed-to-checkout.component.spec.ts b/feature-libs/cart/base/components/cart-proceed-to-checkout/cart-proceed-to-checkout.component.spec.ts index e0b724c6aed..1e05a36093e 100644 --- a/feature-libs/cart/base/components/cart-proceed-to-checkout/cart-proceed-to-checkout.component.spec.ts +++ b/feature-libs/cart/base/components/cart-proceed-to-checkout/cart-proceed-to-checkout.component.spec.ts @@ -25,24 +25,22 @@ describe('CartProceedToCheckoutComponent', () => { let component: CartProceedToCheckoutComponent; let fixture: ComponentFixture; - beforeEach( - waitForAsync(() => { - TestBed.configureTestingModule({ - imports: [RouterTestingModule, I18nTestingModule, ProgressButtonModule], - declarations: [CartProceedToCheckoutComponent, MockUrlPipe], - providers: [ - { - provide: Router, - useClass: MockRouter, - }, - { - provide: ChangeDetectorRef, - useValue: { markForCheck: createSpy('markForCheck') }, - }, - ], - }).compileComponents(); - }) - ); + beforeEach(waitForAsync(() => { + TestBed.configureTestingModule({ + imports: [RouterTestingModule, I18nTestingModule, ProgressButtonModule], + declarations: [CartProceedToCheckoutComponent, MockUrlPipe], + providers: [ + { + provide: Router, + useClass: MockRouter, + }, + { + provide: ChangeDetectorRef, + useValue: { markForCheck: createSpy('markForCheck') }, + }, + ], + }).compileComponents(); + })); beforeEach(() => { fixture = TestBed.createComponent(CartProceedToCheckoutComponent); diff --git a/feature-libs/cart/base/components/cart-proceed-to-checkout/cart-proceed-to-checkout.component.ts b/feature-libs/cart/base/components/cart-proceed-to-checkout/cart-proceed-to-checkout.component.ts index e11f834296b..c43c4c5dc3c 100644 --- a/feature-libs/cart/base/components/cart-proceed-to-checkout/cart-proceed-to-checkout.component.ts +++ b/feature-libs/cart/base/components/cart-proceed-to-checkout/cart-proceed-to-checkout.component.ts @@ -38,7 +38,10 @@ export class CartProceedToCheckoutComponent implements OnInit, OnDestroy { * @deprecated since 5.2 */ constructor(router: Router); - constructor(protected router: Router, protected cd?: ChangeDetectorRef) {} + constructor( + protected router: Router, + protected cd?: ChangeDetectorRef + ) {} ngOnInit(): void { this.subscription.add( diff --git a/feature-libs/cart/base/components/cart-shared/cart-item-list-row/cart-item-list-row.component.html b/feature-libs/cart/base/components/cart-shared/cart-item-list-row/cart-item-list-row.component.html index c0fcf92caeb..00a01a6a5f8 100644 --- a/feature-libs/cart/base/components/cart-shared/cart-item-list-row/cart-item-list-row.component.html +++ b/feature-libs/cart/base/components/cart-shared/cart-item-list-row/cart-item-list-row.component.html @@ -51,7 +51,7 @@
diff --git a/feature-libs/cart/base/components/cart-shared/cart-item/cart-item.component.spec.ts b/feature-libs/cart/base/components/cart-shared/cart-item/cart-item.component.spec.ts index 6f19a22cc8f..0112b975547 100644 --- a/feature-libs/cart/base/components/cart-shared/cart-item/cart-item.component.spec.ts +++ b/feature-libs/cart/base/components/cart-shared/cart-item/cart-item.component.spec.ts @@ -113,34 +113,32 @@ describe('CartItemComponent', () => { 'isLevel', ]); - beforeEach( - waitForAsync(() => { - TestBed.configureTestingModule({ - imports: [ - RouterTestingModule, - ReactiveFormsModule, - I18nTestingModule, - OutletModule, - ], - declarations: [ - CartItemComponent, - MockMediaComponent, - MockItemCounterComponent, - MockPromotionsComponent, - MockUrlPipe, - MockFeatureLevelDirective, - MockOutletDirective, - MockCartItemValidationWarningComponent, - MockAtMessageDirective, - ], - providers: [ - { - provide: ControlContainer, - }, - ], - }).compileComponents(); - }) - ); + beforeEach(waitForAsync(() => { + TestBed.configureTestingModule({ + imports: [ + RouterTestingModule, + ReactiveFormsModule, + I18nTestingModule, + OutletModule, + ], + declarations: [ + CartItemComponent, + MockMediaComponent, + MockItemCounterComponent, + MockPromotionsComponent, + MockUrlPipe, + MockFeatureLevelDirective, + MockOutletDirective, + MockCartItemValidationWarningComponent, + MockAtMessageDirective, + ], + providers: [ + { + provide: ControlContainer, + }, + ], + }).compileComponents(); + })); beforeEach(() => { fixture = TestBed.createComponent(CartItemComponent); diff --git a/feature-libs/cart/base/components/cart-shared/order-summary/order-summary.component.spec.ts b/feature-libs/cart/base/components/cart-shared/order-summary/order-summary.component.spec.ts index e079450d2cc..0d62fa2353d 100644 --- a/feature-libs/cart/base/components/cart-shared/order-summary/order-summary.component.spec.ts +++ b/feature-libs/cart/base/components/cart-shared/order-summary/order-summary.component.spec.ts @@ -30,21 +30,19 @@ describe('OrderSummary', () => { let component: OrderSummaryComponent; let fixture: ComponentFixture; - beforeEach( - waitForAsync(() => { - TestBed.configureTestingModule({ - imports: [CommonModule, PromotionsModule, I18nTestingModule], - declarations: [OrderSummaryComponent, MockAppliedCouponsComponent], - providers: [ - { provide: CartVoucherFacade, useValue: {} }, - { - provide: OutletContextData, - useValue: { context$ }, - }, - ], - }).compileComponents(); - }) - ); + beforeEach(waitForAsync(() => { + TestBed.configureTestingModule({ + imports: [CommonModule, PromotionsModule, I18nTestingModule], + declarations: [OrderSummaryComponent, MockAppliedCouponsComponent], + providers: [ + { provide: CartVoucherFacade, useValue: {} }, + { + provide: OutletContextData, + useValue: { context$ }, + }, + ], + }).compileComponents(); + })); beforeEach(() => { fixture = TestBed.createComponent(OrderSummaryComponent); diff --git a/feature-libs/cart/base/components/cart-totals/cart-totals.component.spec.ts b/feature-libs/cart/base/components/cart-totals/cart-totals.component.spec.ts index 8e51a5f8f28..71bdf9fb237 100644 --- a/feature-libs/cart/base/components/cart-totals/cart-totals.component.spec.ts +++ b/feature-libs/cart/base/components/cart-totals/cart-totals.component.spec.ts @@ -26,19 +26,17 @@ describe('CartTotalsComponent', () => { let component: CartTotalsComponent; let fixture: ComponentFixture; - beforeEach( - waitForAsync(() => { - TestBed.configureTestingModule({ - declarations: [CartTotalsComponent, MockOrderSummaryComponent], - providers: [ - { - provide: ActiveCartFacade, - useClass: MockActiveCartService, - }, - ], - }).compileComponents(); - }) - ); + beforeEach(waitForAsync(() => { + TestBed.configureTestingModule({ + declarations: [CartTotalsComponent, MockOrderSummaryComponent], + providers: [ + { + provide: ActiveCartFacade, + useClass: MockActiveCartService, + }, + ], + }).compileComponents(); + })); beforeEach(() => { fixture = TestBed.createComponent(CartTotalsComponent); diff --git a/feature-libs/cart/base/components/mini-cart/mini-cart.component.spec.ts b/feature-libs/cart/base/components/mini-cart/mini-cart.component.spec.ts index f156b251200..ed15bd77bd0 100644 --- a/feature-libs/cart/base/components/mini-cart/mini-cart.component.spec.ts +++ b/feature-libs/cart/base/components/mini-cart/mini-cart.component.spec.ts @@ -37,20 +37,18 @@ describe('MiniCartComponent', () => { let miniCartComponent: MiniCartComponent; let fixture: ComponentFixture; - beforeEach( - waitForAsync(() => { - TestBed.configureTestingModule({ - imports: [RouterTestingModule, I18nTestingModule], - declarations: [MiniCartComponent, MockUrlPipe, MockCxIconComponent], - providers: [ - { - provide: MiniCartComponentService, - useValue: mockMiniCartComponentService, - }, - ], - }).compileComponents(); - }) - ); + beforeEach(waitForAsync(() => { + TestBed.configureTestingModule({ + imports: [RouterTestingModule, I18nTestingModule], + declarations: [MiniCartComponent, MockUrlPipe, MockCxIconComponent], + providers: [ + { + provide: MiniCartComponentService, + useValue: mockMiniCartComponentService, + }, + ], + }).compileComponents(); + })); beforeEach(() => { fixture = TestBed.createComponent(MiniCartComponent); diff --git a/feature-libs/cart/base/components/save-for-later/save-for-later.component.spec.ts b/feature-libs/cart/base/components/save-for-later/save-for-later.component.spec.ts index 0912eaddcf6..dfd43d486e3 100644 --- a/feature-libs/cart/base/components/save-for-later/save-for-later.component.spec.ts +++ b/feature-libs/cart/base/components/save-for-later/save-for-later.component.spec.ts @@ -46,19 +46,17 @@ describe('SaveForLaterComponent', () => { 'getComponentData', ]); - beforeEach( - waitForAsync(() => { - TestBed.configureTestingModule({ - declarations: [SaveForLaterComponent, MockCartItemListComponent], - imports: [I18nTestingModule], - providers: [ - { provide: CmsService, useValue: mockCmsService }, - { provide: ActiveCartFacade, useValue: mockActiveCartService }, - { provide: SelectiveCartFacade, useValue: mockSelectiveCartService }, - ], - }).compileComponents(); - }) - ); + beforeEach(waitForAsync(() => { + TestBed.configureTestingModule({ + declarations: [SaveForLaterComponent, MockCartItemListComponent], + imports: [I18nTestingModule], + providers: [ + { provide: CmsService, useValue: mockCmsService }, + { provide: ActiveCartFacade, useValue: mockActiveCartService }, + { provide: SelectiveCartFacade, useValue: mockSelectiveCartService }, + ], + }).compileComponents(); + })); beforeEach(() => { fixture = TestBed.createComponent(SaveForLaterComponent); diff --git a/feature-libs/cart/base/styles/components/_item-counter.scss b/feature-libs/cart/base/styles/components/_item-counter.scss index 0c5c3af8c5f..2f5f680dbc6 100644 --- a/feature-libs/cart/base/styles/components/_item-counter.scss +++ b/feature-libs/cart/base/styles/components/_item-counter.scss @@ -85,6 +85,8 @@ font-size: var(--cx-font-size, 2rem); line-height: 0; color: var(--cx-color-text); + padding-inline-start: 0; + padding-inline-end: 0; &:focus { box-shadow: 0 0 0 0; } diff --git a/feature-libs/cart/package.json b/feature-libs/cart/package.json index 534cc7faba6..3a392ff1cde 100644 --- a/feature-libs/cart/package.json +++ b/feature-libs/cart/package.json @@ -1,6 +1,6 @@ { "name": "@spartacus/cart", - "version": "2211.24.1", + "version": "2211.25.0-3", "description": "", "keywords": [ "spartacus", @@ -37,11 +37,11 @@ "@ng-select/ng-select": "^12.0.4", "@ngrx/effects": "^17.0.1", "@ngrx/store": "^17.0.1", - "@spartacus/core": "2211.24.1", - "@spartacus/schematics": "2211.24.1", - "@spartacus/storefront": "2211.24.1", - "@spartacus/styles": "2211.24.1", - "@spartacus/user": "2211.24.1", + "@spartacus/core": "2211.25.0-3", + "@spartacus/schematics": "2211.25.0-3", + "@spartacus/storefront": "2211.25.0-3", + "@spartacus/styles": "2211.25.0-3", + "@spartacus/user": "2211.25.0-3", "bootstrap": "^4.6.2", "rxjs": "^7.8.0" }, diff --git a/feature-libs/cart/saved-cart/components/details/saved-cart-details-items/saved-cart-details-items.component.spec.ts b/feature-libs/cart/saved-cart/components/details/saved-cart-details-items/saved-cart-details-items.component.spec.ts index 4eec0ab8c61..9e53306bd0b 100644 --- a/feature-libs/cart/saved-cart/components/details/saved-cart-details-items/saved-cart-details-items.component.spec.ts +++ b/feature-libs/cart/saved-cart/components/details/saved-cart-details-items/saved-cart-details-items.component.spec.ts @@ -79,46 +79,44 @@ describe('SavedCartDetailsItemsComponent', () => { let globalMessageService: GlobalMessageService; let routingService: RoutingService; - beforeEach( - waitForAsync(() => { - TestBed.configureTestingModule({ - imports: [StoreModule.forRoot({}), I18nTestingModule, OutletModule], - declarations: [SavedCartDetailsItemsComponent], - providers: [ - { - provide: SavedCartFacade, - useClass: MockSavedCartFacade, - }, - { - provide: EventService, - useClass: MockEventService, - }, - { - provide: SavedCartDetailsService, - useClass: MockSavedCartDetailsService, - }, - { provide: RoutingService, useClass: MockRoutingService }, - { provide: GlobalMessageService, useClass: MockGlobalMessageService }, - ], - }).compileComponents(); - - fixture = TestBed.createComponent(SavedCartDetailsItemsComponent); - component = fixture.componentInstance; - - savedCartFacade = TestBed.inject(SavedCartFacade); - eventService = TestBed.inject(EventService); - globalMessageService = TestBed.inject(GlobalMessageService); - routingService = TestBed.inject(RoutingService); - - spyOn(routingService, 'go').and.callThrough(); - spyOn(globalMessageService, 'add').and.callThrough(); - spyOn(savedCartFacade, 'deleteSavedCart').and.callThrough(); - - cart$.next(mockSavedCart); - - fixture.detectChanges(); - }) - ); + beforeEach(waitForAsync(() => { + TestBed.configureTestingModule({ + imports: [StoreModule.forRoot({}), I18nTestingModule, OutletModule], + declarations: [SavedCartDetailsItemsComponent], + providers: [ + { + provide: SavedCartFacade, + useClass: MockSavedCartFacade, + }, + { + provide: EventService, + useClass: MockEventService, + }, + { + provide: SavedCartDetailsService, + useClass: MockSavedCartDetailsService, + }, + { provide: RoutingService, useClass: MockRoutingService }, + { provide: GlobalMessageService, useClass: MockGlobalMessageService }, + ], + }).compileComponents(); + + fixture = TestBed.createComponent(SavedCartDetailsItemsComponent); + component = fixture.componentInstance; + + savedCartFacade = TestBed.inject(SavedCartFacade); + eventService = TestBed.inject(EventService); + globalMessageService = TestBed.inject(GlobalMessageService); + routingService = TestBed.inject(RoutingService); + + spyOn(routingService, 'go').and.callThrough(); + spyOn(globalMessageService, 'add').and.callThrough(); + spyOn(savedCartFacade, 'deleteSavedCart').and.callThrough(); + + cart$.next(mockSavedCart); + + fixture.detectChanges(); + })); it('should create', () => { expect(component).toBeTruthy(); diff --git a/feature-libs/cart/saved-cart/styles/_add-to-saved-cart.scss b/feature-libs/cart/saved-cart/styles/_add-to-saved-cart.scss index 85c0741abfd..5b8ee12c84d 100644 --- a/feature-libs/cart/saved-cart/styles/_add-to-saved-cart.scss +++ b/feature-libs/cart/saved-cart/styles/_add-to-saved-cart.scss @@ -11,6 +11,10 @@ cx-add-to-saved-cart { margin-inline-end: 0; &:before { content: '|'; + @include forFeature('a11yExpandedFocusIndicator') { + content: '|' / ''; + } + color: var(--cx-color-light); display: inline-block; text-decoration: none; diff --git a/feature-libs/cart/wish-list/components/add-to-wishlist/add-to-wish-list.component.html b/feature-libs/cart/wish-list/components/add-to-wishlist/add-to-wish-list.component.html index fcc2ad604de..603fdb8353f 100644 --- a/feature-libs/cart/wish-list/components/add-to-wishlist/add-to-wish-list.component.html +++ b/feature-libs/cart/wish-list/components/add-to-wishlist/add-to-wish-list.component.html @@ -2,34 +2,73 @@ -
- -
- - + + + + + +
- - {{ - 'addToWishList.add' | cxTranslate - }} - - + +
+ + + + diff --git a/feature-libs/cart/wish-list/components/add-to-wishlist/add-to-wish-list.component.spec.ts b/feature-libs/cart/wish-list/components/add-to-wishlist/add-to-wish-list.component.spec.ts index 95bc2c5bbc6..236ffcd977d 100644 --- a/feature-libs/cart/wish-list/components/add-to-wishlist/add-to-wish-list.component.spec.ts +++ b/feature-libs/cart/wish-list/components/add-to-wishlist/add-to-wish-list.component.spec.ts @@ -14,6 +14,7 @@ import { Cart, OrderEntry } from '@spartacus/cart/base/root'; import { WishListFacade } from '@spartacus/cart/wish-list/root'; import { AuthService, I18nTestingModule, Product } from '@spartacus/core'; import { CurrentProductService } from '@spartacus/storefront'; +import { MockFeatureDirective } from 'projects/storefrontlib/shared/test/mock-feature-directive'; import { BehaviorSubject, Observable, of } from 'rxjs'; import { AddToWishListComponent } from './add-to-wish-list.component'; import createSpy = jasmine.createSpy; @@ -105,31 +106,30 @@ describe('AddToWishListComponent', () => { let wishListFacade: WishListFacade; let el: DebugElement; - beforeEach( - waitForAsync(() => { - TestBed.configureTestingModule({ - imports: [I18nTestingModule, RouterTestingModule], - declarations: [ - AddToWishListComponent, - MockIconComponent, - MockUrlPipe, - MockAtMessageDirective, - ], - providers: [ - { provide: AuthService, useClass: MockAuthService }, - { provide: WishListFacade, useClass: MockWishListService }, - { - provide: CurrentProductService, - useClass: MockCurrentProductService, - }, - ], - }) - .overrideComponent(AddToWishListComponent, { - set: { changeDetection: ChangeDetectionStrategy.Default }, - }) - .compileComponents(); + beforeEach(waitForAsync(() => { + TestBed.configureTestingModule({ + imports: [I18nTestingModule, RouterTestingModule], + declarations: [ + AddToWishListComponent, + MockIconComponent, + MockUrlPipe, + MockAtMessageDirective, + MockFeatureDirective, + ], + providers: [ + { provide: AuthService, useClass: MockAuthService }, + { provide: WishListFacade, useClass: MockWishListService }, + { + provide: CurrentProductService, + useClass: MockCurrentProductService, + }, + ], }) - ); + .overrideComponent(AddToWishListComponent, { + set: { changeDetection: ChangeDetectionStrategy.Default }, + }) + .compileComponents(); + })); beforeEach(() => { fixture = TestBed.createComponent(AddToWishListComponent); diff --git a/feature-libs/cart/wish-list/components/add-to-wishlist/add-to-wish-list.module.ts b/feature-libs/cart/wish-list/components/add-to-wishlist/add-to-wish-list.module.ts index 3dbefc18af4..98757588831 100644 --- a/feature-libs/cart/wish-list/components/add-to-wishlist/add-to-wish-list.module.ts +++ b/feature-libs/cart/wish-list/components/add-to-wishlist/add-to-wish-list.module.ts @@ -9,11 +9,12 @@ import { NgModule } from '@angular/core'; import { RouterModule } from '@angular/router'; import { CmsConfig, + FeaturesConfigModule, I18nModule, provideDefaultConfig, UrlModule, } from '@spartacus/core'; -import { IconModule, AtMessageModule } from '@spartacus/storefront'; +import { AtMessageModule, IconModule } from '@spartacus/storefront'; import { AddToWishListComponent } from './add-to-wish-list.component'; @NgModule({ @@ -24,6 +25,7 @@ import { AddToWishListComponent } from './add-to-wish-list.component'; RouterModule, UrlModule, AtMessageModule, + FeaturesConfigModule, ], providers: [ provideDefaultConfig({ diff --git a/feature-libs/cart/wish-list/components/wish-list-item/wish-list-item.component.spec.ts b/feature-libs/cart/wish-list/components/wish-list-item/wish-list-item.component.spec.ts index 7605061f96e..fb1ae76973e 100644 --- a/feature-libs/cart/wish-list/components/wish-list-item/wish-list-item.component.spec.ts +++ b/feature-libs/cart/wish-list/components/wish-list-item/wish-list-item.component.spec.ts @@ -85,24 +85,22 @@ describe('WishListItemComponent', () => { let el: DebugElement; let componentInjector: Injector; - beforeEach( - waitForAsync(() => { - TestBed.configureTestingModule({ - imports: [I18nTestingModule, RouterTestingModule], - declarations: [ - WishListItemComponent, - MockPictureComponent, - MockAddToCartComponent, - MockUrlPipe, - MockAtMessageDirective, - ], - }) - .overrideComponent(WishListItemComponent, { - set: { changeDetection: ChangeDetectionStrategy.Default }, - }) - .compileComponents(); + beforeEach(waitForAsync(() => { + TestBed.configureTestingModule({ + imports: [I18nTestingModule, RouterTestingModule], + declarations: [ + WishListItemComponent, + MockPictureComponent, + MockAddToCartComponent, + MockUrlPipe, + MockAtMessageDirective, + ], }) - ); + .overrideComponent(WishListItemComponent, { + set: { changeDetection: ChangeDetectionStrategy.Default }, + }) + .compileComponents(); + })); beforeEach(() => { fixture = TestBed.createComponent(WishListItemComponent); diff --git a/feature-libs/cart/wish-list/components/wish-list/wish-list.component.spec.ts b/feature-libs/cart/wish-list/components/wish-list/wish-list.component.spec.ts index 2cf18a9dbeb..b1ba5793722 100644 --- a/feature-libs/cart/wish-list/components/wish-list/wish-list.component.spec.ts +++ b/feature-libs/cart/wish-list/components/wish-list/wish-list.component.spec.ts @@ -36,20 +36,18 @@ describe('WishListComponent', () => { let wishListService: WishListFacade; - beforeEach( - waitForAsync(() => { - TestBed.configureTestingModule({ - imports: [I18nTestingModule], - declarations: [WishListComponent, MockWishListItemComponent], - providers: [ - { - provide: WishListFacade, - useClass: MockWishListService, - }, - ], - }).compileComponents(); - }) - ); + beforeEach(waitForAsync(() => { + TestBed.configureTestingModule({ + imports: [I18nTestingModule], + declarations: [WishListComponent, MockWishListItemComponent], + providers: [ + { + provide: WishListFacade, + useClass: MockWishListService, + }, + ], + }).compileComponents(); + })); beforeEach(() => { fixture = TestBed.createComponent(WishListComponent); diff --git a/feature-libs/checkout/b2b/components/checkout-delivery-address/checkout-delivery-address.component.spec.ts b/feature-libs/checkout/b2b/components/checkout-delivery-address/checkout-delivery-address.component.spec.ts index 87ace3caa72..ce6ed148c84 100644 --- a/feature-libs/checkout/b2b/components/checkout-delivery-address/checkout-delivery-address.component.spec.ts +++ b/feature-libs/checkout/b2b/components/checkout-delivery-address/checkout-delivery-address.component.spec.ts @@ -167,66 +167,64 @@ describe('B2BCheckoutDeliveryAddressComponent', () => { let globalMessageService: GlobalMessageService; let checkoutDeliveryModesFacade: CheckoutDeliveryModesFacade; - beforeEach( - waitForAsync(() => { - TestBed.configureTestingModule({ - imports: [I18nTestingModule], - declarations: [ - B2BCheckoutDeliveryAddressComponent, - MockAddressFormComponent, - MockCardComponent, - MockSpinnerComponent, - ], - providers: [ - { provide: UserAddressService, useClass: MockUserAddressService }, - { provide: ActiveCartFacade, useClass: MockActiveCartService }, - { - provide: CheckoutDeliveryAddressFacade, - useClass: MockCheckoutDeliveryAddressFacade, - }, - { provide: CheckoutStepService, useClass: MockCheckoutStepService }, - { provide: ActivatedRoute, useValue: mockActivatedRoute }, - { provide: GlobalMessageService, useClass: MockGlobalMessageService }, - { - provide: CheckoutPaymentTypeFacade, - useClass: MockPaymentTypeService, - }, - { - provide: UserCostCenterService, - useClass: MockUserCostCenterService, - }, - { - provide: CheckoutCostCenterFacade, - useClass: MockCheckoutCostCenterService, - }, - { - provide: CheckoutDeliveryModesFacade, - useClass: MockCheckoutDeliveryModesFacade, - }, - { - provide: CheckoutFlowOrchestratorService, - useClass: MockCheckoutFlowOrchestratorService, - }, - ], + beforeEach(waitForAsync(() => { + TestBed.configureTestingModule({ + imports: [I18nTestingModule], + declarations: [ + B2BCheckoutDeliveryAddressComponent, + MockAddressFormComponent, + MockCardComponent, + MockSpinnerComponent, + ], + providers: [ + { provide: UserAddressService, useClass: MockUserAddressService }, + { provide: ActiveCartFacade, useClass: MockActiveCartService }, + { + provide: CheckoutDeliveryAddressFacade, + useClass: MockCheckoutDeliveryAddressFacade, + }, + { provide: CheckoutStepService, useClass: MockCheckoutStepService }, + { provide: ActivatedRoute, useValue: mockActivatedRoute }, + { provide: GlobalMessageService, useClass: MockGlobalMessageService }, + { + provide: CheckoutPaymentTypeFacade, + useClass: MockPaymentTypeService, + }, + { + provide: UserCostCenterService, + useClass: MockUserCostCenterService, + }, + { + provide: CheckoutCostCenterFacade, + useClass: MockCheckoutCostCenterService, + }, + { + provide: CheckoutDeliveryModesFacade, + useClass: MockCheckoutDeliveryModesFacade, + }, + { + provide: CheckoutFlowOrchestratorService, + useClass: MockCheckoutFlowOrchestratorService, + }, + ], + }) + .overrideComponent(B2BCheckoutDeliveryAddressComponent, { + set: { changeDetection: ChangeDetectionStrategy.Default }, }) - .overrideComponent(B2BCheckoutDeliveryAddressComponent, { - set: { changeDetection: ChangeDetectionStrategy.Default }, - }) - .compileComponents(); + .compileComponents(); - checkoutDeliveryAddressFacade = TestBed.inject( - CheckoutDeliveryAddressFacade - ); - activeCartFacade = TestBed.inject(ActiveCartFacade); - checkoutStepService = TestBed.inject( - CheckoutStepService as Type - ); - userAddressService = TestBed.inject(UserAddressService); - userCostCenterService = TestBed.inject(UserCostCenterService); - globalMessageService = TestBed.inject(GlobalMessageService); - checkoutDeliveryModesFacade = TestBed.inject(CheckoutDeliveryModesFacade); - }) - ); + checkoutDeliveryAddressFacade = TestBed.inject( + CheckoutDeliveryAddressFacade + ); + activeCartFacade = TestBed.inject(ActiveCartFacade); + checkoutStepService = TestBed.inject( + CheckoutStepService as Type + ); + userAddressService = TestBed.inject(UserAddressService); + userCostCenterService = TestBed.inject(UserCostCenterService); + globalMessageService = TestBed.inject(GlobalMessageService); + checkoutDeliveryModesFacade = TestBed.inject(CheckoutDeliveryModesFacade); + })); beforeEach(() => { fixture = TestBed.createComponent(B2BCheckoutDeliveryAddressComponent); diff --git a/feature-libs/checkout/b2b/components/checkout-payment-type/checkout-payment-type.component.spec.ts b/feature-libs/checkout/b2b/components/checkout-payment-type/checkout-payment-type.component.spec.ts index 432275a3cc0..3e8b8ca5e89 100644 --- a/feature-libs/checkout/b2b/components/checkout-payment-type/checkout-payment-type.component.spec.ts +++ b/feature-libs/checkout/b2b/components/checkout-payment-type/checkout-payment-type.component.spec.ts @@ -84,33 +84,31 @@ describe('CheckoutOnePaymentTypeComponent', () => { let checkoutStepService: CheckoutStepService; - beforeEach( - waitForAsync(() => { - TestBed.configureTestingModule({ - imports: [I18nTestingModule], - declarations: [CheckoutPaymentTypeComponent, MockSpinnerComponent], - providers: [ - { - provide: CheckoutPaymentTypeFacade, - useClass: MockCheckoutOnePaymentTypeService, - }, - { - provide: CheckoutStepService, - useClass: MockCheckoutStepService, - }, - { provide: ActivatedRoute, useValue: mockActivatedRoute }, - { - provide: GlobalMessageService, - useClass: MockGlobalMessageService, - }, - ], - }).compileComponents(); - - checkoutStepService = TestBed.inject( - CheckoutStepService as Type - ); - }) - ); + beforeEach(waitForAsync(() => { + TestBed.configureTestingModule({ + imports: [I18nTestingModule], + declarations: [CheckoutPaymentTypeComponent, MockSpinnerComponent], + providers: [ + { + provide: CheckoutPaymentTypeFacade, + useClass: MockCheckoutOnePaymentTypeService, + }, + { + provide: CheckoutStepService, + useClass: MockCheckoutStepService, + }, + { provide: ActivatedRoute, useValue: mockActivatedRoute }, + { + provide: GlobalMessageService, + useClass: MockGlobalMessageService, + }, + ], + }).compileComponents(); + + checkoutStepService = TestBed.inject( + CheckoutStepService as Type + ); + })); beforeEach(() => { fixture = TestBed.createComponent(CheckoutPaymentTypeComponent); @@ -141,36 +139,34 @@ describe('CheckoutPaymentTypeComponent', () => { let checkoutStepService: CheckoutStepService; let el: DebugElement; - beforeEach( - waitForAsync(() => { - TestBed.configureTestingModule({ - imports: [I18nTestingModule], - declarations: [CheckoutPaymentTypeComponent, MockSpinnerComponent], - providers: [ - { - provide: CheckoutPaymentTypeFacade, - useClass: MockCheckoutPaymentTypeService, - }, - { - provide: CheckoutStepService, - useClass: MockCheckoutStepService, - }, - { provide: ActivatedRoute, useValue: mockActivatedRoute }, - { - provide: GlobalMessageService, - useClass: MockGlobalMessageService, - }, - ], - }).compileComponents(); - - checkoutPaymentTypeFacade = TestBed.inject( - CheckoutPaymentTypeFacade as Type - ); - checkoutStepService = TestBed.inject( - CheckoutStepService as Type - ); - }) - ); + beforeEach(waitForAsync(() => { + TestBed.configureTestingModule({ + imports: [I18nTestingModule], + declarations: [CheckoutPaymentTypeComponent, MockSpinnerComponent], + providers: [ + { + provide: CheckoutPaymentTypeFacade, + useClass: MockCheckoutPaymentTypeService, + }, + { + provide: CheckoutStepService, + useClass: MockCheckoutStepService, + }, + { provide: ActivatedRoute, useValue: mockActivatedRoute }, + { + provide: GlobalMessageService, + useClass: MockGlobalMessageService, + }, + ], + }).compileComponents(); + + checkoutPaymentTypeFacade = TestBed.inject( + CheckoutPaymentTypeFacade as Type + ); + checkoutStepService = TestBed.inject( + CheckoutStepService as Type + ); + })); beforeEach(() => { fixture = TestBed.createComponent(CheckoutPaymentTypeComponent); diff --git a/feature-libs/checkout/b2b/components/checkout-payment-type/checkout-payment-type.component.ts b/feature-libs/checkout/b2b/components/checkout-payment-type/checkout-payment-type.component.ts index e4f0482761d..76147cf49ea 100644 --- a/feature-libs/checkout/b2b/components/checkout-payment-type/checkout-payment-type.component.ts +++ b/feature-libs/checkout/b2b/components/checkout-payment-type/checkout-payment-type.component.ts @@ -87,7 +87,7 @@ export class CheckoutPaymentTypeComponent { map( ([selectedPaymentType, availablePaymentTypes]: [ PaymentType | undefined, - PaymentType[] + PaymentType[], ]) => { if ( selectedPaymentType && diff --git a/feature-libs/checkout/b2b/components/checkout-review-submit/checkout-review-submit.component.spec.ts b/feature-libs/checkout/b2b/components/checkout-review-submit/checkout-review-submit.component.spec.ts index b4eb2a3a17f..5e67bfa0042 100644 --- a/feature-libs/checkout/b2b/components/checkout-review-submit/checkout-review-submit.component.spec.ts +++ b/feature-libs/checkout/b2b/components/checkout-review-submit/checkout-review-submit.component.spec.ts @@ -213,55 +213,53 @@ describe('B2BCheckoutReviewSubmitComponent', () => { let component: B2BCheckoutReviewSubmitComponent; let fixture: ComponentFixture; - beforeEach( - waitForAsync(() => { - TestBed.configureTestingModule({ - imports: [ - I18nTestingModule, - PromotionsModule, - RouterTestingModule, - IconTestingModule, - OutletModule, - ], - declarations: [ - B2BCheckoutReviewSubmitComponent, - MockCardComponent, - MockUrlPipe, - ], - providers: [ - { - provide: CheckoutDeliveryAddressFacade, - useClass: MockCheckoutDeliveryAddressService, - }, - { - provide: CheckoutDeliveryModesFacade, - useClass: MockCheckoutDeliveryModesService, - }, - { - provide: CheckoutPaymentFacade, - useClass: MockCheckoutPaymentService, - }, - { provide: ActiveCartFacade, useClass: MockActiveCartService }, - { - provide: CheckoutStepService, - useClass: MockCheckoutStepService, - }, - { - provide: CheckoutPaymentTypeFacade, - useClass: MockCheckoutPaymentTypeFacade, - }, - { - provide: CheckoutCostCenterFacade, - useClass: MockCheckoutCostCenterService, - }, - { - provide: UserCostCenterService, - useClass: MockUserCostCenterService, - }, - ], - }).compileComponents(); - }) - ); + beforeEach(waitForAsync(() => { + TestBed.configureTestingModule({ + imports: [ + I18nTestingModule, + PromotionsModule, + RouterTestingModule, + IconTestingModule, + OutletModule, + ], + declarations: [ + B2BCheckoutReviewSubmitComponent, + MockCardComponent, + MockUrlPipe, + ], + providers: [ + { + provide: CheckoutDeliveryAddressFacade, + useClass: MockCheckoutDeliveryAddressService, + }, + { + provide: CheckoutDeliveryModesFacade, + useClass: MockCheckoutDeliveryModesService, + }, + { + provide: CheckoutPaymentFacade, + useClass: MockCheckoutPaymentService, + }, + { provide: ActiveCartFacade, useClass: MockActiveCartService }, + { + provide: CheckoutStepService, + useClass: MockCheckoutStepService, + }, + { + provide: CheckoutPaymentTypeFacade, + useClass: MockCheckoutPaymentTypeFacade, + }, + { + provide: CheckoutCostCenterFacade, + useClass: MockCheckoutCostCenterService, + }, + { + provide: UserCostCenterService, + useClass: MockUserCostCenterService, + }, + ], + }).compileComponents(); + })); beforeEach(() => { fixture = TestBed.createComponent(B2BCheckoutReviewSubmitComponent); diff --git a/feature-libs/checkout/base/components/checkout-billing-address/checkout-billing-address-form.component.spec.ts b/feature-libs/checkout/base/components/checkout-billing-address/checkout-billing-address-form.component.spec.ts index 62c79204b8d..d9e510c69fa 100644 --- a/feature-libs/checkout/base/components/checkout-billing-address/checkout-billing-address-form.component.spec.ts +++ b/feature-libs/checkout/base/components/checkout-billing-address/checkout-billing-address-form.component.spec.ts @@ -92,39 +92,37 @@ describe('CheckoutBillingAddressFormComponent', () => { let mockGlobalMessageService: MockGlobalMessageService; let userAddressService: UserAddressService; - beforeEach( - waitForAsync(() => { - mockCheckoutDeliveryService = new MockCheckoutDeliveryService(); - mockUserPaymentService = new MockUserPaymentService(); - mockGlobalMessageService = new MockGlobalMessageService(); - - TestBed.configureTestingModule({ - imports: [ - ReactiveFormsModule, - NgSelectModule, - NgSelectA11yModule, - I18nTestingModule, - FormErrorsModule, - ], - declarations: [CheckoutBillingAddressFormComponent, MockCardComponent], - providers: [ - { provide: LaunchDialogService, useClass: MockLaunchDialogService }, - { - provide: CheckoutDeliveryAddressFacade, - useValue: mockCheckoutDeliveryService, - }, - { provide: UserPaymentService, useValue: mockUserPaymentService }, - { provide: GlobalMessageService, useValue: mockGlobalMessageService }, - { provide: UserAddressService, useClass: MockUserAddressService }, - CheckoutBillingAddressFormService, - ], - }) - .overrideComponent(CheckoutBillingAddressFormComponent, { - set: { changeDetection: ChangeDetectionStrategy.Default }, - }) - .compileComponents(); + beforeEach(waitForAsync(() => { + mockCheckoutDeliveryService = new MockCheckoutDeliveryService(); + mockUserPaymentService = new MockUserPaymentService(); + mockGlobalMessageService = new MockGlobalMessageService(); + + TestBed.configureTestingModule({ + imports: [ + ReactiveFormsModule, + NgSelectModule, + NgSelectA11yModule, + I18nTestingModule, + FormErrorsModule, + ], + declarations: [CheckoutBillingAddressFormComponent, MockCardComponent], + providers: [ + { provide: LaunchDialogService, useClass: MockLaunchDialogService }, + { + provide: CheckoutDeliveryAddressFacade, + useValue: mockCheckoutDeliveryService, + }, + { provide: UserPaymentService, useValue: mockUserPaymentService }, + { provide: GlobalMessageService, useValue: mockGlobalMessageService }, + { provide: UserAddressService, useClass: MockUserAddressService }, + CheckoutBillingAddressFormService, + ], }) - ); + .overrideComponent(CheckoutBillingAddressFormComponent, { + set: { changeDetection: ChangeDetectionStrategy.Default }, + }) + .compileComponents(); + })); beforeEach(() => { userAddressService = TestBed.inject(UserAddressService); diff --git a/feature-libs/checkout/base/components/checkout-delivery-address/checkout-delivery-address.component.spec.ts b/feature-libs/checkout/base/components/checkout-delivery-address/checkout-delivery-address.component.spec.ts index 10420d3a67c..3e1cc7e7dfa 100644 --- a/feature-libs/checkout/base/components/checkout-delivery-address/checkout-delivery-address.component.spec.ts +++ b/feature-libs/checkout/base/components/checkout-delivery-address/checkout-delivery-address.component.spec.ts @@ -146,64 +146,62 @@ describe('CheckoutDeliveryAddressComponent', () => { let globalMessageService: GlobalMessageService; let featureConfig: FeatureConfigService; - beforeEach( - waitForAsync(() => { - TestBed.configureTestingModule({ - imports: [I18nTestingModule], - declarations: [ - CheckoutDeliveryAddressComponent, - MockAddressFormComponent, - MockCardComponent, - MockSpinnerComponent, - ], - providers: [ - { provide: UserAddressService, useClass: MockUserAddressService }, - { provide: ActiveCartFacade, useClass: MockActiveCartService }, - { - provide: CheckoutDeliveryAddressFacade, - useClass: MockCheckoutDeliveryAddressFacade, + beforeEach(waitForAsync(() => { + TestBed.configureTestingModule({ + imports: [I18nTestingModule], + declarations: [ + CheckoutDeliveryAddressComponent, + MockAddressFormComponent, + MockCardComponent, + MockSpinnerComponent, + ], + providers: [ + { provide: UserAddressService, useClass: MockUserAddressService }, + { provide: ActiveCartFacade, useClass: MockActiveCartService }, + { + provide: CheckoutDeliveryAddressFacade, + useClass: MockCheckoutDeliveryAddressFacade, + }, + { provide: CheckoutStepService, useClass: MockCheckoutStepService }, + { provide: ActivatedRoute, useValue: mockActivatedRoute }, + { provide: GlobalMessageService, useClass: MockGlobalMessageService }, + { + provide: CheckoutDeliveryModesFacade, + useClass: MockCheckoutDeliveryModesFacade, + }, + { + provide: FeaturesConfig, + useValue: { + features: { level: '6.3' }, }, - { provide: CheckoutStepService, useClass: MockCheckoutStepService }, - { provide: ActivatedRoute, useValue: mockActivatedRoute }, - { provide: GlobalMessageService, useClass: MockGlobalMessageService }, - { - provide: CheckoutDeliveryModesFacade, - useClass: MockCheckoutDeliveryModesFacade, - }, - { - provide: FeaturesConfig, - useValue: { - features: { level: '6.3' }, - }, - }, - { - provide: CheckoutFlowOrchestratorService, - useClass: MockCheckoutFlowOrchestratorService, - }, - { - provide: FeatureConfigService, - useClass: MockFeatureConfigService, - }, - ], + }, + { + provide: CheckoutFlowOrchestratorService, + useClass: MockCheckoutFlowOrchestratorService, + }, + { + provide: FeatureConfigService, + useClass: MockFeatureConfigService, + }, + ], + }) + .overrideComponent(CheckoutDeliveryAddressComponent, { + set: { changeDetection: ChangeDetectionStrategy.Default }, }) - .overrideComponent(CheckoutDeliveryAddressComponent, { - set: { changeDetection: ChangeDetectionStrategy.Default }, - }) - .compileComponents(); + .compileComponents(); - checkoutDeliveryAddressFacade = TestBed.inject( - CheckoutDeliveryAddressFacade - ); - activeCartFacade = TestBed.inject(ActiveCartFacade); - checkoutStepService = TestBed.inject( - CheckoutStepService as Type - ); - userAddressService = TestBed.inject(UserAddressService); - checkoutDeliveryModesFacade = TestBed.inject(CheckoutDeliveryModesFacade); - globalMessageService = TestBed.inject(GlobalMessageService); - featureConfig = TestBed.inject(FeatureConfigService); - }) - ); + checkoutDeliveryAddressFacade = TestBed.inject( + CheckoutDeliveryAddressFacade + ); + activeCartFacade = TestBed.inject(ActiveCartFacade); + checkoutStepService = TestBed.inject( + CheckoutStepService as Type + ); + userAddressService = TestBed.inject(UserAddressService); + checkoutDeliveryModesFacade = TestBed.inject(CheckoutDeliveryModesFacade); + globalMessageService = TestBed.inject(GlobalMessageService); + featureConfig = TestBed.inject(FeatureConfigService); + })); beforeEach(() => { fixture = TestBed.createComponent(CheckoutDeliveryAddressComponent); diff --git a/feature-libs/checkout/base/components/checkout-delivery-mode/checkout-delivery-mode.component.spec.ts b/feature-libs/checkout/base/components/checkout-delivery-mode/checkout-delivery-mode.component.spec.ts index 99df5f44fca..871e1de5806 100644 --- a/feature-libs/checkout/base/components/checkout-delivery-mode/checkout-delivery-mode.component.spec.ts +++ b/feature-libs/checkout/base/components/checkout-delivery-mode/checkout-delivery-mode.component.spec.ts @@ -128,36 +128,34 @@ describe('CheckoutDeliveryModeComponent', () => { let checkoutDeliveryModesFacade: CheckoutDeliveryModesFacade; let globalMessageService: GlobalMessageService; - beforeEach( - waitForAsync(() => { - TestBed.configureTestingModule({ - imports: [ReactiveFormsModule, I18nTestingModule, OutletModule], - declarations: [CheckoutDeliveryModeComponent, MockSpinnerComponent], - providers: [ - { - provide: CheckoutDeliveryModesFacade, - useClass: MockCheckoutDeliveryModeService, - }, - { provide: CheckoutStepService, useClass: MockCheckoutStepService }, - { - provide: CheckoutConfigService, - useClass: MockCheckoutConfigService, - }, - { provide: ActivatedRoute, useValue: mockActivatedRoute }, - { provide: ActiveCartFacade, useClass: MockCartService }, - { provide: GlobalMessageService, useClass: MockGlobalMessageService }, - { provide: FeatureConfigService, useClass: MockFeatureConfigService }, - ], - }).compileComponents(); - - checkoutConfigService = TestBed.inject(CheckoutConfigService); - checkoutDeliveryModesFacade = TestBed.inject(CheckoutDeliveryModesFacade); - globalMessageService = TestBed.inject(GlobalMessageService); - checkoutStepService = TestBed.inject( - CheckoutStepService as Type - ); - }) - ); + beforeEach(waitForAsync(() => { + TestBed.configureTestingModule({ + imports: [ReactiveFormsModule, I18nTestingModule, OutletModule], + declarations: [CheckoutDeliveryModeComponent, MockSpinnerComponent], + providers: [ + { + provide: CheckoutDeliveryModesFacade, + useClass: MockCheckoutDeliveryModeService, + }, + { provide: CheckoutStepService, useClass: MockCheckoutStepService }, + { + provide: CheckoutConfigService, + useClass: MockCheckoutConfigService, + }, + { provide: ActivatedRoute, useValue: mockActivatedRoute }, + { provide: ActiveCartFacade, useClass: MockCartService }, + { provide: GlobalMessageService, useClass: MockGlobalMessageService }, + { provide: FeatureConfigService, useClass: MockFeatureConfigService }, + ], + }).compileComponents(); + + checkoutConfigService = TestBed.inject(CheckoutConfigService); + checkoutDeliveryModesFacade = TestBed.inject(CheckoutDeliveryModesFacade); + globalMessageService = TestBed.inject(GlobalMessageService); + checkoutStepService = TestBed.inject( + CheckoutStepService as Type + ); + })); beforeEach(() => { fixture = TestBed.createComponent(CheckoutDeliveryModeComponent); diff --git a/feature-libs/checkout/base/components/checkout-login/checkout-login.component.spec.ts b/feature-libs/checkout/base/components/checkout-login/checkout-login.component.spec.ts index ddb087d5e82..00bd4685493 100644 --- a/feature-libs/checkout/base/components/checkout-login/checkout-login.component.spec.ts +++ b/feature-libs/checkout/base/components/checkout-login/checkout-login.component.spec.ts @@ -28,21 +28,19 @@ describe('CheckoutLoginComponent', () => { let email: AbstractControl; let emailConfirmation: AbstractControl; - beforeEach( - waitForAsync(() => { - TestBed.configureTestingModule({ - imports: [ReactiveFormsModule, I18nTestingModule, FormErrorsModule], - declarations: [CheckoutLoginComponent, MockFeatureDirective], - providers: [ - { provide: ActiveCartFacade, useClass: MockActiveCartService }, - { - provide: AuthRedirectService, - useClass: MockRedirectAfterAuthService, - }, - ], - }).compileComponents(); - }) - ); + beforeEach(waitForAsync(() => { + TestBed.configureTestingModule({ + imports: [ReactiveFormsModule, I18nTestingModule, FormErrorsModule], + declarations: [CheckoutLoginComponent, MockFeatureDirective], + providers: [ + { provide: ActiveCartFacade, useClass: MockActiveCartService }, + { + provide: AuthRedirectService, + useClass: MockRedirectAfterAuthService, + }, + ], + }).compileComponents(); + })); beforeEach(() => { fixture = TestBed.createComponent(CheckoutLoginComponent); diff --git a/feature-libs/checkout/base/components/checkout-orchestrator/checkout-orchestrator.component.spec.ts b/feature-libs/checkout/base/components/checkout-orchestrator/checkout-orchestrator.component.spec.ts index b4451c950e7..aab19f1dd8c 100644 --- a/feature-libs/checkout/base/components/checkout-orchestrator/checkout-orchestrator.component.spec.ts +++ b/feature-libs/checkout/base/components/checkout-orchestrator/checkout-orchestrator.component.spec.ts @@ -5,13 +5,11 @@ describe('MultiStepCheckoutOrchestratorComponent', () => { let component: CheckoutOrchestratorComponent; let fixture: ComponentFixture; - beforeEach( - waitForAsync(() => { - TestBed.configureTestingModule({ - declarations: [CheckoutOrchestratorComponent], - }).compileComponents(); - }) - ); + beforeEach(waitForAsync(() => { + TestBed.configureTestingModule({ + declarations: [CheckoutOrchestratorComponent], + }).compileComponents(); + })); beforeEach(() => { fixture = TestBed.createComponent(CheckoutOrchestratorComponent); diff --git a/feature-libs/checkout/base/components/checkout-order-summary/checkout-order-summary.component.spec.ts b/feature-libs/checkout/base/components/checkout-order-summary/checkout-order-summary.component.spec.ts index f80dc740809..34411378be1 100644 --- a/feature-libs/checkout/base/components/checkout-order-summary/checkout-order-summary.component.spec.ts +++ b/feature-libs/checkout/base/components/checkout-order-summary/checkout-order-summary.component.spec.ts @@ -24,23 +24,21 @@ describe('CheckoutOrderSummaryComponent', () => { let component: CheckoutOrderSummaryComponent; let fixture: ComponentFixture; - beforeEach( - waitForAsync(() => { - TestBed.configureTestingModule({ - imports: [I18nTestingModule], - declarations: [ - CheckoutOrderSummaryComponent, - OrderSummaryComponent, - PromotionsComponent, - AppliedCouponsComponent, - MockFeatureLevelDirective, - ], - providers: [ - { provide: ActiveCartFacade, useClass: MockActiveCartService }, - ], - }).compileComponents(); - }) - ); + beforeEach(waitForAsync(() => { + TestBed.configureTestingModule({ + imports: [I18nTestingModule], + declarations: [ + CheckoutOrderSummaryComponent, + OrderSummaryComponent, + PromotionsComponent, + AppliedCouponsComponent, + MockFeatureLevelDirective, + ], + providers: [ + { provide: ActiveCartFacade, useClass: MockActiveCartService }, + ], + }).compileComponents(); + })); beforeEach(() => { fixture = TestBed.createComponent(CheckoutOrderSummaryComponent); diff --git a/feature-libs/checkout/base/components/checkout-payment-method/checkout-payment-form/checkout-payment-form.component.spec.ts b/feature-libs/checkout/base/components/checkout-payment-method/checkout-payment-form/checkout-payment-form.component.spec.ts index 663ce843a55..272129dce93 100644 --- a/feature-libs/checkout/base/components/checkout-payment-method/checkout-payment-form/checkout-payment-form.component.spec.ts +++ b/feature-libs/checkout/base/components/checkout-payment-method/checkout-payment-form/checkout-payment-form.component.spec.ts @@ -192,55 +192,53 @@ describe('CheckoutPaymentFormComponent', () => { billingAddress: UntypedFormGroup['controls']; }; - beforeEach( - waitForAsync(() => { - mockCheckoutDeliveryService = new MockCheckoutDeliveryService(); - mockCheckoutPaymentService = new MockCheckoutPaymentService(); - mockUserPaymentService = new MockUserPaymentService(); - mockGlobalMessageService = new MockGlobalMessageService(); - - TestBed.configureTestingModule({ - imports: [ - ReactiveFormsModule, - NgSelectModule, - NgSelectA11yModule, - I18nTestingModule, - FormErrorsModule, - ], - declarations: [ - CheckoutPaymentFormComponent, - MockCardComponent, - MockBillingAddressFormComponent, - MockCxIconComponent, - MockSpinnerComponent, - MockFeatureDirective, - ], - providers: [ - { provide: LaunchDialogService, useClass: MockLaunchDialogService }, - { - provide: CheckoutPaymentFacade, - useValue: mockCheckoutPaymentService, - }, - { - provide: CheckoutDeliveryAddressFacade, - useValue: mockCheckoutDeliveryService, - }, - { provide: UserPaymentService, useValue: mockUserPaymentService }, - { provide: GlobalMessageService, useValue: mockGlobalMessageService }, - { provide: UserAddressService, useClass: MockUserAddressService }, - { - provide: CheckoutBillingAddressFormService, - useClass: MockCheckoutBillingAddressFormService, - }, - { provide: FeatureConfigService, useClass: MockFeatureConfigService }, - ], - }) - .overrideComponent(CheckoutPaymentFormComponent, { - set: { changeDetection: ChangeDetectionStrategy.Default }, - }) - .compileComponents(); + beforeEach(waitForAsync(() => { + mockCheckoutDeliveryService = new MockCheckoutDeliveryService(); + mockCheckoutPaymentService = new MockCheckoutPaymentService(); + mockUserPaymentService = new MockUserPaymentService(); + mockGlobalMessageService = new MockGlobalMessageService(); + + TestBed.configureTestingModule({ + imports: [ + ReactiveFormsModule, + NgSelectModule, + NgSelectA11yModule, + I18nTestingModule, + FormErrorsModule, + ], + declarations: [ + CheckoutPaymentFormComponent, + MockCardComponent, + MockBillingAddressFormComponent, + MockCxIconComponent, + MockSpinnerComponent, + MockFeatureDirective, + ], + providers: [ + { provide: LaunchDialogService, useClass: MockLaunchDialogService }, + { + provide: CheckoutPaymentFacade, + useValue: mockCheckoutPaymentService, + }, + { + provide: CheckoutDeliveryAddressFacade, + useValue: mockCheckoutDeliveryService, + }, + { provide: UserPaymentService, useValue: mockUserPaymentService }, + { provide: GlobalMessageService, useValue: mockGlobalMessageService }, + { provide: UserAddressService, useClass: MockUserAddressService }, + { + provide: CheckoutBillingAddressFormService, + useClass: MockCheckoutBillingAddressFormService, + }, + { provide: FeatureConfigService, useClass: MockFeatureConfigService }, + ], }) - ); + .overrideComponent(CheckoutPaymentFormComponent, { + set: { changeDetection: ChangeDetectionStrategy.Default }, + }) + .compileComponents(); + })); beforeEach(() => { fixture = TestBed.createComponent(CheckoutPaymentFormComponent); diff --git a/feature-libs/checkout/base/components/checkout-payment-method/checkout-payment-method.component.spec.ts b/feature-libs/checkout/base/components/checkout-payment-method/checkout-payment-method.component.spec.ts index bcfaf516a4c..098302e7439 100644 --- a/feature-libs/checkout/base/components/checkout-payment-method/checkout-payment-method.component.spec.ts +++ b/feature-libs/checkout/base/components/checkout-payment-method/checkout-payment-method.component.spec.ts @@ -179,57 +179,55 @@ describe('CheckoutPaymentMethodComponent', () => { let globalMessageService: GlobalMessageService; let featureConfig: FeatureConfigService; - beforeEach( - waitForAsync(() => { - TestBed.configureTestingModule({ - imports: [I18nTestingModule], - declarations: [ - CheckoutPaymentMethodComponent, - MockPaymentFormComponent, - CardComponent, - MockSpinnerComponent, - MockCxIconComponent, - ], - providers: [ - { provide: UserPaymentService, useClass: MockUserPaymentService }, - { - provide: CheckoutDeliveryAddressFacade, - useClass: MockCheckoutDeliveryFacade, - }, - { - provide: ActiveCartFacade, - useClass: MockActiveCartService, - }, - { - provide: CheckoutPaymentFacade, - useClass: MockCheckoutPaymentService, - }, - { provide: CheckoutStepService, useClass: MockCheckoutStepService }, - { provide: ActivatedRoute, useValue: mockActivatedRoute }, - { provide: GlobalMessageService, useClass: MockGlobalMessageService }, - { - provide: FeaturesConfig, - useValue: { - features: { level: '6.3' }, - }, - }, - { - provide: FeatureConfigService, - useClass: MockFeatureConfigService, + beforeEach(waitForAsync(() => { + TestBed.configureTestingModule({ + imports: [I18nTestingModule], + declarations: [ + CheckoutPaymentMethodComponent, + MockPaymentFormComponent, + CardComponent, + MockSpinnerComponent, + MockCxIconComponent, + ], + providers: [ + { provide: UserPaymentService, useClass: MockUserPaymentService }, + { + provide: CheckoutDeliveryAddressFacade, + useClass: MockCheckoutDeliveryFacade, + }, + { + provide: ActiveCartFacade, + useClass: MockActiveCartService, + }, + { + provide: CheckoutPaymentFacade, + useClass: MockCheckoutPaymentService, + }, + { provide: CheckoutStepService, useClass: MockCheckoutStepService }, + { provide: ActivatedRoute, useValue: mockActivatedRoute }, + { provide: GlobalMessageService, useClass: MockGlobalMessageService }, + { + provide: FeaturesConfig, + useValue: { + features: { level: '6.3' }, }, - ], - }).compileComponents(); - - mockUserPaymentService = TestBed.inject(UserPaymentService); - mockCheckoutPaymentService = TestBed.inject(CheckoutPaymentFacade); - mockActiveCartService = TestBed.inject(ActiveCartFacade); - checkoutStepService = TestBed.inject( - CheckoutStepService as Type - ); - globalMessageService = TestBed.inject(GlobalMessageService); - featureConfig = TestBed.inject(FeatureConfigService); - }) - ); + }, + { + provide: FeatureConfigService, + useClass: MockFeatureConfigService, + }, + ], + }).compileComponents(); + + mockUserPaymentService = TestBed.inject(UserPaymentService); + mockCheckoutPaymentService = TestBed.inject(CheckoutPaymentFacade); + mockActiveCartService = TestBed.inject(ActiveCartFacade); + checkoutStepService = TestBed.inject( + CheckoutStepService as Type + ); + globalMessageService = TestBed.inject(GlobalMessageService); + featureConfig = TestBed.inject(FeatureConfigService); + })); beforeEach(() => { fixture = TestBed.createComponent(CheckoutPaymentMethodComponent); diff --git a/feature-libs/checkout/base/components/checkout-place-order/checkout-place-order.component.spec.ts b/feature-libs/checkout/base/components/checkout-place-order/checkout-place-order.component.spec.ts index 7a333cdc55a..28c97833690 100644 --- a/feature-libs/checkout/base/components/checkout-place-order/checkout-place-order.component.spec.ts +++ b/feature-libs/checkout/base/components/checkout-place-order/checkout-place-order.component.spec.ts @@ -47,25 +47,23 @@ describe('CheckoutPlaceOrderComponent', () => { let routingService: RoutingService; let launchDialogService: LaunchDialogService; - beforeEach( - waitForAsync(() => { - TestBed.configureTestingModule({ - imports: [ - ReactiveFormsModule, - RouterTestingModule, - I18nTestingModule, - AtMessageModule, - ], - declarations: [MockUrlPipe, CheckoutPlaceOrderComponent], - providers: [ - { provide: OrderFacade, useClass: MockOrderFacade }, - { provide: RoutingService, useClass: MockRoutingService }, - { provide: LaunchDialogService, useClass: MockLaunchDialogService }, - { provide: GlobalMessageService, useValue: {} }, - ], - }).compileComponents(); - }) - ); + beforeEach(waitForAsync(() => { + TestBed.configureTestingModule({ + imports: [ + ReactiveFormsModule, + RouterTestingModule, + I18nTestingModule, + AtMessageModule, + ], + declarations: [MockUrlPipe, CheckoutPlaceOrderComponent], + providers: [ + { provide: OrderFacade, useClass: MockOrderFacade }, + { provide: RoutingService, useClass: MockRoutingService }, + { provide: LaunchDialogService, useClass: MockLaunchDialogService }, + { provide: GlobalMessageService, useValue: {} }, + ], + }).compileComponents(); + })); beforeEach(() => { fixture = TestBed.createComponent(CheckoutPlaceOrderComponent); diff --git a/feature-libs/checkout/base/components/checkout-progress/checkout-progress-mobile-bottom/checkout-progress-mobile-bottom.component.spec.ts b/feature-libs/checkout/base/components/checkout-progress/checkout-progress-mobile-bottom/checkout-progress-mobile-bottom.component.spec.ts index 63d91a9a4dd..71410d81036 100644 --- a/feature-libs/checkout/base/components/checkout-progress/checkout-progress-mobile-bottom/checkout-progress-mobile-bottom.component.spec.ts +++ b/feature-libs/checkout/base/components/checkout-progress/checkout-progress-mobile-bottom/checkout-progress-mobile-bottom.component.spec.ts @@ -47,20 +47,18 @@ describe('CheckoutProgressMobileBottomComponent', () => { let component: CheckoutProgressMobileBottomComponent; let fixture: ComponentFixture; - beforeEach( - waitForAsync(() => { - TestBed.configureTestingModule({ - imports: [RouterTestingModule, I18nTestingModule], - declarations: [ - CheckoutProgressMobileBottomComponent, - MockTranslateUrlPipe, - ], - providers: [ - { provide: CheckoutStepService, useClass: MockCheckoutStepService }, - ], - }).compileComponents(); - }) - ); + beforeEach(waitForAsync(() => { + TestBed.configureTestingModule({ + imports: [RouterTestingModule, I18nTestingModule], + declarations: [ + CheckoutProgressMobileBottomComponent, + MockTranslateUrlPipe, + ], + providers: [ + { provide: CheckoutStepService, useClass: MockCheckoutStepService }, + ], + }).compileComponents(); + })); beforeEach(() => { fixture = TestBed.createComponent(CheckoutProgressMobileBottomComponent); diff --git a/feature-libs/checkout/base/components/checkout-progress/checkout-progress-mobile-top/checkout-progress-mobile-top.component.spec.ts b/feature-libs/checkout/base/components/checkout-progress/checkout-progress-mobile-top/checkout-progress-mobile-top.component.spec.ts index be9b2761c12..5d71fcdfe38 100644 --- a/feature-libs/checkout/base/components/checkout-progress/checkout-progress-mobile-top/checkout-progress-mobile-top.component.spec.ts +++ b/feature-libs/checkout/base/components/checkout-progress/checkout-progress-mobile-top/checkout-progress-mobile-top.component.spec.ts @@ -60,21 +60,16 @@ describe('CheckoutProgressMobileTopComponent', () => { let component: CheckoutProgressMobileTopComponent; let fixture: ComponentFixture; - beforeEach( - waitForAsync(() => { - TestBed.configureTestingModule({ - imports: [RouterTestingModule, I18nTestingModule], - declarations: [ - CheckoutProgressMobileTopComponent, - MockTranslateUrlPipe, - ], - providers: [ - { provide: CheckoutStepService, useClass: MockCheckoutStepService }, - { provide: ActiveCartFacade, useClass: MockActiveCartService }, - ], - }).compileComponents(); - }) - ); + beforeEach(waitForAsync(() => { + TestBed.configureTestingModule({ + imports: [RouterTestingModule, I18nTestingModule], + declarations: [CheckoutProgressMobileTopComponent, MockTranslateUrlPipe], + providers: [ + { provide: CheckoutStepService, useClass: MockCheckoutStepService }, + { provide: ActiveCartFacade, useClass: MockActiveCartService }, + ], + }).compileComponents(); + })); beforeEach(() => { fixture = TestBed.createComponent(CheckoutProgressMobileTopComponent); diff --git a/feature-libs/checkout/base/components/checkout-progress/checkout-progress.component.spec.ts b/feature-libs/checkout/base/components/checkout-progress/checkout-progress.component.spec.ts index e9bdfe3f0c4..8601e37979a 100644 --- a/feature-libs/checkout/base/components/checkout-progress/checkout-progress.component.spec.ts +++ b/feature-libs/checkout/base/components/checkout-progress/checkout-progress.component.spec.ts @@ -56,21 +56,19 @@ describe('CheckoutProgressComponent', () => { let component: CheckoutProgressComponent; let fixture: ComponentFixture; - beforeEach( - waitForAsync(() => { - TestBed.configureTestingModule({ - imports: [RouterTestingModule, I18nTestingModule], - declarations: [ - CheckoutProgressComponent, - MockTranslateUrlPipe, - MockMultiLinePipe, - ], - providers: [ - { provide: CheckoutStepService, useClass: MockCheckoutStepService }, - ], - }).compileComponents(); - }) - ); + beforeEach(waitForAsync(() => { + TestBed.configureTestingModule({ + imports: [RouterTestingModule, I18nTestingModule], + declarations: [ + CheckoutProgressComponent, + MockTranslateUrlPipe, + MockMultiLinePipe, + ], + providers: [ + { provide: CheckoutStepService, useClass: MockCheckoutStepService }, + ], + }).compileComponents(); + })); beforeEach(() => { fixture = TestBed.createComponent(CheckoutProgressComponent); diff --git a/feature-libs/checkout/base/components/checkout-review-submit/checkout-review-submit.component.spec.ts b/feature-libs/checkout/base/components/checkout-review-submit/checkout-review-submit.component.spec.ts index a3675c20346..933dcd4b11d 100644 --- a/feature-libs/checkout/base/components/checkout-review-submit/checkout-review-submit.component.spec.ts +++ b/feature-libs/checkout/base/components/checkout-review-submit/checkout-review-submit.component.spec.ts @@ -145,43 +145,41 @@ describe('CheckoutReviewSubmitComponent', () => { let component: CheckoutReviewSubmitComponent; let fixture: ComponentFixture; - beforeEach( - waitForAsync(() => { - TestBed.configureTestingModule({ - imports: [ - I18nTestingModule, - PromotionsModule, - RouterTestingModule, - IconTestingModule, - OutletModule, - ], - declarations: [ - CheckoutReviewSubmitComponent, - MockCardComponent, - MockUrlPipe, - ], - providers: [ - { - provide: CheckoutDeliveryAddressFacade, - useClass: MockCheckoutDeliveryAddressService, - }, - { - provide: CheckoutDeliveryModesFacade, - useClass: MockCheckoutDeliveryModesService, - }, - { - provide: CheckoutPaymentFacade, - useClass: MockCheckoutPaymentService, - }, - { provide: ActiveCartFacade, useClass: MockActiveCartService }, - { - provide: CheckoutStepService, - useClass: MockCheckoutStepService, - }, - ], - }).compileComponents(); - }) - ); + beforeEach(waitForAsync(() => { + TestBed.configureTestingModule({ + imports: [ + I18nTestingModule, + PromotionsModule, + RouterTestingModule, + IconTestingModule, + OutletModule, + ], + declarations: [ + CheckoutReviewSubmitComponent, + MockCardComponent, + MockUrlPipe, + ], + providers: [ + { + provide: CheckoutDeliveryAddressFacade, + useClass: MockCheckoutDeliveryAddressService, + }, + { + provide: CheckoutDeliveryModesFacade, + useClass: MockCheckoutDeliveryModesService, + }, + { + provide: CheckoutPaymentFacade, + useClass: MockCheckoutPaymentService, + }, + { provide: ActiveCartFacade, useClass: MockActiveCartService }, + { + provide: CheckoutStepService, + useClass: MockCheckoutStepService, + }, + ], + }).compileComponents(); + })); beforeEach(() => { fixture = TestBed.createComponent(CheckoutReviewSubmitComponent); diff --git a/feature-libs/checkout/base/occ/adapters/occ-checkout-payment.adapter.ts b/feature-libs/checkout/base/occ/adapters/occ-checkout-payment.adapter.ts index b4ebfd366a9..2c097ce76fe 100644 --- a/feature-libs/checkout/base/occ/adapters/occ-checkout-payment.adapter.ts +++ b/feature-libs/checkout/base/occ/adapters/occ-checkout-payment.adapter.ts @@ -319,7 +319,6 @@ export class OccCheckoutPaymentAdapter implements CheckoutPaymentAdapter { const key = item.key; result[key] = item.value; return result; - }, - {}); + }, {}); } } diff --git a/feature-libs/checkout/package.json b/feature-libs/checkout/package.json index cf5f70c5bcc..daa023959e6 100644 --- a/feature-libs/checkout/package.json +++ b/feature-libs/checkout/package.json @@ -1,6 +1,6 @@ { "name": "@spartacus/checkout", - "version": "2211.24.1", + "version": "2211.25.0-3", "description": "Checkout feature library for Spartacus", "keywords": [ "spartacus", @@ -32,13 +32,13 @@ "@angular/router": "^17.0.5", "@ng-select/ng-select": "^12.0.4", "@ngrx/store": "^17.0.1", - "@spartacus/cart": "2211.24.1", - "@spartacus/core": "2211.24.1", - "@spartacus/order": "2211.24.1", - "@spartacus/schematics": "2211.24.1", - "@spartacus/storefront": "2211.24.1", - "@spartacus/styles": "2211.24.1", - "@spartacus/user": "2211.24.1", + "@spartacus/cart": "2211.25.0-3", + "@spartacus/core": "2211.25.0-3", + "@spartacus/order": "2211.25.0-3", + "@spartacus/schematics": "2211.25.0-3", + "@spartacus/storefront": "2211.25.0-3", + "@spartacus/styles": "2211.25.0-3", + "@spartacus/user": "2211.25.0-3", "bootstrap": "^4.6.2", "rxjs": "^7.8.0" }, diff --git a/feature-libs/checkout/scheduled-replenishment/components/checkout-place-order/checkout-place-order.component.spec.ts b/feature-libs/checkout/scheduled-replenishment/components/checkout-place-order/checkout-place-order.component.spec.ts index 8d5ba5f6d19..109df779470 100644 --- a/feature-libs/checkout/scheduled-replenishment/components/checkout-place-order/checkout-place-order.component.spec.ts +++ b/feature-libs/checkout/scheduled-replenishment/components/checkout-place-order/checkout-place-order.component.spec.ts @@ -90,39 +90,37 @@ describe('CheckoutScheduledReplenishmentPlaceOrderComponent', () => { let launchDialogService: LaunchDialogService; let scheduledReplenishmentOrderFacade: ScheduledReplenishmentOrderFacade; - beforeEach( - waitForAsync(() => { - TestBed.configureTestingModule({ - imports: [ - ReactiveFormsModule, - RouterTestingModule, - I18nTestingModule, - AtMessageModule, - ], - declarations: [ - MockUrlPipe, - CheckoutScheduledReplenishmentPlaceOrderComponent, - ], - providers: [ - { provide: OrderFacade, useClass: MockOrderFacade }, - { - provide: CheckoutReplenishmentFormService, - useClass: MockCheckoutReplenishmentFormService, - }, - { provide: RoutingService, useClass: MockRoutingService }, - { provide: LaunchDialogService, useClass: MockLaunchDialogService }, - { - provide: ScheduledReplenishmentOrderFacade, - useClass: MockScheduledReplenishmentOrderFacade, - }, - { - provide: GlobalMessageService, - useValue: {}, - }, - ], - }).compileComponents(); - }) - ); + beforeEach(waitForAsync(() => { + TestBed.configureTestingModule({ + imports: [ + ReactiveFormsModule, + RouterTestingModule, + I18nTestingModule, + AtMessageModule, + ], + declarations: [ + MockUrlPipe, + CheckoutScheduledReplenishmentPlaceOrderComponent, + ], + providers: [ + { provide: OrderFacade, useClass: MockOrderFacade }, + { + provide: CheckoutReplenishmentFormService, + useClass: MockCheckoutReplenishmentFormService, + }, + { provide: RoutingService, useClass: MockRoutingService }, + { provide: LaunchDialogService, useClass: MockLaunchDialogService }, + { + provide: ScheduledReplenishmentOrderFacade, + useClass: MockScheduledReplenishmentOrderFacade, + }, + { + provide: GlobalMessageService, + useValue: {}, + }, + ], + }).compileComponents(); + })); beforeEach(() => { fixture = TestBed.createComponent( diff --git a/feature-libs/checkout/scheduled-replenishment/components/checkout-schedule-replenishment-order/checkout-schedule-replenishment-order.component.spec.ts b/feature-libs/checkout/scheduled-replenishment/components/checkout-schedule-replenishment-order/checkout-schedule-replenishment-order.component.spec.ts index 7e09a3b98d1..17dbe1c93a9 100644 --- a/feature-libs/checkout/scheduled-replenishment/components/checkout-schedule-replenishment-order/checkout-schedule-replenishment-order.component.spec.ts +++ b/feature-libs/checkout/scheduled-replenishment/components/checkout-schedule-replenishment-order/checkout-schedule-replenishment-order.component.spec.ts @@ -37,20 +37,18 @@ describe('CheckoutScheduleReplenishmentOrderComponent', () => { let checkoutReplenishmentFormService: CheckoutReplenishmentFormService; - beforeEach( - waitForAsync(() => { - TestBed.configureTestingModule({ - imports: [RouterTestingModule, I18nTestingModule, IconTestingModule], - declarations: [CheckoutScheduleReplenishmentOrderComponent], - providers: [ - { - provide: CheckoutReplenishmentFormService, - useClass: MockCheckoutReplenishmentFormService, - }, - ], - }).compileComponents(); - }) - ); + beforeEach(waitForAsync(() => { + TestBed.configureTestingModule({ + imports: [RouterTestingModule, I18nTestingModule, IconTestingModule], + declarations: [CheckoutScheduleReplenishmentOrderComponent], + providers: [ + { + provide: CheckoutReplenishmentFormService, + useClass: MockCheckoutReplenishmentFormService, + }, + ], + }).compileComponents(); + })); beforeEach(() => { fixture = TestBed.createComponent( diff --git a/feature-libs/checkout/scheduled-replenishment/components/services/checkout-replenishment-form.service.spec.ts b/feature-libs/checkout/scheduled-replenishment/components/services/checkout-replenishment-form.service.spec.ts index 10845fb3803..6049dea36eb 100644 --- a/feature-libs/checkout/scheduled-replenishment/components/services/checkout-replenishment-form.service.spec.ts +++ b/feature-libs/checkout/scheduled-replenishment/components/services/checkout-replenishment-form.service.spec.ts @@ -11,13 +11,11 @@ const newReplenishmentFormData: ScheduleReplenishmentForm = { describe('Checkout Replenishment Form Service', () => { let service: CheckoutReplenishmentFormService; - beforeEach( - waitForAsync(() => { - TestBed.configureTestingModule({ - providers: [CheckoutReplenishmentFormService], - }); - }) - ); + beforeEach(waitForAsync(() => { + TestBed.configureTestingModule({ + providers: [CheckoutReplenishmentFormService], + }); + })); beforeEach(() => { service = TestBed.inject(CheckoutReplenishmentFormService); diff --git a/feature-libs/checkout/schematics/add-checkout/__snapshots__/index_spec.ts.snap b/feature-libs/checkout/schematics/add-checkout/__snapshots__/index_spec.ts.snap index 57de34f62f4..147c42f5e8e 100644 --- a/feature-libs/checkout/schematics/add-checkout/__snapshots__/index_spec.ts.snap +++ b/feature-libs/checkout/schematics/add-checkout/__snapshots__/index_spec.ts.snap @@ -63,7 +63,7 @@ import { defaultCmsContentProviders, layoutConfig, mediaConfig } from "@spartacu }, }), provideConfig({ features: { - level: '2211.24' + level: '2211.25' } }), provideConfig(defaultB2bOccConfig)] }) @@ -514,7 +514,7 @@ import { defaultCmsContentProviders, layoutConfig, mediaConfig } from "@spartacu }, }), provideConfig({ features: { - level: '2211.24' + level: '2211.25' } }), provideConfig(defaultB2bOccConfig)] }) diff --git a/feature-libs/customer-ticketing/components/list/customer-ticketing-list/customer-ticketing-list.component.spec.ts b/feature-libs/customer-ticketing/components/list/customer-ticketing-list/customer-ticketing-list.component.spec.ts index c164000e4bd..c4392d81851 100644 --- a/feature-libs/customer-ticketing/components/list/customer-ticketing-list/customer-ticketing-list.component.spec.ts +++ b/feature-libs/customer-ticketing/components/list/customer-ticketing-list/customer-ticketing-list.component.spec.ts @@ -206,47 +206,45 @@ describe('CustomerTicketingListComponent', () => { let routingService: RoutingService; let customerTicketingFacade: CustomerTicketingFacade; - beforeEach( - waitForAsync(() => { - TestBed.configureTestingModule({ - imports: [RouterTestingModule, I18nTestingModule], - declarations: [ - CustomerTicketingListComponent, - MockPaginationComponent, - MockSortingComponent, - MockUrlPipe, - MockCustomerTicketingCreateComponent, - ], - providers: [ - { - provide: CustomerTicketingFacade, - useClass: MockCustomerTicketingFacade, - }, - { provide: RoutingService, useClass: MockRoutingService }, - { provide: TranslationService, useClass: MockTranslationService }, - ], - }).compileComponents(); + beforeEach(waitForAsync(() => { + TestBed.configureTestingModule({ + imports: [RouterTestingModule, I18nTestingModule], + declarations: [ + CustomerTicketingListComponent, + MockPaginationComponent, + MockSortingComponent, + MockUrlPipe, + MockCustomerTicketingCreateComponent, + ], + providers: [ + { + provide: CustomerTicketingFacade, + useClass: MockCustomerTicketingFacade, + }, + { provide: RoutingService, useClass: MockRoutingService }, + { provide: TranslationService, useClass: MockTranslationService }, + ], + }).compileComponents(); - const translationService = TestBed.inject(TranslationService); - spyOn(translationService, 'translate').and.callFake((input) => { - switch (input) { - case 'customerTicketing.ticketId': - return of('ticket-id'); - case 'customerTicketing.changedOn': - return of(new Date(0).toISOString()); - default: - return EMPTY; - } - }); + const translationService = TestBed.inject(TranslationService); + spyOn(translationService, 'translate').and.callFake((input) => { + switch (input) { + case 'customerTicketing.ticketId': + return of('ticket-id'); + case 'customerTicketing.changedOn': + return of(new Date(0).toISOString()); + default: + return EMPTY; + } + }); - customerTicketingFacade = TestBed.inject(CustomerTicketingFacade); + customerTicketingFacade = TestBed.inject(CustomerTicketingFacade); - fixture = TestBed.createComponent(CustomerTicketingListComponent); - component = fixture.componentInstance; - routingService = TestBed.inject(RoutingService); - fixture.detectChanges(); - }) - ); + fixture = TestBed.createComponent(CustomerTicketingListComponent); + component = fixture.componentInstance; + routingService = TestBed.inject(RoutingService); + fixture.detectChanges(); + })); it('should be created', () => { expect(component).toBeTruthy(); diff --git a/feature-libs/customer-ticketing/components/my-account-v2/my-account-v2-customer-ticketing.component.spec.ts b/feature-libs/customer-ticketing/components/my-account-v2/my-account-v2-customer-ticketing.component.spec.ts index 17d6b181743..e75ab1e18ba 100644 --- a/feature-libs/customer-ticketing/components/my-account-v2/my-account-v2-customer-ticketing.component.spec.ts +++ b/feature-libs/customer-ticketing/components/my-account-v2/my-account-v2-customer-ticketing.component.spec.ts @@ -67,31 +67,29 @@ describe('MyAccountV2CustomerTicketingComponent', () => { let component: MyAccountV2CustomerTicketingComponent; let fixture: ComponentFixture; - beforeEach( - waitForAsync(() => { - TestBed.configureTestingModule({ - imports: [RouterTestingModule, I18nTestingModule], - declarations: [ - MyAccountV2CustomerTicketingComponent, - MockTranslatePipe, - MockUrlPipe, - ], - providers: [ - { - provide: 'CustomerTicketingFacade', - useClass: MockcustomerTicketingFacade, - }, - { provide: RoutingService, useClass: MockRoutingService }, - { provide: TranslationService, useClass: MockTranslationService }, - ], - }).compileComponents(); + beforeEach(waitForAsync(() => { + TestBed.configureTestingModule({ + imports: [RouterTestingModule, I18nTestingModule], + declarations: [ + MyAccountV2CustomerTicketingComponent, + MockTranslatePipe, + MockUrlPipe, + ], + providers: [ + { + provide: 'CustomerTicketingFacade', + useClass: MockcustomerTicketingFacade, + }, + { provide: RoutingService, useClass: MockRoutingService }, + { provide: TranslationService, useClass: MockTranslationService }, + ], + }).compileComponents(); - fixture = TestBed.createComponent(MyAccountV2CustomerTicketingComponent); - component = fixture.componentInstance; - component.tickets$ = of(mockTicketList); - fixture.detectChanges(); - }) - ); + fixture = TestBed.createComponent(MyAccountV2CustomerTicketingComponent); + component = fixture.componentInstance; + component.tickets$ = of(mockTicketList); + fixture.detectChanges(); + })); it('should be created', () => { expect(component).toBeTruthy(); diff --git a/feature-libs/customer-ticketing/package.json b/feature-libs/customer-ticketing/package.json index e1e02c772a0..b7ffc4c77e2 100644 --- a/feature-libs/customer-ticketing/package.json +++ b/feature-libs/customer-ticketing/package.json @@ -1,6 +1,6 @@ { "name": "@spartacus/customer-ticketing", - "version": "2211.24.1", + "version": "2211.25.0-3", "description": "Customer-Ticketing library for Spartacus", "keywords": [ "spartacus", @@ -30,11 +30,11 @@ "@angular/core": "^17.0.5", "@angular/forms": "^17.0.5", "@angular/router": "^17.0.5", - "@spartacus/cart": "2211.24.1", - "@spartacus/core": "2211.24.1", - "@spartacus/schematics": "2211.24.1", - "@spartacus/storefront": "2211.24.1", - "@spartacus/styles": "2211.24.1", + "@spartacus/cart": "2211.25.0-3", + "@spartacus/core": "2211.25.0-3", + "@spartacus/schematics": "2211.25.0-3", + "@spartacus/storefront": "2211.25.0-3", + "@spartacus/styles": "2211.25.0-3", "rxjs": "^7.8.0" }, "publishConfig": { diff --git a/feature-libs/estimated-delivery-date/package.json b/feature-libs/estimated-delivery-date/package.json index 665bc3ac290..5f06026f09b 100644 --- a/feature-libs/estimated-delivery-date/package.json +++ b/feature-libs/estimated-delivery-date/package.json @@ -1,6 +1,6 @@ { "name": "@spartacus/estimated-delivery-date", - "version": "2211.24.1", + "version": "2211.25.0-3", "description": "Estimated Delivery Date library for Spartacus", "keywords": [ "spartacus", @@ -28,12 +28,12 @@ "@angular-devkit/schematics": "^17.0.5", "@angular/common": "^17.0.5", "@angular/core": "^17.0.5", - "@spartacus/cart": "2211.24.1", - "@spartacus/core": "2211.24.1", - "@spartacus/order": "2211.24.1", - "@spartacus/schematics": "2211.24.1", - "@spartacus/storefront": "2211.24.1", - "@spartacus/styles": "2211.24.1", + "@spartacus/cart": "2211.25.0-3", + "@spartacus/core": "2211.25.0-3", + "@spartacus/order": "2211.25.0-3", + "@spartacus/schematics": "2211.25.0-3", + "@spartacus/storefront": "2211.25.0-3", + "@spartacus/styles": "2211.25.0-3", "rxjs": "^7.8.0" }, "publishConfig": { diff --git a/feature-libs/estimated-delivery-date/show-estimated-delivery-date/components/estimated-delivery-date.component.spec.ts b/feature-libs/estimated-delivery-date/show-estimated-delivery-date/components/estimated-delivery-date.component.spec.ts index e2003da8e9a..4eb407d7082 100644 --- a/feature-libs/estimated-delivery-date/show-estimated-delivery-date/components/estimated-delivery-date.component.spec.ts +++ b/feature-libs/estimated-delivery-date/show-estimated-delivery-date/components/estimated-delivery-date.component.spec.ts @@ -53,26 +53,24 @@ describe('EstimatedDeliveryDateCartEntryComponent', () => { let mockCartItemContext: MockCartItemContext; let mockOrderHistoryFacade: MockOrderHistoryFacade; - beforeEach( - waitForAsync(() => { - TestBed.configureTestingModule({ - imports: [RouterTestingModule, ReactiveFormsModule, I18nTestingModule], - declarations: [ - EstimatedDeliveryDateComponent, - MockConfigureEstimatedDeliveryDateComponent, - ], - providers: [ - { provide: CartItemContext, useClass: MockCartItemContext }, - { provide: OrderHistoryFacade, useClass: MockOrderHistoryFacade }, - { - provide: TranslationService, - useClass: MockTranslationService, - }, - { provide: LanguageService, useClass: MockLanguageService }, - ], - }).compileComponents(); - }) - ); + beforeEach(waitForAsync(() => { + TestBed.configureTestingModule({ + imports: [RouterTestingModule, ReactiveFormsModule, I18nTestingModule], + declarations: [ + EstimatedDeliveryDateComponent, + MockConfigureEstimatedDeliveryDateComponent, + ], + providers: [ + { provide: CartItemContext, useClass: MockCartItemContext }, + { provide: OrderHistoryFacade, useClass: MockOrderHistoryFacade }, + { + provide: TranslationService, + useClass: MockTranslationService, + }, + { provide: LanguageService, useClass: MockLanguageService }, + ], + }).compileComponents(); + })); beforeEach(() => { fixture = TestBed.createComponent(EstimatedDeliveryDateComponent); diff --git a/feature-libs/order/components/amend-order/amend-order-actions/amend-order-actions.component.spec.ts b/feature-libs/order/components/amend-order/amend-order-actions/amend-order-actions.component.spec.ts index c727e224fd0..429d0a8a75b 100644 --- a/feature-libs/order/components/amend-order/amend-order-actions/amend-order-actions.component.spec.ts +++ b/feature-libs/order/components/amend-order/amend-order-actions/amend-order-actions.component.spec.ts @@ -30,27 +30,25 @@ describe('AmendOrderActionsComponent', () => { let fixture: ComponentFixture; let routingService: RoutingService; - beforeEach( - waitForAsync(() => { - TestBed.configureTestingModule({ - imports: [ - RouterTestingModule, - I18nTestingModule, - StoreModule.forRoot({}), - ], - declarations: [MockUrlPipe, AmendOrderActionsComponent], - providers: [ - { - provide: RoutingConfigService, - useClass: MockRoutingConfigService, - }, - { provide: RoutingService, useClass: MockRoutingService }, - ], - }).compileComponents(); + beforeEach(waitForAsync(() => { + TestBed.configureTestingModule({ + imports: [ + RouterTestingModule, + I18nTestingModule, + StoreModule.forRoot({}), + ], + declarations: [MockUrlPipe, AmendOrderActionsComponent], + providers: [ + { + provide: RoutingConfigService, + useClass: MockRoutingConfigService, + }, + { provide: RoutingService, useClass: MockRoutingService }, + ], + }).compileComponents(); - routingService = TestBed.inject(RoutingService); - }) - ); + routingService = TestBed.inject(RoutingService); + })); beforeEach(() => { fixture = TestBed.createComponent(AmendOrderActionsComponent); diff --git a/feature-libs/order/components/amend-order/amend-order-items/amend-order-items.component.spec.ts b/feature-libs/order/components/amend-order/amend-order-items/amend-order-items.component.spec.ts index 1f5e60d0c9a..680d894c1c5 100644 --- a/feature-libs/order/components/amend-order/amend-order-items/amend-order-items.component.spec.ts +++ b/feature-libs/order/components/amend-order/amend-order-items/amend-order-items.component.spec.ts @@ -65,25 +65,23 @@ describe('CancelOrReturnItemsComponent', () => { let fixture: ComponentFixture; let orderAmendService: OrderAmendService; - beforeEach( - waitForAsync(() => { - TestBed.configureTestingModule({ - imports: [ReactiveFormsModule, I18nTestingModule], - providers: [ - { - provide: OrderAmendService, - useClass: MockOrderAmendService, - }, - ], - declarations: [ - CancelOrReturnItemsComponent, - MockMediaComponent, - MockItemCounterComponent, - MockFeatureLevelDirective, - ], - }).compileComponents(); - }) - ); + beforeEach(waitForAsync(() => { + TestBed.configureTestingModule({ + imports: [ReactiveFormsModule, I18nTestingModule], + providers: [ + { + provide: OrderAmendService, + useClass: MockOrderAmendService, + }, + ], + declarations: [ + CancelOrReturnItemsComponent, + MockMediaComponent, + MockItemCounterComponent, + MockFeatureLevelDirective, + ], + }).compileComponents(); + })); beforeEach(() => { fixture = TestBed.createComponent(CancelOrReturnItemsComponent); diff --git a/feature-libs/order/components/amend-order/cancellations/cancel-order-confirmation/cancel-order-confirmation.component.spec.ts b/feature-libs/order/components/amend-order/cancellations/cancel-order-confirmation/cancel-order-confirmation.component.spec.ts index a6b3317340b..4b0ea1543b2 100644 --- a/feature-libs/order/components/amend-order/cancellations/cancel-order-confirmation/cancel-order-confirmation.component.spec.ts +++ b/feature-libs/order/components/amend-order/cancellations/cancel-order-confirmation/cancel-order-confirmation.component.spec.ts @@ -66,26 +66,24 @@ describe('CancelOrderConfirmationComponent', () => { let fixture: ComponentFixture; let service: OrderAmendService; - beforeEach( - waitForAsync(() => { - TestBed.configureTestingModule({ - imports: [ - CommonModule, - RouterTestingModule, - I18nTestingModule, - ReactiveFormsModule, - ], - providers: [ - { provide: OrderAmendService, useClass: MockOrderAmendService }, - ], - declarations: [ - CancelOrderConfirmationComponent, - MockAmendOrderActionComponent, - MockCancelOrReturnItemsComponent, - ], - }).compileComponents(); - }) - ); + beforeEach(waitForAsync(() => { + TestBed.configureTestingModule({ + imports: [ + CommonModule, + RouterTestingModule, + I18nTestingModule, + ReactiveFormsModule, + ], + providers: [ + { provide: OrderAmendService, useClass: MockOrderAmendService }, + ], + declarations: [ + CancelOrderConfirmationComponent, + MockAmendOrderActionComponent, + MockCancelOrReturnItemsComponent, + ], + }).compileComponents(); + })); beforeEach(() => { fixture = TestBed.createComponent(CancelOrderConfirmationComponent); diff --git a/feature-libs/order/components/amend-order/cancellations/cancel-order/cancel-order.component.spec.ts b/feature-libs/order/components/amend-order/cancellations/cancel-order/cancel-order.component.spec.ts index 05d9e31ba9d..33a5f22eac6 100644 --- a/feature-libs/order/components/amend-order/cancellations/cancel-order/cancel-order.component.spec.ts +++ b/feature-libs/order/components/amend-order/cancellations/cancel-order/cancel-order.component.spec.ts @@ -44,21 +44,19 @@ describe('CancelOrderComponent', () => { let component: CancelOrderComponent; let fixture: ComponentFixture; - beforeEach( - waitForAsync(() => { - TestBed.configureTestingModule({ - imports: [RouterTestingModule, FormErrorsModule], - providers: [ - { provide: OrderAmendService, useClass: MockOrderAmendService }, - ], - declarations: [ - CancelOrderComponent, - MockAmendOrderActionComponent, - MockCancelOrReturnItemsComponent, - ], - }).compileComponents(); - }) - ); + beforeEach(waitForAsync(() => { + TestBed.configureTestingModule({ + imports: [RouterTestingModule, FormErrorsModule], + providers: [ + { provide: OrderAmendService, useClass: MockOrderAmendService }, + ], + declarations: [ + CancelOrderComponent, + MockAmendOrderActionComponent, + MockCancelOrReturnItemsComponent, + ], + }).compileComponents(); + })); beforeEach(() => { fixture = TestBed.createComponent(CancelOrderComponent); diff --git a/feature-libs/order/components/amend-order/cancellations/order-cancellation.service.ts b/feature-libs/order/components/amend-order/cancellations/order-cancellation.service.ts index 42096806ef6..d7500a891d7 100644 --- a/feature-libs/order/components/amend-order/cancellations/order-cancellation.service.ts +++ b/feature-libs/order/components/amend-order/cancellations/order-cancellation.service.ts @@ -63,7 +63,7 @@ export class OrderCancellationService extends OrderAmendService { ({ orderEntryNumber: Number(entryNumber), quantity: entries[entryNumber], - } as CancelOrReturnRequestEntryInput) + }) as CancelOrReturnRequestEntryInput ); this.form.reset(); diff --git a/feature-libs/order/components/amend-order/returns/order-return.service.ts b/feature-libs/order/components/amend-order/returns/order-return.service.ts index f72d2e35d75..25f43ab3ff0 100644 --- a/feature-libs/order/components/amend-order/returns/order-return.service.ts +++ b/feature-libs/order/components/amend-order/returns/order-return.service.ts @@ -61,7 +61,7 @@ export class OrderReturnService extends OrderAmendService { ({ orderEntryNumber: Number(entryNumber), quantity: entries[entryNumber], - } as CancelOrReturnRequestEntryInput) + }) as CancelOrReturnRequestEntryInput ); this.form.reset(); diff --git a/feature-libs/order/components/amend-order/returns/return-order-confirmation/return-order-confirmation.component.spec.ts b/feature-libs/order/components/amend-order/returns/return-order-confirmation/return-order-confirmation.component.spec.ts index eedfb0faf83..8fff0241b33 100644 --- a/feature-libs/order/components/amend-order/returns/return-order-confirmation/return-order-confirmation.component.spec.ts +++ b/feature-libs/order/components/amend-order/returns/return-order-confirmation/return-order-confirmation.component.spec.ts @@ -65,21 +65,19 @@ describe('ReturnOrderConfirmationComponent', () => { let fixture: ComponentFixture; let service: OrderAmendService; - beforeEach( - waitForAsync(() => { - TestBed.configureTestingModule({ - imports: [RouterTestingModule, I18nTestingModule, ReactiveFormsModule], - providers: [ - { provide: OrderAmendService, useClass: MockOrderAmendService }, - ], - declarations: [ - ReturnOrderConfirmationComponent, - MockAmendOrderActionComponent, - MockCancelOrReturnItemsComponent, - ], - }).compileComponents(); - }) - ); + beforeEach(waitForAsync(() => { + TestBed.configureTestingModule({ + imports: [RouterTestingModule, I18nTestingModule, ReactiveFormsModule], + providers: [ + { provide: OrderAmendService, useClass: MockOrderAmendService }, + ], + declarations: [ + ReturnOrderConfirmationComponent, + MockAmendOrderActionComponent, + MockCancelOrReturnItemsComponent, + ], + }).compileComponents(); + })); beforeEach(() => { fixture = TestBed.createComponent(ReturnOrderConfirmationComponent); diff --git a/feature-libs/order/components/amend-order/returns/return-order/return-order.component.spec.ts b/feature-libs/order/components/amend-order/returns/return-order/return-order.component.spec.ts index 0689abf1cef..4213e3a9a38 100644 --- a/feature-libs/order/components/amend-order/returns/return-order/return-order.component.spec.ts +++ b/feature-libs/order/components/amend-order/returns/return-order/return-order.component.spec.ts @@ -44,21 +44,19 @@ describe('ReturnOrderComponent', () => { let component: ReturnOrderComponent; let fixture: ComponentFixture; - beforeEach( - waitForAsync(() => { - TestBed.configureTestingModule({ - imports: [RouterTestingModule, FormErrorsModule], - providers: [ - { provide: OrderAmendService, useClass: MockOrderAmendService }, - ], - declarations: [ - ReturnOrderComponent, - MockAmendOrderActionComponent, - MockCancelOrReturnItemsComponent, - ], - }).compileComponents(); - }) - ); + beforeEach(waitForAsync(() => { + TestBed.configureTestingModule({ + imports: [RouterTestingModule, FormErrorsModule], + providers: [ + { provide: OrderAmendService, useClass: MockOrderAmendService }, + ], + declarations: [ + ReturnOrderComponent, + MockAmendOrderActionComponent, + MockCancelOrReturnItemsComponent, + ], + }).compileComponents(); + })); beforeEach(() => { fixture = TestBed.createComponent(ReturnOrderComponent); diff --git a/feature-libs/order/components/my-account-v2/my-account-v2-orders.component.spec.ts b/feature-libs/order/components/my-account-v2/my-account-v2-orders.component.spec.ts index 98ea72ef55d..230f6bb6474 100644 --- a/feature-libs/order/components/my-account-v2/my-account-v2-orders.component.spec.ts +++ b/feature-libs/order/components/my-account-v2/my-account-v2-orders.component.spec.ts @@ -94,25 +94,23 @@ describe(' MyAccountV2OrdersComponent', () => { let fixture: ComponentFixture; let service: MyAccountV2OrderHistoryService; - beforeEach( - waitForAsync(() => { - TestBed.configureTestingModule({ - imports: [RouterTestingModule, I18nTestingModule], - declarations: [ - MyAccountV2OrdersComponent, - MockUrlPipe, - MockMediaComponent, - MockSpinnerComponent, - ], - providers: [ - { provide: RoutingService, useClass: MockRoutingService }, - { provide: MyAccountV2OrderHistoryService, useClass: MockService }, - { provide: TranslationService, useClass: MockTranslationService }, - ], - }).compileComponents(); - service = TestBed.inject(MyAccountV2OrderHistoryService); - }) - ); + beforeEach(waitForAsync(() => { + TestBed.configureTestingModule({ + imports: [RouterTestingModule, I18nTestingModule], + declarations: [ + MyAccountV2OrdersComponent, + MockUrlPipe, + MockMediaComponent, + MockSpinnerComponent, + ], + providers: [ + { provide: RoutingService, useClass: MockRoutingService }, + { provide: MyAccountV2OrderHistoryService, useClass: MockService }, + { provide: TranslationService, useClass: MockTranslationService }, + ], + }).compileComponents(); + service = TestBed.inject(MyAccountV2OrderHistoryService); + })); beforeEach(() => { fixture = TestBed.createComponent(MyAccountV2OrdersComponent); diff --git a/feature-libs/order/components/order-confirmation/order-confirmation-items/order-confirmation-items.component.spec.ts b/feature-libs/order/components/order-confirmation/order-confirmation-items/order-confirmation-items.component.spec.ts index 93b7e6ad15c..aac1325187a 100644 --- a/feature-libs/order/components/order-confirmation/order-confirmation-items/order-confirmation-items.component.spec.ts +++ b/feature-libs/order/components/order-confirmation/order-confirmation-items/order-confirmation-items.component.spec.ts @@ -24,23 +24,21 @@ describe('OrderConfirmationItemsComponent', () => { let component: OrderConfirmationItemsComponent; let fixture: ComponentFixture; - beforeEach( - waitForAsync(() => { - TestBed.configureTestingModule({ - imports: [I18nTestingModule, PromotionsModule], - declarations: [OrderConfirmationItemsComponent], - providers: [ - { provide: OrderFacade, useClass: MockOrderFacade }, - { - provide: FeaturesConfig, - useValue: { - features: { level: '1.3' }, - }, + beforeEach(waitForAsync(() => { + TestBed.configureTestingModule({ + imports: [I18nTestingModule, PromotionsModule], + declarations: [OrderConfirmationItemsComponent], + providers: [ + { provide: OrderFacade, useClass: MockOrderFacade }, + { + provide: FeaturesConfig, + useValue: { + features: { level: '1.3' }, }, - ], - }).compileComponents(); - }) - ); + }, + ], + }).compileComponents(); + })); beforeEach(() => { fixture = TestBed.createComponent(OrderConfirmationItemsComponent); diff --git a/feature-libs/order/components/order-confirmation/order-confirmation-thank-you-message/order-confirmation-thank-you-message.component.spec.ts b/feature-libs/order/components/order-confirmation/order-confirmation-thank-you-message/order-confirmation-thank-you-message.component.spec.ts index 9ef075bbb04..4008f63f948 100644 --- a/feature-libs/order/components/order-confirmation/order-confirmation-thank-you-message/order-confirmation-thank-you-message.component.spec.ts +++ b/feature-libs/order/components/order-confirmation/order-confirmation-thank-you-message/order-confirmation-thank-you-message.component.spec.ts @@ -50,24 +50,22 @@ describe('OrderConfirmationThankYouMessageComponent', () => { let orderFacade: OrderFacade; let globalMessageService: GlobalMessageService; - beforeEach( - waitForAsync(() => { - TestBed.configureTestingModule({ - imports: [I18nTestingModule], - declarations: [ - OrderConfirmationThankYouMessageComponent, - MockAddtoHomeScreenBannerComponent, - MockGuestRegisterFormComponent, - MockFeatureLevelDirective, - ], - providers: [ - { provide: OrderFacade, useClass: MockOrderFacade }, - { provide: GlobalMessageService, useClass: MockGlobalMessageService }, - { provide: TranslationService, useClass: MockTranslationService }, - ], - }).compileComponents(); - }) - ); + beforeEach(waitForAsync(() => { + TestBed.configureTestingModule({ + imports: [I18nTestingModule], + declarations: [ + OrderConfirmationThankYouMessageComponent, + MockAddtoHomeScreenBannerComponent, + MockGuestRegisterFormComponent, + MockFeatureLevelDirective, + ], + providers: [ + { provide: OrderFacade, useClass: MockOrderFacade }, + { provide: GlobalMessageService, useClass: MockGlobalMessageService }, + { provide: TranslationService, useClass: MockTranslationService }, + ], + }).compileComponents(); + })); beforeEach(() => { fixture = TestBed.createComponent( diff --git a/feature-libs/order/components/order-confirmation/order-confirmation-totals/order-confirmation-totals.component.spec.ts b/feature-libs/order/components/order-confirmation/order-confirmation-totals/order-confirmation-totals.component.spec.ts index e95f4b9a071..795c4eeba14 100644 --- a/feature-libs/order/components/order-confirmation/order-confirmation-totals/order-confirmation-totals.component.spec.ts +++ b/feature-libs/order/components/order-confirmation/order-confirmation-totals/order-confirmation-totals.component.spec.ts @@ -18,15 +18,13 @@ describe('OrderConfirmationTotalsComponent', () => { let component: OrderConfirmationTotalsComponent; let fixture: ComponentFixture; - beforeEach( - waitForAsync(() => { - TestBed.configureTestingModule({ - imports: [I18nTestingModule], - declarations: [OrderConfirmationTotalsComponent], - providers: [{ provide: OrderFacade, useClass: MockOrderFacade }], - }).compileComponents(); - }) - ); + beforeEach(waitForAsync(() => { + TestBed.configureTestingModule({ + imports: [I18nTestingModule], + declarations: [OrderConfirmationTotalsComponent], + providers: [{ provide: OrderFacade, useClass: MockOrderFacade }], + }).compileComponents(); + })); beforeEach(() => { fixture = TestBed.createComponent(OrderConfirmationTotalsComponent); diff --git a/feature-libs/order/components/order-confirmation/order-guest-register-form/order-guest-register-form.component.spec.ts b/feature-libs/order/components/order-confirmation/order-guest-register-form/order-guest-register-form.component.spec.ts index 8006dacd98a..5de9de87a5e 100644 --- a/feature-libs/order/components/order-confirmation/order-guest-register-form/order-guest-register-form.component.spec.ts +++ b/feature-libs/order/components/order-confirmation/order-guest-register-form/order-guest-register-form.component.spec.ts @@ -34,24 +34,22 @@ describe('OrderGuestRegisterFormComponent', () => { let userRegisterFacade: UserRegisterFacade; let routingService: RoutingService; - beforeEach( - waitForAsync(() => { - TestBed.configureTestingModule({ - imports: [ - I18nTestingModule, - ReactiveFormsModule, - FormErrorsModule, - PasswordVisibilityToggleModule, - ], - declarations: [OrderGuestRegisterFormComponent, MockFeatureDirective], - providers: [ - { provide: AuthService, useClass: MockAuthService }, - { provide: UserRegisterFacade, useClass: MockUserRegisterFacade }, - { provide: RoutingService, useClass: MockRoutingService }, - ], - }).compileComponents(); - }) - ); + beforeEach(waitForAsync(() => { + TestBed.configureTestingModule({ + imports: [ + I18nTestingModule, + ReactiveFormsModule, + FormErrorsModule, + PasswordVisibilityToggleModule, + ], + declarations: [OrderGuestRegisterFormComponent, MockFeatureDirective], + providers: [ + { provide: AuthService, useClass: MockAuthService }, + { provide: UserRegisterFacade, useClass: MockUserRegisterFacade }, + { provide: RoutingService, useClass: MockRoutingService }, + ], + }).compileComponents(); + })); beforeEach(() => { fixture = TestBed.createComponent(OrderGuestRegisterFormComponent); diff --git a/feature-libs/order/components/order-details/my-account-v2-order-consignments.service.ts b/feature-libs/order/components/order-details/my-account-v2-order-consignments.service.ts index 449724f5554..c405a315155 100644 --- a/feature-libs/order/components/order-details/my-account-v2-order-consignments.service.ts +++ b/feature-libs/order/components/order-details/my-account-v2-order-consignments.service.ts @@ -50,12 +50,15 @@ export class MyAccountV2OrderConsignmentsService { protected groupConsignments( consignments: Consignment[] | undefined ): Consignment[] | undefined { - const grouped = consignments?.reduce((result, current) => { - const key = this.getStatusGroupKey(current.status || ''); - result[key] = result[key] || []; - result[key].push(current); - return result; - }, {} as { [key: string]: Consignment[] }); + const grouped = consignments?.reduce( + (result, current) => { + const key = this.getStatusGroupKey(current.status || ''); + result[key] = result[key] || []; + result[key].push(current); + return result; + }, + {} as { [key: string]: Consignment[] } + ); return grouped ? [...(grouped[1] || []), ...(grouped[0] || []), ...(grouped[-1] || [])] diff --git a/feature-libs/order/components/order-details/my-account-v2/order-details-actions/my-account-v2-order-details-actions.component.spec.ts b/feature-libs/order/components/order-details/my-account-v2/order-details-actions/my-account-v2-order-details-actions.component.spec.ts index ade2db6d5e8..04f8b3d1201 100644 --- a/feature-libs/order/components/order-details/my-account-v2/order-details-actions/my-account-v2-order-details-actions.component.spec.ts +++ b/feature-libs/order/components/order-details/my-account-v2/order-details-actions/my-account-v2-order-details-actions.component.spec.ts @@ -51,24 +51,22 @@ describe('MyAccountV2OrderDetailsActionsComponent', () => { let el: DebugElement; let event: EventService; - beforeEach( - waitForAsync(() => { - TestBed.configureTestingModule({ - imports: [I18nModule, RouterTestingModule], - providers: [ - { provide: TranslationService, useClass: MockTranslationService }, - { provide: OrderDetailsService, useClass: MockOrderDetailsService }, - { provide: RoutingService, useClass: MockRoutingService }, - ], - declarations: [ - MyAccountV2OrderDetailsActionsComponent, - MockUrlPipe, - MockOrderDetailActionsComponent, - ], - }).compileComponents(); - event = TestBed.inject(EventService); - }) - ); + beforeEach(waitForAsync(() => { + TestBed.configureTestingModule({ + imports: [I18nModule, RouterTestingModule], + providers: [ + { provide: TranslationService, useClass: MockTranslationService }, + { provide: OrderDetailsService, useClass: MockOrderDetailsService }, + { provide: RoutingService, useClass: MockRoutingService }, + ], + declarations: [ + MyAccountV2OrderDetailsActionsComponent, + MockUrlPipe, + MockOrderDetailActionsComponent, + ], + }).compileComponents(); + event = TestBed.inject(EventService); + })); beforeEach(() => { fixture = TestBed.createComponent(MyAccountV2OrderDetailsActionsComponent); diff --git a/feature-libs/order/components/order-details/order-detail-actions/order-detail-actions.component.spec.ts b/feature-libs/order/components/order-details/order-detail-actions/order-detail-actions.component.spec.ts index cd6dac39a32..aacac0f8f6e 100644 --- a/feature-libs/order/components/order-details/order-detail-actions/order-detail-actions.component.spec.ts +++ b/feature-libs/order/components/order-details/order-detail-actions/order-detail-actions.component.spec.ts @@ -28,29 +28,27 @@ describe('OrderDetailActionsComponent', () => { let mockOrderDetailsService: OrderDetailsService; let el: DebugElement; - beforeEach( - waitForAsync(() => { - mockOrderDetailsService = { - getOrderDetails() { - return of(mockOrder); - }, - }; + beforeEach(waitForAsync(() => { + mockOrderDetailsService = { + getOrderDetails() { + return of(mockOrder); + }, + }; - TestBed.configureTestingModule({ - imports: [I18nTestingModule, RouterTestingModule], - providers: [ - { provide: OrderDetailsService, useValue: mockOrderDetailsService }, - { - provide: FeaturesConfig, - useValue: { - features: { cancellationAndReturn: true }, - }, + TestBed.configureTestingModule({ + imports: [I18nTestingModule, RouterTestingModule], + providers: [ + { provide: OrderDetailsService, useValue: mockOrderDetailsService }, + { + provide: FeaturesConfig, + useValue: { + features: { cancellationAndReturn: true }, }, - ], - declarations: [OrderDetailActionsComponent, MockUrlPipe], - }).compileComponents(); - }) - ); + }, + ], + declarations: [OrderDetailActionsComponent, MockUrlPipe], + }).compileComponents(); + })); beforeEach(() => { fixture = TestBed.createComponent(OrderDetailActionsComponent); diff --git a/feature-libs/order/components/order-details/order-detail-billing/order-detail-billing.component.spec.ts b/feature-libs/order/components/order-details/order-detail-billing/order-detail-billing.component.spec.ts index b4244ceab1f..53683eec569 100644 --- a/feature-libs/order/components/order-details/order-detail-billing/order-detail-billing.component.spec.ts +++ b/feature-libs/order/components/order-details/order-detail-billing/order-detail-billing.component.spec.ts @@ -42,20 +42,18 @@ describe('OrderDetailBillingComponent', () => { let component: OrderDetailBillingComponent; let fixture: ComponentFixture; - beforeEach( - waitForAsync(() => { - TestBed.configureTestingModule({ - imports: [I18nTestingModule], - declarations: [OrderDetailBillingComponent], - providers: [ - { - provide: OrderDetailsService, - useClass: MockOrderDetailsService, - }, - ], - }).compileComponents(); - }) - ); + beforeEach(waitForAsync(() => { + TestBed.configureTestingModule({ + imports: [I18nTestingModule], + declarations: [OrderDetailBillingComponent], + providers: [ + { + provide: OrderDetailsService, + useClass: MockOrderDetailsService, + }, + ], + }).compileComponents(); + })); beforeEach(() => { fixture = TestBed.createComponent(OrderDetailBillingComponent); diff --git a/feature-libs/order/components/order-details/order-detail-items/consignment-tracking/tracking-events/tracking-events.component.spec.ts b/feature-libs/order/components/order-details/order-detail-items/consignment-tracking/tracking-events/tracking-events.component.spec.ts index 33348e41007..de9b97bd9c9 100644 --- a/feature-libs/order/components/order-details/order-detail-items/consignment-tracking/tracking-events/tracking-events.component.spec.ts +++ b/feature-libs/order/components/order-details/order-detail-items/consignment-tracking/tracking-events/tracking-events.component.spec.ts @@ -37,25 +37,23 @@ describe('TrackingEventsComponent', () => { ]); let launchDialogService: LaunchDialogService; - beforeEach( - waitForAsync(() => { - TestBed.configureTestingModule({ - imports: [ - SpinnerModule, - I18nTestingModule, - KeyboardFocusTestingModule, - IconTestingModule, - ], - declarations: [TrackingEventsComponent, MockTranslateUrlPipe], - providers: [ - { provide: OrderHistoryFacade, useValue: userOrderService }, - { provide: LaunchDialogService, useClass: MockLaunchDialogService }, - ], - }).compileComponents(); - - launchDialogService = TestBed.inject(LaunchDialogService); - }) - ); + beforeEach(waitForAsync(() => { + TestBed.configureTestingModule({ + imports: [ + SpinnerModule, + I18nTestingModule, + KeyboardFocusTestingModule, + IconTestingModule, + ], + declarations: [TrackingEventsComponent, MockTranslateUrlPipe], + providers: [ + { provide: OrderHistoryFacade, useValue: userOrderService }, + { provide: LaunchDialogService, useClass: MockLaunchDialogService }, + ], + }).compileComponents(); + + launchDialogService = TestBed.inject(LaunchDialogService); + })); beforeEach(() => { fixture = TestBed.createComponent(TrackingEventsComponent); diff --git a/feature-libs/order/components/order-details/order-detail-items/order-consigned-entries/order-consigned-entries.component.spec.ts b/feature-libs/order/components/order-details/order-detail-items/order-consigned-entries/order-consigned-entries.component.spec.ts index 12ce44a8bad..bdb42020820 100644 --- a/feature-libs/order/components/order-details/order-detail-items/order-consigned-entries/order-consigned-entries.component.spec.ts +++ b/feature-libs/order/components/order-details/order-detail-items/order-consigned-entries/order-consigned-entries.component.spec.ts @@ -81,30 +81,28 @@ describe('OrderConsignedEntriesComponent', () => { let fixture: ComponentFixture; let el: DebugElement; - beforeEach( - waitForAsync(() => { - TestBed.configureTestingModule({ - imports: [ - CardModule, - I18nTestingModule, - RouterTestingModule, - OutletModule, - ], - providers: [ - { - provide: FeaturesConfig, - useValue: { - features: { level: '1.4', consignmentTracking: true }, - }, + beforeEach(waitForAsync(() => { + TestBed.configureTestingModule({ + imports: [ + CardModule, + I18nTestingModule, + RouterTestingModule, + OutletModule, + ], + providers: [ + { + provide: FeaturesConfig, + useValue: { + features: { level: '1.4', consignmentTracking: true }, }, - ], - declarations: [ - OrderConsignedEntriesComponent, - MockConsignmentTrackingComponent, - ], - }).compileComponents(); - }) - ); + }, + ], + declarations: [ + OrderConsignedEntriesComponent, + MockConsignmentTrackingComponent, + ], + }).compileComponents(); + })); beforeEach(() => { fixture = TestBed.createComponent(OrderConsignedEntriesComponent); diff --git a/feature-libs/order/components/order-details/order-detail-items/order-detail-items.component.spec.ts b/feature-libs/order/components/order-details/order-detail-items/order-detail-items.component.spec.ts index ac42a4668bc..cac01adc1e1 100644 --- a/feature-libs/order/components/order-details/order-detail-items/order-detail-items.component.spec.ts +++ b/feature-libs/order/components/order-details/order-detail-items/order-detail-items.component.spec.ts @@ -149,37 +149,35 @@ describe('OrderDetailItemsComponent', () => { let mockOrderDetailsService: OrderDetailsService; let el: DebugElement; - beforeEach( - waitForAsync(() => { - mockOrderDetailsService = { - isOrderDetailsLoading(): Observable { - return of(false); - }, - getOrderDetails() { - return of(mockOrder); - }, - }; + beforeEach(waitForAsync(() => { + mockOrderDetailsService = { + isOrderDetailsLoading(): Observable { + return of(false); + }, + getOrderDetails() { + return of(mockOrder); + }, + }; - TestBed.configureTestingModule({ - imports: [ - CardModule, - I18nTestingModule, - PromotionsModule, - RouterTestingModule, - OutletModule, - ], - providers: [ - { provide: OrderDetailsService, useValue: mockOrderDetailsService }, - { provide: CmsComponentData, useValue: MockCmsComponentData }, - ], - declarations: [ - OrderDetailItemsComponent, - MockConsignmentTrackingComponent, - OrderConsignedEntriesComponent, - ], - }).compileComponents(); - }) - ); + TestBed.configureTestingModule({ + imports: [ + CardModule, + I18nTestingModule, + PromotionsModule, + RouterTestingModule, + OutletModule, + ], + providers: [ + { provide: OrderDetailsService, useValue: mockOrderDetailsService }, + { provide: CmsComponentData, useValue: MockCmsComponentData }, + ], + declarations: [ + OrderDetailItemsComponent, + MockConsignmentTrackingComponent, + OrderConsignedEntriesComponent, + ], + }).compileComponents(); + })); beforeEach(() => { fixture = TestBed.createComponent(OrderDetailItemsComponent); diff --git a/feature-libs/order/components/order-details/order-detail-reorder/order-detail-reorder.component.spec.ts b/feature-libs/order/components/order-details/order-detail-reorder/order-detail-reorder.component.spec.ts index ffe01a61ddc..be1cb068167 100644 --- a/feature-libs/order/components/order-details/order-detail-reorder/order-detail-reorder.component.spec.ts +++ b/feature-libs/order/components/order-details/order-detail-reorder/order-detail-reorder.component.spec.ts @@ -35,25 +35,23 @@ describe('Order detail reorder component', () => { let fixture: ComponentFixture; let launchDialogService: LaunchDialogService; - beforeEach( - waitForAsync(() => { - TestBed.configureTestingModule({ - imports: [I18nTestingModule], - declarations: [OrderDetailReorderComponent], - providers: [ - RouterTestingModule, - { - provide: LaunchDialogService, - useClass: MockLaunchDialogService, - }, - { - provide: OrderDetailsService, - useClass: MockOrderDetailsService, - }, - ], - }).compileComponents(); - }) - ); + beforeEach(waitForAsync(() => { + TestBed.configureTestingModule({ + imports: [I18nTestingModule], + declarations: [OrderDetailReorderComponent], + providers: [ + RouterTestingModule, + { + provide: LaunchDialogService, + useClass: MockLaunchDialogService, + }, + { + provide: OrderDetailsService, + useClass: MockOrderDetailsService, + }, + ], + }).compileComponents(); + })); beforeEach(() => { fixture = TestBed.createComponent(OrderDetailReorderComponent); diff --git a/feature-libs/order/components/order-details/order-detail-reorder/reorder-dialog/reorder-dialog.component.spec.ts b/feature-libs/order/components/order-details/order-detail-reorder/reorder-dialog/reorder-dialog.component.spec.ts index 605519b8c96..ad3af64a6f3 100644 --- a/feature-libs/order/components/order-details/order-detail-reorder/reorder-dialog/reorder-dialog.component.spec.ts +++ b/feature-libs/order/components/order-details/order-detail-reorder/reorder-dialog/reorder-dialog.component.spec.ts @@ -119,41 +119,39 @@ describe('ReorderDialogComponent', () => { let el: DebugElement; let reorderOrderFacade: ReorderOrderFacade; - beforeEach( - waitForAsync(() => { - TestBed.configureTestingModule({ - imports: [ - FormsModule, - ReactiveFormsModule, - RouterTestingModule, - SpinnerModule, - I18nTestingModule, - PromotionsModule, - ], - declarations: [ - ReorderDialogComponent, - MockCxIconComponent, - MockSpinnerComponent, - MockFocusDirective, - ], - providers: [ - { provide: LaunchDialogService, useClass: MockLaunchDialogService }, - { - provide: ReorderOrderFacade, - useClass: MockReorderOrderFacade, - }, - { - provide: MultiCartFacade, - useClass: MockMultiCartService, - }, - { - provide: FeatureConfigService, - useClass: MockFeatureConfigService, - }, - ], - }).compileComponents(); - }) - ); + beforeEach(waitForAsync(() => { + TestBed.configureTestingModule({ + imports: [ + FormsModule, + ReactiveFormsModule, + RouterTestingModule, + SpinnerModule, + I18nTestingModule, + PromotionsModule, + ], + declarations: [ + ReorderDialogComponent, + MockCxIconComponent, + MockSpinnerComponent, + MockFocusDirective, + ], + providers: [ + { provide: LaunchDialogService, useClass: MockLaunchDialogService }, + { + provide: ReorderOrderFacade, + useClass: MockReorderOrderFacade, + }, + { + provide: MultiCartFacade, + useClass: MockMultiCartService, + }, + { + provide: FeatureConfigService, + useClass: MockFeatureConfigService, + }, + ], + }).compileComponents(); + })); beforeEach(() => { fixture = TestBed.createComponent(ReorderDialogComponent); diff --git a/feature-libs/order/components/order-details/order-detail-totals/order-detail-totals.component.spec.ts b/feature-libs/order/components/order-details/order-detail-totals/order-detail-totals.component.spec.ts index a3da55ca186..76973dd0f2b 100644 --- a/feature-libs/order/components/order-details/order-detail-totals/order-detail-totals.component.spec.ts +++ b/feature-libs/order/components/order-details/order-detail-totals/order-detail-totals.component.spec.ts @@ -53,23 +53,21 @@ describe('OrderDetailTotalsComponent', () => { let fixture: ComponentFixture; let mockOrderDetailsService: OrderDetailsService; - beforeEach( - waitForAsync(() => { - mockOrderDetailsService = { - getOrderDetails() { - return of(mockOrder); - }, - }; + beforeEach(waitForAsync(() => { + mockOrderDetailsService = { + getOrderDetails() { + return of(mockOrder); + }, + }; - TestBed.configureTestingModule({ - imports: [OutletModule], - providers: [ - { provide: OrderDetailsService, useValue: mockOrderDetailsService }, - ], - declarations: [OrderDetailTotalsComponent], - }).compileComponents(); - }) - ); + TestBed.configureTestingModule({ + imports: [OutletModule], + providers: [ + { provide: OrderDetailsService, useValue: mockOrderDetailsService }, + ], + declarations: [OrderDetailTotalsComponent], + }).compileComponents(); + })); beforeEach(() => { fixture = TestBed.createComponent(OrderDetailTotalsComponent); diff --git a/feature-libs/order/components/order-details/order-overview/order-overview.component.ts b/feature-libs/order/components/order-details/order-overview/order-overview.component.ts index f05b90e8228..0d015aaf09d 100644 --- a/feature-libs/order/components/order-details/order-overview/order-overview.component.ts +++ b/feature-libs/order/components/order-details/order-overview/order-overview.component.ts @@ -205,7 +205,7 @@ export class OrderOverviewComponent { ? deliveryMode.deliveryCost?.formattedValue : '', ], - } as Card) + }) as Card ) ); } @@ -243,7 +243,7 @@ export class OrderOverviewComponent { billingAddress.formattedAddress, billingAddress.country?.name, ], - } as Card) + }) as Card ) ); } diff --git a/feature-libs/order/components/order-history/my-account-v2/consignment-entries/my-account-v2-consignment-entries.component.spec.ts b/feature-libs/order/components/order-history/my-account-v2/consignment-entries/my-account-v2-consignment-entries.component.spec.ts index fbeca85d0aa..1c18ce9b129 100644 --- a/feature-libs/order/components/order-history/my-account-v2/consignment-entries/my-account-v2-consignment-entries.component.spec.ts +++ b/feature-libs/order/components/order-history/my-account-v2/consignment-entries/my-account-v2-consignment-entries.component.spec.ts @@ -66,22 +66,20 @@ describe('MyAccountV2ConsignmentEntriesComponent', () => { let fixture: ComponentFixture; let el: DebugElement; - beforeEach( - waitForAsync(() => { - TestBed.configureTestingModule({ - imports: [I18nModule], - providers: [ - { provide: TranslationService, useClass: MockTranslationService }, - { provide: LanguageService, useClass: MockLanguageService }, - ], - declarations: [ - MyAccountV2ConsignmentEntriesComponent, - MockUrlPipe, - MockDatePipe, - ], - }).compileComponents(); - }) - ); + beforeEach(waitForAsync(() => { + TestBed.configureTestingModule({ + imports: [I18nModule], + providers: [ + { provide: TranslationService, useClass: MockTranslationService }, + { provide: LanguageService, useClass: MockLanguageService }, + ], + declarations: [ + MyAccountV2ConsignmentEntriesComponent, + MockUrlPipe, + MockDatePipe, + ], + }).compileComponents(); + })); beforeEach(() => { fixture = TestBed.createComponent(MyAccountV2ConsignmentEntriesComponent); diff --git a/feature-libs/order/components/order-history/my-account-v2/consolidated-information/my-account-v2-order-consolidated-information.component.spec.ts b/feature-libs/order/components/order-history/my-account-v2/consolidated-information/my-account-v2-order-consolidated-information.component.spec.ts index 15d1e0cc490..5305afb289c 100644 --- a/feature-libs/order/components/order-history/my-account-v2/consolidated-information/my-account-v2-order-consolidated-information.component.spec.ts +++ b/feature-libs/order/components/order-history/my-account-v2/consolidated-information/my-account-v2-order-consolidated-information.component.spec.ts @@ -66,26 +66,24 @@ describe('MyAccountV2OrderConsolidatedInformationComponent', () => { let fixture: ComponentFixture; let service: MyAccountV2OrderConsignmentsService; - beforeEach( - waitForAsync(() => { - TestBed.configureTestingModule({ - imports: [I18nTestingModule], - declarations: [ - MyAccountV2OrderConsolidatedInformationComponent, - MockUrlPipe, - MockMediaComponent, - ], - providers: [ - { - provide: MyAccountV2OrderConsignmentsService, - useClass: MockMyAccountV2OrderConsignmentsService, - }, - { provide: TranslationService, useClass: MockTranslationService }, - ], - }).compileComponents(); - service = TestBed.inject(MyAccountV2OrderConsignmentsService); - }) - ); + beforeEach(waitForAsync(() => { + TestBed.configureTestingModule({ + imports: [I18nTestingModule], + declarations: [ + MyAccountV2OrderConsolidatedInformationComponent, + MockUrlPipe, + MockMediaComponent, + ], + providers: [ + { + provide: MyAccountV2OrderConsignmentsService, + useClass: MockMyAccountV2OrderConsignmentsService, + }, + { provide: TranslationService, useClass: MockTranslationService }, + ], + }).compileComponents(); + service = TestBed.inject(MyAccountV2OrderConsignmentsService); + })); beforeEach(() => { fixture = TestBed.createComponent( diff --git a/feature-libs/order/components/order-history/my-account-v2/my-account-v2-order-history.component.spec.ts b/feature-libs/order/components/order-history/my-account-v2/my-account-v2-order-history.component.spec.ts index a356d3397b6..e408ffbd20f 100644 --- a/feature-libs/order/components/order-history/my-account-v2/my-account-v2-order-history.component.spec.ts +++ b/feature-libs/order/components/order-history/my-account-v2/my-account-v2-order-history.component.spec.ts @@ -107,33 +107,31 @@ describe('MyAccountV2OrderHistoryComponent', () => { let fixture: ComponentFixture; let routingService: RoutingService; - beforeEach( - waitForAsync(() => { - TestBed.configureTestingModule({ - imports: [RouterTestingModule, I18nTestingModule], - declarations: [ - MyAccountV2OrderHistoryComponent, - MockUrlPipe, - MockPaginationComponent, - MockMyAccountV2OrderConsolidatedInformationComponent, - MockSpinnerComponent, - ], - providers: [ - { provide: RoutingService, useClass: MockRoutingService }, - { - provide: MyAccountV2OrderHistoryService, - useClass: MockMyAccountV2OrderHistoryService, - }, - { provide: TranslationService, useClass: MockTranslationService }, - { - provide: ReplenishmentOrderHistoryFacade, - useClass: MockReplenishmentOrderHistoryFacade, - }, - ], - }).compileComponents(); - routingService = TestBed.inject(RoutingService); - }) - ); + beforeEach(waitForAsync(() => { + TestBed.configureTestingModule({ + imports: [RouterTestingModule, I18nTestingModule], + declarations: [ + MyAccountV2OrderHistoryComponent, + MockUrlPipe, + MockPaginationComponent, + MockMyAccountV2OrderConsolidatedInformationComponent, + MockSpinnerComponent, + ], + providers: [ + { provide: RoutingService, useClass: MockRoutingService }, + { + provide: MyAccountV2OrderHistoryService, + useClass: MockMyAccountV2OrderHistoryService, + }, + { provide: TranslationService, useClass: MockTranslationService }, + { + provide: ReplenishmentOrderHistoryFacade, + useClass: MockReplenishmentOrderHistoryFacade, + }, + ], + }).compileComponents(); + routingService = TestBed.inject(RoutingService); + })); beforeEach(() => { fixture = TestBed.createComponent(MyAccountV2OrderHistoryComponent); diff --git a/feature-libs/order/components/order-history/order-history.component.spec.ts b/feature-libs/order/components/order-history/order-history.component.spec.ts index f80b4db8db8..84d5f9cd39e 100644 --- a/feature-libs/order/components/order-history/order-history.component.spec.ts +++ b/feature-libs/order/components/order-history/order-history.component.spec.ts @@ -151,31 +151,29 @@ describe('OrderHistoryComponent', () => { let orderHistoryFacade: OrderHistoryFacade; let routingService: RoutingService; - beforeEach( - waitForAsync(() => { - TestBed.configureTestingModule({ - imports: [RouterTestingModule, I18nTestingModule], - declarations: [ - OrderHistoryComponent, - MockUrlPipe, - MockPaginationComponent, - MockSortingComponent, - ], - providers: [ - { provide: RoutingService, useClass: MockRoutingService }, - { provide: OrderHistoryFacade, useClass: MockOrderHistoryFacade }, - { provide: TranslationService, useClass: MockTranslationService }, - { - provide: ReplenishmentOrderHistoryFacade, - useClass: MockReplenishmentOrderHistoryFacade, - }, - ], - }).compileComponents(); - - orderHistoryFacade = TestBed.inject(OrderHistoryFacade); - routingService = TestBed.inject(RoutingService); - }) - ); + beforeEach(waitForAsync(() => { + TestBed.configureTestingModule({ + imports: [RouterTestingModule, I18nTestingModule], + declarations: [ + OrderHistoryComponent, + MockUrlPipe, + MockPaginationComponent, + MockSortingComponent, + ], + providers: [ + { provide: RoutingService, useClass: MockRoutingService }, + { provide: OrderHistoryFacade, useClass: MockOrderHistoryFacade }, + { provide: TranslationService, useClass: MockTranslationService }, + { + provide: ReplenishmentOrderHistoryFacade, + useClass: MockReplenishmentOrderHistoryFacade, + }, + ], + }).compileComponents(); + + orderHistoryFacade = TestBed.inject(OrderHistoryFacade); + routingService = TestBed.inject(RoutingService); + })); beforeEach(() => { fixture = TestBed.createComponent(OrderHistoryComponent); diff --git a/feature-libs/order/components/replenishment-order-cancellation-dialog/replenishment-order-cancellation-dialog.component.spec.ts b/feature-libs/order/components/replenishment-order-cancellation-dialog/replenishment-order-cancellation-dialog.component.spec.ts index 8c5084dc46a..5ae344e48da 100644 --- a/feature-libs/order/components/replenishment-order-cancellation-dialog/replenishment-order-cancellation-dialog.component.spec.ts +++ b/feature-libs/order/components/replenishment-order-cancellation-dialog/replenishment-order-cancellation-dialog.component.spec.ts @@ -72,26 +72,24 @@ describe('ReplenishmentOrderCancellationDialogComponent', () => { let fixture: ComponentFixture; let el: DebugElement; - beforeEach( - waitForAsync(() => { - TestBed.configureTestingModule({ - imports: [I18nTestingModule, KeyboardFocusTestingModule], - declarations: [ - ReplenishmentOrderCancellationDialogComponent, - MockCxIconComponent, - MockFeatureLevelDirective, - ], - providers: [ - { - provide: ReplenishmentOrderHistoryFacade, - useClass: MockReplenishmentOrderHistoryFacade, - }, - { provide: GlobalMessageService, useClass: MockGlobalMessageService }, - { provide: LaunchDialogService, useClass: MockLaunchDialogService }, - ], - }).compileComponents(); - }) - ); + beforeEach(waitForAsync(() => { + TestBed.configureTestingModule({ + imports: [I18nTestingModule, KeyboardFocusTestingModule], + declarations: [ + ReplenishmentOrderCancellationDialogComponent, + MockCxIconComponent, + MockFeatureLevelDirective, + ], + providers: [ + { + provide: ReplenishmentOrderHistoryFacade, + useClass: MockReplenishmentOrderHistoryFacade, + }, + { provide: GlobalMessageService, useClass: MockGlobalMessageService }, + { provide: LaunchDialogService, useClass: MockLaunchDialogService }, + ], + }).compileComponents(); + })); beforeEach(() => { fixture = TestBed.createComponent( diff --git a/feature-libs/order/components/replenishment-order-details/replenishment-order-cancellation/replenishment-order-cancellation.component.spec.ts b/feature-libs/order/components/replenishment-order-details/replenishment-order-cancellation/replenishment-order-cancellation.component.spec.ts index 0c716464cdf..d94e8dc9bab 100644 --- a/feature-libs/order/components/replenishment-order-details/replenishment-order-cancellation/replenishment-order-cancellation.component.spec.ts +++ b/feature-libs/order/components/replenishment-order-details/replenishment-order-cancellation/replenishment-order-cancellation.component.spec.ts @@ -61,24 +61,22 @@ describe('ReplenishmentOrderCancellationComponent', () => { let fixture: ComponentFixture; let el: DebugElement; - beforeEach( - waitForAsync(() => { - TestBed.configureTestingModule({ - imports: [I18nTestingModule, RouterTestingModule], - declarations: [ReplenishmentOrderCancellationComponent, MockUrlPipe], - providers: [ - { - provide: ReplenishmentOrderHistoryFacade, - useClass: MockReplenishmentOrderHistoryFacade, - }, - { - provide: LaunchDialogService, - useClass: MockLaunchDialogService, - }, - ], - }).compileComponents(); - }) - ); + beforeEach(waitForAsync(() => { + TestBed.configureTestingModule({ + imports: [I18nTestingModule, RouterTestingModule], + declarations: [ReplenishmentOrderCancellationComponent, MockUrlPipe], + providers: [ + { + provide: ReplenishmentOrderHistoryFacade, + useClass: MockReplenishmentOrderHistoryFacade, + }, + { + provide: LaunchDialogService, + useClass: MockLaunchDialogService, + }, + ], + }).compileComponents(); + })); beforeEach(() => { fixture = TestBed.createComponent(ReplenishmentOrderCancellationComponent); diff --git a/feature-libs/order/components/replenishment-order-history/replenishment-order-history.component.html b/feature-libs/order/components/replenishment-order-history/replenishment-order-history.component.html index a8ad09af473..718175a2ef2 100644 --- a/feature-libs/order/components/replenishment-order-history/replenishment-order-history.component.html +++ b/feature-libs/order/components/replenishment-order-history/replenishment-order-history.component.html @@ -15,11 +15,7 @@

{{ variant.name }}
{{ variant.value }}
@@ -198,11 +188,7 @@

{{ 'myInterests.header' | cxTranslate }}

{{ 'productDetails.noReviews' | cxTranslate }} diff --git a/projects/storefrontlib/cms-components/product/product-intro/product-intro.component.spec.ts b/projects/storefrontlib/cms-components/product/product-intro/product-intro.component.spec.ts index a0346b6d4b2..9415326f1c1 100644 --- a/projects/storefrontlib/cms-components/product/product-intro/product-intro.component.spec.ts +++ b/projects/storefrontlib/cms-components/product/product-intro/product-intro.component.spec.ts @@ -10,6 +10,7 @@ import { ComponentCreateEvent, ComponentDestroyEvent, } from '@spartacus/storefront'; +import { MockFeatureDirective } from 'projects/storefrontlib/shared/test/mock-feature-directive'; import { EMPTY, Observable, of } from 'rxjs'; import { CurrentProductService } from '../current-product.service'; import { ProductIntroComponent } from './product-intro.component'; @@ -47,28 +48,30 @@ describe('ProductIntroComponent in product', () => { let translationService: TranslationService; let eventService: EventService; - beforeEach( - waitForAsync(() => { - TestBed.configureTestingModule({ - imports: [I18nTestingModule], - declarations: [ProductIntroComponent, MockStarRatingComponent], - providers: [ - { - provide: CurrentProductService, - useClass: MockCurrentProductService, - }, - { - provide: TranslationService, - useClass: MockTranslationService, - }, - { - provide: EventService, - useClass: MockEventService, - }, - ], - }).compileComponents(); - }) - ); + beforeEach(waitForAsync(() => { + TestBed.configureTestingModule({ + imports: [I18nTestingModule], + declarations: [ + ProductIntroComponent, + MockStarRatingComponent, + MockFeatureDirective, + ], + providers: [ + { + provide: CurrentProductService, + useClass: MockCurrentProductService, + }, + { + provide: TranslationService, + useClass: MockTranslationService, + }, + { + provide: EventService, + useClass: MockEventService, + }, + ], + }).compileComponents(); + })); beforeEach(() => { translationService = TestBed.inject(TranslationService); @@ -213,7 +216,7 @@ describe('ProductIntroComponent in product', () => { productIntroComponent.product$ = of({ averageRating: 5, } as Product); - productIntroComponent['getReviewsComponent'] = () => ({} as HTMLElement); + productIntroComponent['getReviewsComponent'] = () => ({}) as HTMLElement; fixture.detectChanges(); expect(fixture.debugElement.nativeElement.innerText).toContain( @@ -253,7 +256,7 @@ describe('ProductIntroComponent in product', () => { productIntroComponent.product$ = of({ averageRating: 4, } as Product); - productIntroComponent['getReviewsComponent'] = () => ({} as HTMLElement); + productIntroComponent['getReviewsComponent'] = () => ({}) as HTMLElement; fixture.detectChanges(); expect(fixture.debugElement.nativeElement.innerText).not.toContain( diff --git a/projects/storefrontlib/cms-components/product/product-intro/product-intro.module.ts b/projects/storefrontlib/cms-components/product/product-intro/product-intro.module.ts index 0c11a2cd209..12baebf8782 100644 --- a/projects/storefrontlib/cms-components/product/product-intro/product-intro.module.ts +++ b/projects/storefrontlib/cms-components/product/product-intro/product-intro.module.ts @@ -6,12 +6,17 @@ import { CommonModule } from '@angular/common'; import { NgModule } from '@angular/core'; -import { CmsConfig, I18nModule, provideDefaultConfig } from '@spartacus/core'; +import { + CmsConfig, + FeaturesConfigModule, + I18nModule, + provideDefaultConfig, +} from '@spartacus/core'; import { StarRatingModule } from '../../../shared/components/star-rating/star-rating.module'; import { ProductIntroComponent } from './product-intro.component'; @NgModule({ - imports: [CommonModule, I18nModule, StarRatingModule], + imports: [CommonModule, I18nModule, StarRatingModule, FeaturesConfigModule], providers: [ provideDefaultConfig({ cmsComponents: { diff --git a/projects/storefrontlib/cms-components/product/product-list/container/product-list.component.spec.ts b/projects/storefrontlib/cms-components/product/product-list/container/product-list.component.spec.ts index 36669525e1a..fa764292bf0 100644 --- a/projects/storefrontlib/cms-components/product/product-list/container/product-list.component.spec.ts +++ b/projects/storefrontlib/cms-components/product/product-list/container/product-list.component.spec.ts @@ -101,52 +101,50 @@ describe('ProductListComponent', () => { let fixture: ComponentFixture; let componentService: ProductListComponentService; - beforeEach( - waitForAsync(() => { - TestBed.configureTestingModule({ - imports: [ - ListNavigationModule, - FormsModule, - RouterTestingModule, - I18nTestingModule, - InfiniteScrollModule, - SpinnerModule, - ], - providers: [ - { - provide: PageLayoutService, - useClass: MockPageLayoutService, - }, - { - provide: ProductListComponentService, - useClass: MockProductListComponentService, - }, - { - provide: ViewConfig, - useClass: MockViewConfig, - }, - { - provide: GlobalMessageService, - useClass: MockGlobalMessageService, - }, - ], - declarations: [ - ProductListComponent, - ProductFacetNavigationComponent, - ProductGridItemComponent, - MockStarRatingComponent, - MockAddToCartComponent, - MediaComponent, - ProductViewComponent, - MockProductListItemComponent, - MockUrlPipe, - MockCxIconComponent, - ProductScrollComponent, - MockFeatureLevelDirective, - ], - }).compileComponents(); - }) - ); + beforeEach(waitForAsync(() => { + TestBed.configureTestingModule({ + imports: [ + ListNavigationModule, + FormsModule, + RouterTestingModule, + I18nTestingModule, + InfiniteScrollModule, + SpinnerModule, + ], + providers: [ + { + provide: PageLayoutService, + useClass: MockPageLayoutService, + }, + { + provide: ProductListComponentService, + useClass: MockProductListComponentService, + }, + { + provide: ViewConfig, + useClass: MockViewConfig, + }, + { + provide: GlobalMessageService, + useClass: MockGlobalMessageService, + }, + ], + declarations: [ + ProductListComponent, + ProductFacetNavigationComponent, + ProductGridItemComponent, + MockStarRatingComponent, + MockAddToCartComponent, + MediaComponent, + ProductViewComponent, + MockProductListItemComponent, + MockUrlPipe, + MockCxIconComponent, + ProductScrollComponent, + MockFeatureLevelDirective, + ], + }).compileComponents(); + })); beforeEach(() => { fixture = TestBed.createComponent(ProductListComponent); diff --git a/projects/storefrontlib/cms-components/product/product-list/container/product-scroll/product-scroll.component.spec.ts b/projects/storefrontlib/cms-components/product/product-list/container/product-scroll/product-scroll.component.spec.ts index 1e4e33634d0..c71bfcdae5c 100644 --- a/projects/storefrontlib/cms-components/product/product-list/container/product-scroll/product-scroll.component.spec.ts +++ b/projects/storefrontlib/cms-components/product/product-list/container/product-scroll/product-scroll.component.spec.ts @@ -159,35 +159,33 @@ describe('ProductScrollComponent', () => { let fixture: ComponentFixture; let el: DebugElement; - beforeEach( - waitForAsync(() => { - TestBed.configureTestingModule({ - declarations: [ - ProductScrollComponent, - ProductGridItemComponent, - MockProductListItemComponent, - MockUrlPipe, - MediaComponent, - MockStarRatingComponent, - MockAddToCartComponent, - MockStyleIconsComponent, - MockFeatureLevelDirective, - ], - imports: [ - InfiniteScrollModule, - I18nTestingModule, - SpinnerModule, - RouterTestingModule, - ], - providers: [ - { - provide: ProductListComponentService, - useClass: MockProductListComponentService, - }, - ], - }).compileComponents(); - }) - ); + beforeEach(waitForAsync(() => { + TestBed.configureTestingModule({ + declarations: [ + ProductScrollComponent, + ProductGridItemComponent, + MockProductListItemComponent, + MockUrlPipe, + MediaComponent, + MockStarRatingComponent, + MockAddToCartComponent, + MockStyleIconsComponent, + MockFeatureLevelDirective, + ], + imports: [ + InfiniteScrollModule, + I18nTestingModule, + SpinnerModule, + RouterTestingModule, + ], + providers: [ + { + provide: ProductListComponentService, + useClass: MockProductListComponentService, + }, + ], + }).compileComponents(); + })); beforeEach(() => { fixture = TestBed.createComponent(ProductScrollComponent); diff --git a/projects/storefrontlib/cms-components/product/product-list/product-facet-navigation/active-facets/active-facets.component.spec.ts b/projects/storefrontlib/cms-components/product/product-list/product-facet-navigation/active-facets/active-facets.component.spec.ts index 4ad1d611b9a..44b559d18cc 100644 --- a/projects/storefrontlib/cms-components/product/product-list/product-facet-navigation/active-facets/active-facets.component.spec.ts +++ b/projects/storefrontlib/cms-components/product/product-list/product-facet-navigation/active-facets/active-facets.component.spec.ts @@ -36,19 +36,17 @@ describe('ActiveFacetsComponent', () => { let fixture: ComponentFixture; let element: DebugElement; - beforeEach( - waitForAsync(() => { - TestBed.configureTestingModule({ - imports: [I18nTestingModule, RouterTestingModule, KeyboardFocusModule], - declarations: [ActiveFacetsComponent, MockCxIconComponent], - providers: [{ provide: FacetService, useClass: MockFacetService }], - }) - .overrideComponent(ActiveFacetsComponent, { - set: { changeDetection: ChangeDetectionStrategy.Default }, - }) - .compileComponents(); + beforeEach(waitForAsync(() => { + TestBed.configureTestingModule({ + imports: [I18nTestingModule, RouterTestingModule, KeyboardFocusModule], + declarations: [ActiveFacetsComponent, MockCxIconComponent], + providers: [{ provide: FacetService, useClass: MockFacetService }], }) - ); + .overrideComponent(ActiveFacetsComponent, { + set: { changeDetection: ChangeDetectionStrategy.Default }, + }) + .compileComponents(); + })); beforeEach(() => { fixture = TestBed.createComponent(ActiveFacetsComponent); diff --git a/projects/storefrontlib/cms-components/product/product-list/product-facet-navigation/facet-list/facet-list.component.spec.ts b/projects/storefrontlib/cms-components/product/product-list/product-facet-navigation/facet-list/facet-list.component.spec.ts index 340738b531a..ac18db865dd 100644 --- a/projects/storefrontlib/cms-components/product/product-list/product-facet-navigation/facet-list/facet-list.component.spec.ts +++ b/projects/storefrontlib/cms-components/product/product-list/product-facet-navigation/facet-list/facet-list.component.spec.ts @@ -72,33 +72,31 @@ describe('FacetListComponent', () => { let focusService: KeyboardFocusService; let featureConfigService: FeatureConfigService; - beforeEach( - waitForAsync(() => { - TestBed.configureTestingModule({ - imports: [I18nTestingModule, RouterTestingModule], - declarations: [ - FacetListComponent, - MockIconComponent, - MockFacetComponent, - MockKeyboadFocusDirective, - MockFeatureDirective, - ], - providers: [ - { provide: FacetService, useClass: MockFacetService }, - { - provide: FeaturesConfig, - useValue: { - features: { level: '5.1' }, - }, + beforeEach(waitForAsync(() => { + TestBed.configureTestingModule({ + imports: [I18nTestingModule, RouterTestingModule], + declarations: [ + FacetListComponent, + MockIconComponent, + MockFacetComponent, + MockKeyboadFocusDirective, + MockFeatureDirective, + ], + providers: [ + { provide: FacetService, useClass: MockFacetService }, + { + provide: FeaturesConfig, + useValue: { + features: { level: '5.1' }, }, - ], - }) - .overrideComponent(FacetListComponent, { - set: { changeDetection: ChangeDetectionStrategy.Default }, - }) - .compileComponents(); + }, + ], }) - ); + .overrideComponent(FacetListComponent, { + set: { changeDetection: ChangeDetectionStrategy.Default }, + }) + .compileComponents(); + })); beforeEach(() => { fixture = TestBed.createComponent(FacetListComponent); diff --git a/projects/storefrontlib/cms-components/product/product-list/product-facet-navigation/facet/facet.component.html b/projects/storefrontlib/cms-components/product/product-list/product-facet-navigation/facet/facet.component.html index 2fdaa8dd28c..a5ed01f9a8f 100644 --- a/projects/storefrontlib/cms-components/product/product-list/product-facet-navigation/facet/facet.component.html +++ b/projects/storefrontlib/cms-components/product/product-list/product-facet-navigation/facet/facet.component.html @@ -18,7 +18,7 @@
{ let element: DebugElement; let facetService: FacetService; - beforeEach( - waitForAsync(() => { - TestBed.configureTestingModule({ - imports: [I18nTestingModule, RouterTestingModule], - declarations: [ - FacetComponent, - MockCxIconComponent, - MockKeyboadFocusDirective, - ], - providers: [ - { provide: FacetService, useClass: MockFacetService }, - { provide: FeatureConfigService, useClass: MockFeatureConfigService }, - ], - }) - .overrideComponent(FacetComponent, { - set: { changeDetection: ChangeDetectionStrategy.Default }, - }) - .compileComponents(); + beforeEach(waitForAsync(() => { + TestBed.configureTestingModule({ + imports: [I18nTestingModule, RouterTestingModule], + declarations: [ + FacetComponent, + MockCxIconComponent, + MockKeyboadFocusDirective, + ], + providers: [ + { provide: FacetService, useClass: MockFacetService }, + { provide: FeatureConfigService, useClass: MockFeatureConfigService }, + ], }) - ); + .overrideComponent(FacetComponent, { + set: { changeDetection: ChangeDetectionStrategy.Default }, + }) + .compileComponents(); + })); beforeEach(() => { fixture = TestBed.createComponent(FacetComponent); diff --git a/projects/storefrontlib/cms-components/product/product-list/product-facet-navigation/product-facet-navigation.component.spec.ts b/projects/storefrontlib/cms-components/product/product-list/product-facet-navigation/product-facet-navigation.component.spec.ts index 5ecae26839f..0ddafcee408 100644 --- a/projects/storefrontlib/cms-components/product/product-list/product-facet-navigation/product-facet-navigation.component.spec.ts +++ b/projects/storefrontlib/cms-components/product/product-list/product-facet-navigation/product-facet-navigation.component.spec.ts @@ -47,25 +47,23 @@ describe('ProductFacetNavigationComponent', () => { let fixture: ComponentFixture; let element: DebugElement; - beforeEach( - waitForAsync(() => { - TestBed.configureTestingModule({ - imports: [I18nTestingModule], - declarations: [ - ProductFacetNavigationComponent, - MockActiveFacetsComponent, - MockFacetListComponent, - MockCxIconComponent, - ], - providers: [ - { - provide: BreakpointService, - useClass: MockBreakpointService, - }, - ], - }).compileComponents(); - }) - ); + beforeEach(waitForAsync(() => { + TestBed.configureTestingModule({ + imports: [I18nTestingModule], + declarations: [ + ProductFacetNavigationComponent, + MockActiveFacetsComponent, + MockFacetListComponent, + MockCxIconComponent, + ], + providers: [ + { + provide: BreakpointService, + useClass: MockBreakpointService, + }, + ], + }).compileComponents(); + })); beforeEach(() => { fixture = TestBed.createComponent(ProductFacetNavigationComponent); @@ -78,16 +76,13 @@ describe('ProductFacetNavigationComponent', () => { }); describe('mobile', () => { - it( - 'should not have facet list when trigger button is visible', - waitForAsync(async () => { - await fixture.whenStable(); - fixture.detectChanges(); + it('should not have facet list when trigger button is visible', waitForAsync(async () => { + await fixture.whenStable(); + fixture.detectChanges(); - const facetList = element.query(By.css('cx-facet-list')); - expect(facetList).toBeNull(); - }) - ); + const facetList = element.query(By.css('cx-facet-list')); + expect(facetList).toBeNull(); + })); it('should invoke launch when trigger button is clicked', () => { spyOn(component, 'launch'); @@ -97,61 +92,46 @@ describe('ProductFacetNavigationComponent', () => { expect(component.launch).toHaveBeenCalled(); }); - it( - 'should have facet list after trigger button is clicked', - waitForAsync(async () => { - fixture.detectChanges(); - const button: HTMLElement = element.query( - By.css('button') - ).nativeElement; - button.click(); - - await fixture.whenStable(); - fixture.detectChanges(); - - const facetList = element.query(By.css('cx-facet-list')).nativeElement; - expect(facetList).toBeTruthy(); - }) - ); - - it( - 'should invoke close when closeList is emitted', - waitForAsync(async () => { - spyOn(component, 'close'); - fixture.detectChanges(); - const button: HTMLElement = element.query( - By.css('button') - ).nativeElement; - button.click(); - - await fixture.whenStable(); - fixture.detectChanges(); - - const facetList = element.query(By.css('cx-facet-list')).nativeElement; - facetList.dispatchEvent(new Event('closeList')); - - expect(component.close).toHaveBeenCalled(); - }) - ); + it('should have facet list after trigger button is clicked', waitForAsync(async () => { + fixture.detectChanges(); + const button: HTMLElement = element.query(By.css('button')).nativeElement; + button.click(); + + await fixture.whenStable(); + fixture.detectChanges(); + + const facetList = element.query(By.css('cx-facet-list')).nativeElement; + expect(facetList).toBeTruthy(); + })); + + it('should invoke close when closeList is emitted', waitForAsync(async () => { + spyOn(component, 'close'); + fixture.detectChanges(); + const button: HTMLElement = element.query(By.css('button')).nativeElement; + button.click(); + + await fixture.whenStable(); + fixture.detectChanges(); + + const facetList = element.query(By.css('cx-facet-list')).nativeElement; + facetList.dispatchEvent(new Event('closeList')); + + expect(component.close).toHaveBeenCalled(); + })); }); describe('desktop', () => { - it( - 'should have facet list when trigger button is hidden', - waitForAsync(async () => { - fixture.detectChanges(); - - const button: HTMLElement = element.query( - By.css('button') - ).nativeElement; - button.style.display = 'none'; - - await fixture.whenStable(); - fixture.detectChanges(); - - const facetList = element.query(By.css('cx-facet-list')).nativeElement; - expect(facetList).toBeTruthy(); - }) - ); + it('should have facet list when trigger button is hidden', waitForAsync(async () => { + fixture.detectChanges(); + + const button: HTMLElement = element.query(By.css('button')).nativeElement; + button.style.display = 'none'; + + await fixture.whenStable(); + fixture.detectChanges(); + + const facetList = element.query(By.css('cx-facet-list')).nativeElement; + expect(facetList).toBeTruthy(); + })); }); }); diff --git a/projects/storefrontlib/cms-components/product/product-list/product-facet-navigation/services/product-facet.service.ts b/projects/storefrontlib/cms-components/product/product-list/product-facet-navigation/services/product-facet.service.ts index 8b4800c510f..946d5759876 100644 --- a/projects/storefrontlib/cms-components/product/product-list/product-facet-navigation/services/product-facet.service.ts +++ b/projects/storefrontlib/cms-components/product/product-list/product-facet-navigation/services/product-facet.service.ts @@ -63,7 +63,7 @@ export class ProductFacetService { ({ facets: result.facets, activeFacets: result.breadcrumbs, - } as FacetList) + }) as FacetList ) ); diff --git a/projects/storefrontlib/cms-components/product/product-list/product-grid-item/product-grid-item.component.spec.ts b/projects/storefrontlib/cms-components/product/product-list/product-grid-item/product-grid-item.component.spec.ts index f4d05a569d3..31198c4f758 100644 --- a/projects/storefrontlib/cms-components/product/product-list/product-grid-item/product-grid-item.component.spec.ts +++ b/projects/storefrontlib/cms-components/product/product-list/product-grid-item/product-grid-item.component.spec.ts @@ -94,37 +94,35 @@ describe('ProductGridItemComponent in product-list', () => { }, }; - beforeEach( - waitForAsync(() => { - TestBed.configureTestingModule({ - imports: [RouterTestingModule, I18nTestingModule, OutletModule], - declarations: [ - ProductGridItemComponent, - MockMediaComponent, - MockAddToCartComponent, - MockStarRatingComponent, - MockUrlPipe, - MockCxIconComponent, - MockFeatureLevelDirective, - MockOutletDirective, - ], - providers: [ - { - provide: RoutingService, - useClass: MockRoutingService, - }, - { - provide: ProductService, - useClass: MockProductService, - }, - ], - }) - .overrideComponent(ProductGridItemComponent, { - set: { changeDetection: ChangeDetectionStrategy.Default }, - }) - .compileComponents(); + beforeEach(waitForAsync(() => { + TestBed.configureTestingModule({ + imports: [RouterTestingModule, I18nTestingModule, OutletModule], + declarations: [ + ProductGridItemComponent, + MockMediaComponent, + MockAddToCartComponent, + MockStarRatingComponent, + MockUrlPipe, + MockCxIconComponent, + MockFeatureLevelDirective, + MockOutletDirective, + ], + providers: [ + { + provide: RoutingService, + useClass: MockRoutingService, + }, + { + provide: ProductService, + useClass: MockProductService, + }, + ], }) - ); + .overrideComponent(ProductGridItemComponent, { + set: { changeDetection: ChangeDetectionStrategy.Default }, + }) + .compileComponents(); + })); beforeEach(() => { fixture = TestBed.createComponent(ProductGridItemComponent); diff --git a/projects/storefrontlib/cms-components/product/product-list/product-list-item/product-list-item.component.spec.ts b/projects/storefrontlib/cms-components/product/product-list/product-list-item/product-list-item.component.spec.ts index 6f262a30e91..f258e010d30 100644 --- a/projects/storefrontlib/cms-components/product/product-list/product-list-item/product-list-item.component.spec.ts +++ b/projects/storefrontlib/cms-components/product/product-list/product-list-item/product-list-item.component.spec.ts @@ -94,37 +94,35 @@ describe('ProductListItemComponent in product-list', () => { }, }; - beforeEach( - waitForAsync(() => { - TestBed.configureTestingModule({ - imports: [RouterTestingModule, I18nTestingModule, OutletModule], - declarations: [ - ProductListItemComponent, - MockPictureComponent, - MockAddToCartComponent, - MockStarRatingComponent, - MockUrlPipe, - MockCxIconComponent, - MockFeatureDirective, - MockOutletDirective, - ], - providers: [ - { - provide: RoutingService, - useClass: MockRoutingService, - }, - { - provide: ProductService, - useClass: MockProductService, - }, - ], - }) - .overrideComponent(ProductListItemComponent, { - set: { changeDetection: ChangeDetectionStrategy.Default }, - }) - .compileComponents(); + beforeEach(waitForAsync(() => { + TestBed.configureTestingModule({ + imports: [RouterTestingModule, I18nTestingModule, OutletModule], + declarations: [ + ProductListItemComponent, + MockPictureComponent, + MockAddToCartComponent, + MockStarRatingComponent, + MockUrlPipe, + MockCxIconComponent, + MockFeatureDirective, + MockOutletDirective, + ], + providers: [ + { + provide: RoutingService, + useClass: MockRoutingService, + }, + { + provide: ProductService, + useClass: MockProductService, + }, + ], }) - ); + .overrideComponent(ProductListItemComponent, { + set: { changeDetection: ChangeDetectionStrategy.Default }, + }) + .compileComponents(); + })); beforeEach(() => { fixture = TestBed.createComponent(ProductListItemComponent); diff --git a/projects/storefrontlib/cms-components/product/product-list/product-view/product-view.component.html b/projects/storefrontlib/cms-components/product/product-list/product-view/product-view.component.html index df5f131b597..4b9f3ebe867 100644 --- a/projects/storefrontlib/cms-components/product/product-list/product-view/product-view.component.html +++ b/projects/storefrontlib/cms-components/product/product-list/product-view/product-view.component.html @@ -7,8 +7,8 @@ viewMode === iconTypes.GRID ? ('productView.gridView' | cxTranslate) : viewMode === iconTypes.LIST - ? ('productView.listView' | cxTranslate) - : null + ? ('productView.listView' | cxTranslate) + : null }}" > { let component: ProductViewComponent; let fixture: ComponentFixture; - beforeEach( - waitForAsync(() => { - TestBed.configureTestingModule({ - imports: [NgSelectModule, FormsModule, I18nTestingModule], - declarations: [ProductViewComponent, MockCxIconComponent], - }).compileComponents(); - }) - ); + beforeEach(waitForAsync(() => { + TestBed.configureTestingModule({ + imports: [NgSelectModule, FormsModule, I18nTestingModule], + declarations: [ProductViewComponent, MockCxIconComponent], + }).compileComponents(); + })); beforeEach(() => { fixture = TestBed.createComponent(ProductViewComponent); diff --git a/projects/storefrontlib/cms-components/product/product-summary/product-summary.component.spec.ts b/projects/storefrontlib/cms-components/product/product-summary/product-summary.component.spec.ts index 6eac8fce276..8d8f24efc3f 100644 --- a/projects/storefrontlib/cms-components/product/product-summary/product-summary.component.spec.ts +++ b/projects/storefrontlib/cms-components/product/product-summary/product-summary.component.spec.ts @@ -23,20 +23,18 @@ describe('ProductSummaryComponent in product', () => { let currentProductService: CurrentProductService; let featureConfigService: FeatureConfigService; - beforeEach( - waitForAsync(() => { - TestBed.configureTestingModule({ - imports: [ItemCounterModule, I18nTestingModule, RouterTestingModule], - declarations: [ProductSummaryComponent, OutletDirective], - providers: [ - { - provide: CurrentProductService, - useClass: MockCurrentProductService, - }, - ], - }).compileComponents(); - }) - ); + beforeEach(waitForAsync(() => { + TestBed.configureTestingModule({ + imports: [ItemCounterModule, I18nTestingModule, RouterTestingModule], + declarations: [ProductSummaryComponent, OutletDirective], + providers: [ + { + provide: CurrentProductService, + useClass: MockCurrentProductService, + }, + ], + }).compileComponents(); + })); beforeEach(() => { fixture = TestBed.createComponent(ProductSummaryComponent); diff --git a/projects/storefrontlib/cms-components/product/product-tabs/product-attributes/product-attributes.component.spec.ts b/projects/storefrontlib/cms-components/product/product-tabs/product-attributes/product-attributes.component.spec.ts index a178ff96350..8dd5665c339 100644 --- a/projects/storefrontlib/cms-components/product/product-tabs/product-attributes/product-attributes.component.spec.ts +++ b/projects/storefrontlib/cms-components/product/product-tabs/product-attributes/product-attributes.component.spec.ts @@ -57,20 +57,18 @@ describe('ProductAttributesComponent in product', () => { let productAttributesComponent: ProductAttributesComponent; let fixture: ComponentFixture; - beforeEach( - waitForAsync(() => { - TestBed.configureTestingModule({ - imports: [I18nTestingModule], - declarations: [ProductAttributesComponent], - providers: [ - { - provide: CurrentProductService, - useClass: MockCurrentProductService, - }, - ], - }).compileComponents(); - }) - ); + beforeEach(waitForAsync(() => { + TestBed.configureTestingModule({ + imports: [I18nTestingModule], + declarations: [ProductAttributesComponent], + providers: [ + { + provide: CurrentProductService, + useClass: MockCurrentProductService, + }, + ], + }).compileComponents(); + })); beforeEach(() => { fixture = TestBed.createComponent(ProductAttributesComponent); diff --git a/projects/storefrontlib/cms-components/product/product-tabs/product-details-tab/product-details-tab.component.spec.ts b/projects/storefrontlib/cms-components/product/product-tabs/product-details-tab/product-details-tab.component.spec.ts index f4160a51dd7..33753bc5cc7 100644 --- a/projects/storefrontlib/cms-components/product/product-tabs/product-details-tab/product-details-tab.component.spec.ts +++ b/projects/storefrontlib/cms-components/product/product-tabs/product-details-tab/product-details-tab.component.spec.ts @@ -66,27 +66,25 @@ describe('ProductDetailsTabComponent', () => { let productDetailsTabComponent: ProductDetailsTabComponent; let fixture: ComponentFixture; - beforeEach( - waitForAsync(() => { - TestBed.configureTestingModule({ - declarations: [ProductDetailsTabComponent], - providers: [ - { - provide: CurrentProductService, - useClass: MockCurrentProductService, - }, - { - provide: CmsComponentData, - useClass: MockCmsComponentData, - }, - { - provide: CmsService, - useClass: MockCmsService, - }, - ], - }).compileComponents(); - }) - ); + beforeEach(waitForAsync(() => { + TestBed.configureTestingModule({ + declarations: [ProductDetailsTabComponent], + providers: [ + { + provide: CurrentProductService, + useClass: MockCurrentProductService, + }, + { + provide: CmsComponentData, + useClass: MockCmsComponentData, + }, + { + provide: CmsService, + useClass: MockCmsService, + }, + ], + }).compileComponents(); + })); beforeEach(() => { fixture = TestBed.createComponent(ProductDetailsTabComponent); diff --git a/projects/storefrontlib/cms-components/product/product-tabs/product-reviews/product-reviews.component.html b/projects/storefrontlib/cms-components/product/product-tabs/product-reviews/product-reviews.component.html index aca8886dc84..ae92b426952 100644 --- a/projects/storefrontlib/cms-components/product/product-tabs/product-reviews/product-reviews.component.html +++ b/projects/storefrontlib/cms-components/product/product-tabs/product-reviews/product-reviews.component.html @@ -27,7 +27,7 @@

{{ 'productReview.overallRating' | cxTranslate }}

{{ review.headline }}
diff --git a/projects/storefrontlib/cms-components/product/product-tabs/product-reviews/product-reviews.component.spec.ts b/projects/storefrontlib/cms-components/product/product-tabs/product-reviews/product-reviews.component.spec.ts index e04d28e17a8..7f358a2ea3c 100644 --- a/projects/storefrontlib/cms-components/product/product-tabs/product-reviews/product-reviews.component.spec.ts +++ b/projects/storefrontlib/cms-components/product/product-tabs/product-reviews/product-reviews.component.spec.ts @@ -47,33 +47,31 @@ describe('ProductReviewsComponent in product', () => { let productReviewsComponent: ProductReviewsComponent; let fixture: ComponentFixture; - beforeEach( - waitForAsync(() => { - TestBed.configureTestingModule({ - imports: [ - ReactiveFormsModule, - ItemCounterModule, - I18nTestingModule, - FormErrorsModule, - ], - providers: [ - { - provide: ProductReviewService, - useClass: MockProductReviewService, - }, - { - provide: CurrentProductService, - useClass: MockCurrentProductService, - }, - ], - declarations: [ - MockStarRatingComponent, - ProductReviewsComponent, - MockFeatureDirective, - ], - }).compileComponents(); - }) - ); + beforeEach(waitForAsync(() => { + TestBed.configureTestingModule({ + imports: [ + ReactiveFormsModule, + ItemCounterModule, + I18nTestingModule, + FormErrorsModule, + ], + providers: [ + { + provide: ProductReviewService, + useClass: MockProductReviewService, + }, + { + provide: CurrentProductService, + useClass: MockCurrentProductService, + }, + ], + declarations: [ + MockStarRatingComponent, + ProductReviewsComponent, + MockFeatureDirective, + ], + }).compileComponents(); + })); beforeEach(() => { fixture = TestBed.createComponent(ProductReviewsComponent); diff --git a/projects/storefrontlib/cms-components/product/stock-notification/stock-notification-dialog/stock-notification-dialog.component.html b/projects/storefrontlib/cms-components/product/stock-notification/stock-notification-dialog/stock-notification-dialog.component.html index 111b02838bf..85d0d16a581 100644 --- a/projects/storefrontlib/cms-components/product/stock-notification/stock-notification-dialog/stock-notification-dialog.component.html +++ b/projects/storefrontlib/cms-components/product/stock-notification/stock-notification-dialog/stock-notification-dialog.component.html @@ -89,13 +89,7 @@