diff --git a/goofy-client/jest.preset.js b/goofy-client/jest.preset.js index b8a72f65fa09470050a75498372b0f4f5fee0fae..79434a8134103a9ef786f638fd29233544bc12bd 100644 --- a/goofy-client/jest.preset.js +++ b/goofy-client/jest.preset.js @@ -4,5 +4,5 @@ module.exports = { ...nxPreset, moduleNameMapper: { 'lodash-es': 'lodash', - }, + } }; diff --git a/goofy-client/libs/navigation/src/lib/header-container/header-container.component.spec.ts b/goofy-client/libs/navigation/src/lib/header-container/header-container.component.spec.ts index 182368735add61848f9a6eb55d4d75f055f1f96b..3d435ef7eed587df8648678ed71a935fd3a993a3 100644 --- a/goofy-client/libs/navigation/src/lib/header-container/header-container.component.spec.ts +++ b/goofy-client/libs/navigation/src/lib/header-container/header-container.component.spec.ts @@ -2,6 +2,7 @@ import { ComponentFixture, TestBed } from '@angular/core/testing'; import { AppService } from '@goofy-client/app-shared'; import { mock } from '@goofy-client/test-utils'; import { OAuthService } from 'angular-oauth2-oidc'; +import { configureTestSuite } from 'ng-bullet'; import { MockComponent } from 'ng-mocks'; import { BehaviorSubject } from 'rxjs'; import { HeaderContainerComponent } from './header-container.component'; @@ -15,7 +16,7 @@ describe('HeaderContainerComponent', () => { const appService = { ...mock(AppService), getDarkMode: () => darkModeSubj }; const authService = mock(OAuthService); - beforeEach(() => { + configureTestSuite(() => { TestBed.configureTestingModule({ declarations: [ HeaderContainerComponent, @@ -31,7 +32,7 @@ describe('HeaderContainerComponent', () => { useValue: authService } ] - }).compileComponents(); + }) }); beforeEach(() => { diff --git a/goofy-client/libs/navigation/src/lib/header-container/header/header.component.spec.ts b/goofy-client/libs/navigation/src/lib/header-container/header/header.component.spec.ts index 35238c55622d91c5bae4e45a63499babeb3bd869..8f562a006f5adab2880de12afc5c9a44dc086cd5 100644 --- a/goofy-client/libs/navigation/src/lib/header-container/header/header.component.spec.ts +++ b/goofy-client/libs/navigation/src/lib/header-container/header/header.component.spec.ts @@ -1,6 +1,7 @@ import { ComponentFixture, TestBed } from '@angular/core/testing'; import { RouterTestingModule } from '@angular/router/testing'; import { UiModule } from '@goofy-client/ui'; +import { configureTestSuite } from 'ng-bullet'; import { HeaderComponent } from './header.component'; import { SettingsComponent } from './settings/settings.component'; @@ -8,8 +9,8 @@ describe('HeaderComponent', () => { let component: HeaderComponent; let fixture: ComponentFixture<HeaderComponent>; - beforeEach(async () => { - await TestBed.configureTestingModule({ + configureTestSuite(() => { + TestBed.configureTestingModule({ imports: [ UiModule, RouterTestingModule @@ -18,7 +19,7 @@ describe('HeaderComponent', () => { HeaderComponent, SettingsComponent ] - }).compileComponents(); + }) }); beforeEach(() => { diff --git a/goofy-client/libs/navigation/src/lib/navigation.module.spec.ts b/goofy-client/libs/navigation/src/lib/navigation.module.spec.ts index f6f240527ee0d8e3908afe11a24c1174d61ccf1a..73112852a5d24791d4c954240fe5bfb27181f735 100644 --- a/goofy-client/libs/navigation/src/lib/navigation.module.spec.ts +++ b/goofy-client/libs/navigation/src/lib/navigation.module.spec.ts @@ -1,14 +1,20 @@ import { TestBed } from '@angular/core/testing'; +import { configureTestSuite } from 'ng-bullet'; import { NavigationModule } from './navigation.module'; describe('UiModule', () => { - beforeEach(() => { + configureTestSuite(() => { TestBed.configureTestingModule({ imports: [NavigationModule], - }).compileComponents(); + + }) }); it('should create', () => { expect(NavigationModule).toBeDefined(); }); }); + + + + diff --git a/goofy-client/libs/ui/src/lib/snackbar/snackbar.component.spec.ts b/goofy-client/libs/ui/src/lib/snackbar/snackbar.component.spec.ts index 0db78cd3ec8ea82198d8a374a54dc0ad444bb4b3..fc4aafb4c3fb9b0d37946a807ac5c6e9398fb44c 100644 --- a/goofy-client/libs/ui/src/lib/snackbar/snackbar.component.spec.ts +++ b/goofy-client/libs/ui/src/lib/snackbar/snackbar.component.spec.ts @@ -4,6 +4,7 @@ import { MatSnackBarModule, MatSnackBarRef, MAT_SNACK_BAR_DATA } from '@angular/ import { mock } from '@goofy-client/test-utils'; import { CommandLinkRel } from 'libs/command-shared/src/lib/command.linkrel'; import { createCommandResource } from 'libs/command-shared/test/command'; +import { configureTestSuite } from 'ng-bullet'; import { SnackbarComponent } from './snackbar.component'; import { SnackBarData } from './snackbar.service'; @@ -16,8 +17,8 @@ describe('SnackbarComponent', () => { const revokeButton: string = '[data-test-id="revoke-button"]'; - beforeEach(async () => { - await TestBed.configureTestingModule({ + configureTestSuite(() => { + TestBed.configureTestingModule({ imports: [ MatSnackBarModule, MatIconModule @@ -33,7 +34,7 @@ describe('SnackbarComponent', () => { useValue: snackBarRef } ] - }).compileComponents(); + }) }); beforeEach(() => { diff --git a/goofy-client/libs/ui/src/lib/ui/progress-bar/progress-bar.component.spec.ts b/goofy-client/libs/ui/src/lib/ui/progress-bar/progress-bar.component.spec.ts index 9afce086b9933ce964f730c9e6728f0c038d2892..ad13c56d1f663f3cf155834db015a3f71691815a 100644 --- a/goofy-client/libs/ui/src/lib/ui/progress-bar/progress-bar.component.spec.ts +++ b/goofy-client/libs/ui/src/lib/ui/progress-bar/progress-bar.component.spec.ts @@ -1,6 +1,7 @@ import { ComponentFixture, TestBed } from '@angular/core/testing'; import { MatProgressBar } from '@angular/material/progress-bar'; import { createEmptyStateResource } from '@goofy-client/tech-shared'; +import { configureTestSuite } from 'ng-bullet'; import { ProgressBarComponent } from './progress-bar.component'; describe('ProgressBarComponent', () => { @@ -9,13 +10,13 @@ describe('ProgressBarComponent', () => { const overlaySelector = '[data-test-class="progressbar-overlay"]' - beforeEach(async () => { - await TestBed.configureTestingModule({ + configureTestSuite(() => { + TestBed.configureTestingModule({ declarations: [ ProgressBarComponent, MatProgressBar ] - }).compileComponents(); + }) }); beforeEach(() => { diff --git a/goofy-client/libs/ui/src/lib/ui/spinner/spinner.component.spec.ts b/goofy-client/libs/ui/src/lib/ui/spinner/spinner.component.spec.ts index a0f1a06817b74c8ac9546e6c6db55a78453d9b11..8aa423f9884ede3d4e4af5b603fbacb7544d8271 100644 --- a/goofy-client/libs/ui/src/lib/ui/spinner/spinner.component.spec.ts +++ b/goofy-client/libs/ui/src/lib/ui/spinner/spinner.component.spec.ts @@ -2,6 +2,7 @@ import { ComponentFixture, TestBed } from '@angular/core/testing'; import { MatIcon } from '@angular/material/icon'; import { MatSpinner } from '@angular/material/progress-spinner'; import { createEmptyStateResource } from '@goofy-client/tech-shared'; +import { configureTestSuite } from 'ng-bullet'; import { SpinnerComponent } from './spinner.component'; describe('SpinnerComponent', () => { @@ -9,14 +10,14 @@ describe('SpinnerComponent', () => { let fixture: ComponentFixture<SpinnerComponent>; const spinnerSelector = '[data-test-class="spinner"]' - beforeEach(async () => { - await TestBed.configureTestingModule({ + configureTestSuite(() => { + TestBed.configureTestingModule({ declarations: [ SpinnerComponent, MatIcon, MatSpinner - ], - }).compileComponents(); + ] + }) }); beforeEach(() => { diff --git a/goofy-client/libs/vorgang-detail/src/lib/vorgang-detail-page/vorgang-detail-area/vorgang-detail-action-buttons/vorgang-detail-action-buttons.component.spec.ts b/goofy-client/libs/vorgang-detail/src/lib/vorgang-detail-page/vorgang-detail-area/vorgang-detail-action-buttons/vorgang-detail-action-buttons.component.spec.ts index 1871a288c841c2c7afcf31b479b9c8f3036ee7e2..4388591a79a33b42dfac80a158f544ccd9f1df40 100644 --- a/goofy-client/libs/vorgang-detail/src/lib/vorgang-detail-page/vorgang-detail-area/vorgang-detail-action-buttons/vorgang-detail-action-buttons.component.spec.ts +++ b/goofy-client/libs/vorgang-detail/src/lib/vorgang-detail-page/vorgang-detail-area/vorgang-detail-action-buttons/vorgang-detail-action-buttons.component.spec.ts @@ -9,6 +9,7 @@ import { WiedervorlageListLinkRel } from '@goofy-client/wiedervorlage-shared'; import { createCommandResource } from 'libs/command-shared/test/command'; import { HasLinkPipe } from 'libs/tech-shared/src/lib/pipes/has-resource-link'; import { createVorgangWithEingangResource } from 'libs/vorgang-shared/test/vorgang'; +import { configureTestSuite } from 'ng-bullet'; import { MockComponent } from 'ng-mocks'; import { VorgangDetailActionButtonsComponent } from './vorgang-detail-action-buttons.component'; @@ -27,8 +28,8 @@ describe('VorgangDetailActionButtonsComponent', () => { const createWiedervorlageButton: string = '[data-test-id="create-wiedervorlage-icon-button"]'; - beforeEach(async () => { - await TestBed.configureTestingModule({ + configureTestSuite(() => { + TestBed.configureTestingModule({ declarations: [ VorgangDetailActionButtonsComponent, MockComponent(IconButtonWithSpinnerComponent), @@ -38,7 +39,7 @@ describe('VorgangDetailActionButtonsComponent', () => { imports: [ RouterTestingModule ] - }).compileComponents(); + }) }); beforeEach(() => { diff --git a/goofy-client/libs/vorgang-detail/src/lib/vorgang-detail-page/vorgang-detail-area/vorgang-detail-formular-buttons/vorgang-detail-formular-buttons.component.spec.ts b/goofy-client/libs/vorgang-detail/src/lib/vorgang-detail-page/vorgang-detail-area/vorgang-detail-formular-buttons/vorgang-detail-formular-buttons.component.spec.ts index f8f9f17976f496c9ae68a1dabdcc092aff9371b6..237dd23a67999a6bbefe17f2435b81fa0195f34e 100644 --- a/goofy-client/libs/vorgang-detail/src/lib/vorgang-detail-page/vorgang-detail-area/vorgang-detail-formular-buttons/vorgang-detail-formular-buttons.component.spec.ts +++ b/goofy-client/libs/vorgang-detail/src/lib/vorgang-detail-page/vorgang-detail-area/vorgang-detail-formular-buttons/vorgang-detail-formular-buttons.component.spec.ts @@ -6,6 +6,7 @@ import { VorgangWithEingangLinkRel } from '@goofy-client/vorgang-shared'; import { createCommandResource } from 'libs/command-shared/test/command'; import { HasLinkPipe } from 'libs/tech-shared/src/lib/pipes/has-resource-link'; import { createVorgangWithEingangResource } from 'libs/vorgang-shared/test/vorgang'; +import { configureTestSuite } from 'ng-bullet'; import { MockComponent } from 'ng-mocks'; import { VorgangDetailFormularButtonsComponent } from './vorgang-detail-formular-buttons.component'; @@ -22,14 +23,14 @@ describe('VorgangDetailFormularButtonsComponent', () => { const abschliessenButton: string = '[data-test-id="abschliessen-button"]'; const wiedereroeffnenButton: string = '[data-test-id="wiedereroeffnen-button"]'; - beforeEach(async () => { - await TestBed.configureTestingModule({ + configureTestSuite(() => { + TestBed.configureTestingModule({ declarations: [ VorgangDetailFormularButtonsComponent, MockComponent(ButtonWithSpinnerComponent), HasLinkPipe ] - }).compileComponents(); + }) }); beforeEach(() => { diff --git a/goofy-client/libs/vorgang/src/lib/vorgang-list-container/vorgang-list-container.component.spec.ts b/goofy-client/libs/vorgang/src/lib/vorgang-list-container/vorgang-list-container.component.spec.ts index cdce43af6efa2a2d852ebe9eac276e813a2d2880..0d96eecf680dca7c4d183c9b4a2dfbc7c9d4da44 100644 --- a/goofy-client/libs/vorgang/src/lib/vorgang-list-container/vorgang-list-container.component.spec.ts +++ b/goofy-client/libs/vorgang/src/lib/vorgang-list-container/vorgang-list-container.component.spec.ts @@ -1,6 +1,7 @@ import { ComponentFixture, TestBed } from '@angular/core/testing'; import { mock } from '@goofy-client/test-utils'; import { VorgangService } from '@goofy-client/vorgang-shared'; +import { configureTestSuite } from 'ng-bullet'; import { MockComponent } from 'ng-mocks'; import { VorgangListContainerComponent } from './vorgang-list-container.component'; import { VorgangListComponent } from './vorgang-list/vorgang-list.component'; @@ -11,8 +12,8 @@ describe('VorgangListContainerComponent', () => { const vorgangService = mock(VorgangService); - beforeEach(async () => { - await TestBed.configureTestingModule({ + configureTestSuite(() => { + TestBed.configureTestingModule({ declarations: [ VorgangListContainerComponent, MockComponent(VorgangListComponent) @@ -23,7 +24,7 @@ describe('VorgangListContainerComponent', () => { useValue: vorgangService } ], - }).compileComponents(); + }) }); beforeEach(() => { diff --git a/goofy-client/libs/vorgang/src/lib/vorgang-list-container/vorgang-list/vorgang-list-item/vorgang-list-item.component.spec.ts b/goofy-client/libs/vorgang/src/lib/vorgang-list-container/vorgang-list/vorgang-list-item/vorgang-list-item.component.spec.ts index dd6ab94659b240f1a9d49feb9e15a13c43c3534b..360b1a7c71b62dd80812da08343c42ac625c22a6 100644 --- a/goofy-client/libs/vorgang/src/lib/vorgang-list-container/vorgang-list/vorgang-list-item/vorgang-list-item.component.spec.ts +++ b/goofy-client/libs/vorgang/src/lib/vorgang-list-container/vorgang-list/vorgang-list-item/vorgang-list-item.component.spec.ts @@ -17,6 +17,7 @@ import { UserIconComponent } from 'libs/ui/src/lib/ui/user-icon/user-icon.compon import { AktenzeichenComponent } from 'libs/vorgang-shared/src/lib/aktenzeichen/aktenzeichen.component'; import { StatusDotComponent } from 'libs/vorgang-shared/src/lib/status-dot/status-dot.component'; import { createVorgangResource } from 'libs/vorgang-shared/test/vorgang'; +import { configureTestSuite } from 'ng-bullet'; import { MockComponent } from 'ng-mocks'; import { VorgangListItemComponent } from './vorgang-list-item.component'; @@ -26,8 +27,8 @@ describe('VorgangListItemComponent', () => { let component: VorgangListItemComponent; let fixture: ComponentFixture<VorgangListItemComponent>; - beforeEach(async () => { - await TestBed.configureTestingModule({ + configureTestSuite(() => { + TestBed.configureTestingModule({ imports: [ RouterTestingModule, MatIconTestingModule, @@ -48,10 +49,9 @@ describe('VorgangListItemComponent', () => { { provide: LOCALE_ID, useValue: 'de' }, { provide: MAT_DATE_LOCALE, useValue: 'de-DE' } ], - }).compileComponents(); + }) }); - beforeEach(() => { fixture = TestBed.createComponent(VorgangListItemComponent); component = fixture.componentInstance; diff --git a/goofy-client/libs/vorgang/src/lib/vorgang.module.spec.ts b/goofy-client/libs/vorgang/src/lib/vorgang.module.spec.ts index 62744d057e46f449709d7e88ebdc6103c7e6c4ba..c8c12111053f643baf0ae37837a2470dd09194cd 100644 --- a/goofy-client/libs/vorgang/src/lib/vorgang.module.spec.ts +++ b/goofy-client/libs/vorgang/src/lib/vorgang.module.spec.ts @@ -1,11 +1,12 @@ import { TestBed } from '@angular/core/testing'; +import { configureTestSuite } from 'ng-bullet'; import { VorgangModule } from './vorgang.module'; describe('VorgangModule', () => { - beforeEach(() => { + configureTestSuite(() => { TestBed.configureTestingModule({ imports: [VorgangModule], - }).compileComponents(); + }) }); it('should create', () => { diff --git a/goofy-client/libs/wiedervorlage/src/lib/wiedervorlage-list-in-vorgang-container/wiedervorlage-list-in-vorgang/wiedervorlage-in-vorgang/wiedervorlage-in-vorgang.component.spec.ts b/goofy-client/libs/wiedervorlage/src/lib/wiedervorlage-list-in-vorgang-container/wiedervorlage-list-in-vorgang/wiedervorlage-in-vorgang/wiedervorlage-in-vorgang.component.spec.ts index 223f3f1034df1e70935d35ed25c91696b34e6cce..dcac2c406a0920d2df00f53120ec162ce1206419 100644 --- a/goofy-client/libs/wiedervorlage/src/lib/wiedervorlage-list-in-vorgang-container/wiedervorlage-list-in-vorgang/wiedervorlage-in-vorgang/wiedervorlage-in-vorgang.component.spec.ts +++ b/goofy-client/libs/wiedervorlage/src/lib/wiedervorlage-list-in-vorgang-container/wiedervorlage-list-in-vorgang/wiedervorlage-in-vorgang/wiedervorlage-in-vorgang.component.spec.ts @@ -11,6 +11,7 @@ import { ConvertForDataTestPipe, FormatListDatePipe, ToResourceUriPipe } from '@ import { ExpansionPanelComponent } from '@goofy-client/ui'; import { WiedervorlageResource } from '@goofy-client/wiedervorlage-shared'; import { createWiedervorlageResource } from 'libs/wiedervorlage-shared/test/wiedervorlage'; +import { configureTestSuite } from 'ng-bullet'; import { MockComponent } from 'ng-mocks'; import { WiedervorlageStatusComponent } from '../../../wiedervorlage-status/wiedervorlage-status.component'; import { WiedervorlageInVorgangComponent } from './wiedervorlage-in-vorgang.component'; @@ -25,8 +26,8 @@ describe('WiedervorlageInVorgangComponent', () => { const expandButton: string = '[data-test-class="expand-button"]'; const wiedervorlage: WiedervorlageResource = createWiedervorlageResource(); - beforeEach(async () => { - await TestBed.configureTestingModule({ + configureTestSuite(() => { + TestBed.configureTestingModule({ declarations: [ WiedervorlageInVorgangComponent, MockComponent(ExpansionPanelComponent), @@ -45,7 +46,7 @@ describe('WiedervorlageInVorgangComponent', () => { { provide: LOCALE_ID, useValue: 'de' }, { provide: MAT_DATE_LOCALE, useValue: 'de-DE' } ] - }).compileComponents(); + }) }); beforeEach(() => { diff --git a/goofy-client/libs/wiedervorlage/src/lib/wiedervorlage-page-container/wiedervorlage-page-container.component.spec.ts b/goofy-client/libs/wiedervorlage/src/lib/wiedervorlage-page-container/wiedervorlage-page-container.component.spec.ts index 1cbbbe99ee2ddb3413c5de9e05b1100d3fdeabb1..bee26a8b6c2ff9921ecf79231e8a729a4dae63b0 100644 --- a/goofy-client/libs/wiedervorlage/src/lib/wiedervorlage-page-container/wiedervorlage-page-container.component.spec.ts +++ b/goofy-client/libs/wiedervorlage/src/lib/wiedervorlage-page-container/wiedervorlage-page-container.component.spec.ts @@ -10,6 +10,7 @@ import { WiedervorlageService } from '@goofy-client/wiedervorlage-shared'; import { hot } from 'jest-marbles'; import { CommandLinkRel } from 'libs/command-shared/src/lib/command.linkrel'; import { createCommandResource } from 'libs/command-shared/test/command'; +import { configureTestSuite } from 'ng-bullet'; import { MockComponent } from 'ng-mocks'; import { WiedervorlageStatusComponent } from '../wiedervorlage-status/wiedervorlage-status.component'; import { WiedervorlagePageContainerComponent } from './wiedervorlage-page-container.component'; @@ -32,8 +33,8 @@ describe('WiedervorlagePageContainerComponent', () => { const commandStateResource: StateResource<CommandResource> = createStateResource(createCommandResource()); const commandWithError: StateResource<CommandResource> = createStateResource(createCommandResource([CommandLinkRel.EFFECTED_RESOURCE])); - beforeEach(async () => { - await TestBed.configureTestingModule({ + configureTestSuite(() => { + TestBed.configureTestingModule({ declarations: [ WiedervorlagePageContainerComponent, MockComponent(WiedervorlagePageComponent), @@ -67,7 +68,7 @@ describe('WiedervorlagePageContainerComponent', () => { useValue: navigationService }, ] - }).compileComponents(); + }) }); beforeEach(() => { diff --git a/goofy-client/libs/wiedervorlage/src/lib/wiedervorlage-page-container/wiedervorlage-page/breadcrumb/breadcrumb.component.spec.ts b/goofy-client/libs/wiedervorlage/src/lib/wiedervorlage-page-container/wiedervorlage-page/breadcrumb/breadcrumb.component.spec.ts index 57b51cb9cdd3331a17b07b40cffea1f061b0d5b0..49a329e40df66ea7495331db2df77a6fd7f6b2e5 100644 --- a/goofy-client/libs/wiedervorlage/src/lib/wiedervorlage-page-container/wiedervorlage-page/breadcrumb/breadcrumb.component.spec.ts +++ b/goofy-client/libs/wiedervorlage/src/lib/wiedervorlage-page-container/wiedervorlage-page/breadcrumb/breadcrumb.component.spec.ts @@ -2,6 +2,7 @@ import { ComponentFixture, TestBed } from '@angular/core/testing'; import { mock } from '@goofy-client/test-utils'; import { SpinnerComponent } from '@goofy-client/ui'; import { AktenzeichenComponent, VorgangService } from '@goofy-client/vorgang-shared'; +import { configureTestSuite } from 'ng-bullet'; import { MockComponent } from 'ng-mocks'; import { BreadcrumbComponent } from './breadcrumb.component'; @@ -11,8 +12,8 @@ describe('BreadcrumbComponent', () => { const vorgangService = mock(VorgangService); - beforeEach(async () => { - await TestBed.configureTestingModule({ + configureTestSuite(() => { + TestBed.configureTestingModule({ declarations: [ BreadcrumbComponent, MockComponent(AktenzeichenComponent), @@ -24,7 +25,7 @@ describe('BreadcrumbComponent', () => { useValue: vorgangService } ] - }).compileComponents(); + }) }); beforeEach(() => { diff --git a/goofy-client/libs/wiedervorlage/src/lib/wiedervorlage-page-container/wiedervorlage-page/wiedervorlage-action-buttons/wiedervorlage-action-buttons.component.spec.ts b/goofy-client/libs/wiedervorlage/src/lib/wiedervorlage-page-container/wiedervorlage-page/wiedervorlage-action-buttons/wiedervorlage-action-buttons.component.spec.ts index 7892fa4bf01b474125a00881a96453249a432fc4..366219182b5f2108c08e7fed6fb234a910df3789 100644 --- a/goofy-client/libs/wiedervorlage/src/lib/wiedervorlage-page-container/wiedervorlage-page/wiedervorlage-action-buttons/wiedervorlage-action-buttons.component.spec.ts +++ b/goofy-client/libs/wiedervorlage/src/lib/wiedervorlage-page-container/wiedervorlage-page/wiedervorlage-action-buttons/wiedervorlage-action-buttons.component.spec.ts @@ -5,6 +5,7 @@ import { mock } from '@goofy-client/test-utils'; import { IconButtonWithSpinnerComponent } from '@goofy-client/ui'; import { WiedervorlageLinkRel } from '@goofy-client/wiedervorlage-shared'; import { createWiedervorlageResource } from 'libs/wiedervorlage-shared/test/wiedervorlage'; +import { configureTestSuite } from 'ng-bullet'; import { MockComponent } from 'ng-mocks'; import { WiedervorlageFormService } from '../wiedervorlage-form/wiedervorlage.formservice'; import { WiedervorlageActionButtonsComponent } from './wiedervorlage-action-buttons.component'; @@ -18,8 +19,8 @@ describe('WiedervorlageActionButtonsComponent', () => { const wiedereroeffnenButtonSelector = '[data-test-id="wiedereroeffnen-icon-button"]' const erledigenButtonSelector = '[data-test-id="erledigen-icon-button"]' - beforeEach(async () => { - await TestBed.configureTestingModule({ + configureTestSuite(() => { + TestBed.configureTestingModule({ declarations: [ WiedervorlageActionButtonsComponent, MatIcon, @@ -32,7 +33,7 @@ describe('WiedervorlageActionButtonsComponent', () => { useValue: wiedervorlageFormService } ] - }).compileComponents(); + }) }); beforeEach(() => { diff --git a/goofy-client/libs/wiedervorlage/src/lib/wiedervorlage-page-container/wiedervorlage-page/wiedervorlage-form/wiedervorlage-form.component.spec.ts b/goofy-client/libs/wiedervorlage/src/lib/wiedervorlage-page-container/wiedervorlage-page/wiedervorlage-form/wiedervorlage-form.component.spec.ts index b29e8b73b884475ae652828b511eccf10e451dbc..500b2c51589a9735839287a78f079dbb3bccd202 100644 --- a/goofy-client/libs/wiedervorlage/src/lib/wiedervorlage-page-container/wiedervorlage-page/wiedervorlage-form/wiedervorlage-form.component.spec.ts +++ b/goofy-client/libs/wiedervorlage/src/lib/wiedervorlage-page-container/wiedervorlage-page/wiedervorlage-form/wiedervorlage-form.component.spec.ts @@ -9,6 +9,7 @@ import { DateEditorComponent } from 'libs/ui/src/lib/ui/date-editor/date-editor. import { TextEditorComponent } from 'libs/ui/src/lib/ui/text-editor/text-editor.component'; import { TextAreaEditorComponent } from 'libs/ui/src/lib/ui/textarea-editor/textarea-editor.component'; import { createWiedervorlageResource } from 'libs/wiedervorlage-shared/test/wiedervorlage'; +import { configureTestSuite } from 'ng-bullet'; import { MockComponent } from 'ng-mocks'; import { WiedervorlageFormComponent } from './wiedervorlage-form.component'; import { WiedervorlageFormService } from './wiedervorlage.formservice'; @@ -20,8 +21,8 @@ describe('WiedervorlageFormComponent', () => { const wiedervorlageFormService = new WiedervorlageFormService(new FormBuilder(), useFromMock(mock(WiedervorlageService))); const wiedervorlage: WiedervorlageResource = createWiedervorlageResource(); - beforeEach(async () => { - await TestBed.configureTestingModule({ + configureTestSuite(() => { + TestBed.configureTestingModule({ declarations: [ WiedervorlageFormComponent, MockComponent(ButtonWithSpinnerComponent), @@ -40,7 +41,7 @@ describe('WiedervorlageFormComponent', () => { useValue: wiedervorlageFormService } ] - }).compileComponents(); + }) }); beforeEach(() => { diff --git a/goofy-client/libs/wiedervorlage/src/lib/wiedervorlage.module.spec.ts b/goofy-client/libs/wiedervorlage/src/lib/wiedervorlage.module.spec.ts index ecc515d17dee11c063a01ec2a9f6c383d68ab043..3a29bc1d4e50f850c84335e34cecceab861e728e 100644 --- a/goofy-client/libs/wiedervorlage/src/lib/wiedervorlage.module.spec.ts +++ b/goofy-client/libs/wiedervorlage/src/lib/wiedervorlage.module.spec.ts @@ -1,11 +1,12 @@ import { TestBed } from '@angular/core/testing'; +import { configureTestSuite } from 'ng-bullet'; import { WiedervorlageModule } from './wiedervorlage.module'; describe('WiedervorlageModule', () => { - beforeEach(() => { + configureTestSuite(() => { TestBed.configureTestingModule({ imports: [WiedervorlageModule], - }).compileComponents(); + }) }); it('should create', () => { diff --git a/goofy-client/package-lock.json b/goofy-client/package-lock.json index 95e97938a2d8d54307af8db398cb9babb4171a98..47e60d172b1f187b1290d3890c74447c767f12d1 100644 --- a/goofy-client/package-lock.json +++ b/goofy-client/package-lock.json @@ -13112,6 +13112,23 @@ "integrity": "sha1-yobR/ogoFpsBICCOPchCS524NCw=", "dev": true }, + "ng-bullet": { + "version": "1.0.3", + "resolved": "https://registry.npmjs.org/ng-bullet/-/ng-bullet-1.0.3.tgz", + "integrity": "sha512-qacsE/w/pLlBxebort1rkrE2B4Vc3idutcpe7tYiHVarz0V6Q5SN8E3d6NUp4UFBMOucpHlCpaASp7qEOsxM1Q==", + "dev": true, + "requires": { + "tslib": "^1.9.0" + }, + "dependencies": { + "tslib": { + "version": "1.14.1", + "resolved": "https://registry.npmjs.org/tslib/-/tslib-1.14.1.tgz", + "integrity": "sha512-Xni35NKzjgMrwevysHTCArtLDpPvye8zV/0E4EyYn43P7/7qvQwPh9BGkHewbMulVntbigmcT7rdX3BNo9wRJg==", + "dev": true + } + } + }, "ng-mocks": { "version": "11.9.0", "resolved": "https://registry.npmjs.org/ng-mocks/-/ng-mocks-11.9.0.tgz", diff --git a/goofy-client/package.json b/goofy-client/package.json index 2fd97c5acc26a5a6b7bb99e3a5319e39f620bea4..6d75d2482d6e8698ea2f38e938b7d13e47a7424e 100644 --- a/goofy-client/package.json +++ b/goofy-client/package.json @@ -1,118 +1,119 @@ { - "name": "goofy-client", - "version": "0.0.0", - "license": "MIT", - "scripts": { - "nx": "nx", - "ng": "nx", - "postinstall": "node ./decorate-angular-cli.js && ngcc --properties es2015 browser module main --first-only --create-ivy-entry-points", - "start": "run-s \"nx -- serve --port 4300 --disable-host-check --proxy-config proxy.conf.json\" --", - "start:devbe": "run-s \"nx -- serve --port 4300 --disable-host-check --proxy-config proxy.dev.conf.json\" --", - "build": "ng build", - "test": "jest test a", - "test:cov": "jest --coverage", - "test:lib": "run-s \"ng -- test {1} --watchAll\" --", - "test:debug:lib": "run-s \"ng -- test {1} --detectOpenHandles --watchAll\" --", - "ci-build": "ng build --outputHashing=all", - "ci-prodBuild": "ng build --prod --outputHashing=all --prod", - "ci-test": "jest test a --ci --coverage --testResultsProcessor='jest-sonar-reporter'", - "ci-sonar": "sonar-scanner", - "lint": "nx workspace-lint && ng lint", - "affected:apps": "nx affected:apps", - "affected:libs": "nx affected:libs", - "affected:build": "nx affected:build", - "affected:e2e": "nx affected:e2e", - "affected:test": "nx affected:test", - "affected:lint": "nx affected:lint", - "affected:dep-graph": "nx affected:dep-graph", - "affected": "nx affected", - "format": "nx format:write", - "format:write": "nx format:write", - "format:check": "nx format:check", - "update": "ng update @nrwl/workspace", - "dep-graph": "nx dep-graph", - "help": "nx help", - "favicon": "real-favicon generate favicon/faviconDescription.json favicon/faviconData.json src/favicon", - "cypress:open": "npx cypress open --project apps/goofy-e2e", - "cypress:run": "npx cypress run --project apps/goofy-e2e", - "cypress:version": "npx cypress version", - "cypress:merge-report": "mochawesome-merge apps/goofy-e2e/reports/mochawesome-report/*.json > apps/goofy-e2e/reports/report.json", - "cypress:generate-html": "marge apps/goofy-e2e/reports/report.json -f report -o apps/goofy-e2e/reports/", - "cypress:delete-old-reports": "node apps/goofy-e2e/src/support/delete-old-reports.ts", - "cypress:generate-report": "npm run cypress:merge-report ; npm run cypress:generate-html", - "cypress:ci-run": "npm run cypress:delete-old-reports ; npm run cypress:run -- --config-file ./cypress-ci.json ; test=$(echo \"$?\") ; npm run cypress:generate-report ; exit $test", - "workspace-generator": "nx workspace-generator", - "sonar-scanner": "jest test a --coverage --testResultsProcessor='jest-sonar-reporter' && sonar-scanner -Dsonar.host.url=https://sonarqube.ozg-sh.de/ -Dsonar.login=25dfb9ee83a79b0f4af445c63405651fcf391ee8" - }, - "private": true, - "dependencies": { - "@angular/animations": "11.1.2", - "@angular/cdk": "^11.1.2", - "@angular/common": "11.1.2", - "@angular/compiler": "11.1.2", - "@angular/core": "11.1.2", - "@angular/forms": "11.1.2", - "@angular/material": "^11.1.2", - "@angular/material-moment-adapter": "^11.2.3", - "@angular/platform-browser": "11.1.2", - "@angular/platform-browser-dynamic": "11.1.2", - "@angular/router": "11.1.2", - "@ngxp/rest": "^4.0.0", - "@nrwl/angular": "11.2.12", - "angular-oauth2-oidc": "^10.0.3", - "angular-oauth2-oidc-jwks": "^9.0.0", - "faker": "^5.4.0", - "include-media": "^1.4.9", - "lodash-es": "^4.17.21", - "material-design-icons-iconfont": "^6.1.0", - "mongodb": "^3.6.3", - "ng-mocks": "^11.9.0", - "rxjs": "~6.5.5", - "tslib": "^2.0.0", - "typeface-roboto": "^1.1.13", - "whatwg-fetch": "^3.6.2", - "zone.js": "^0.10.2", - "moment": "^2.29.1" - }, - "devDependencies": { - "@angular-devkit/build-angular": "0.1100.7", - "@angular-eslint/eslint-plugin": "~1.0.0", - "@angular-eslint/eslint-plugin-template": "~1.0.0", - "@angular-eslint/template-parser": "~1.0.0", - "@angular/cli": "11.0.7", - "@angular/compiler-cli": "11.1.2", - "@angular/language-service": "11.1.2", - "@nrwl/cli": "11.2.12", - "@nrwl/cypress": "11.2.12", - "@nrwl/eslint-plugin-nx": "11.2.12", - "@nrwl/jest": "11.2.12", - "@nrwl/workspace": "11.2.12", - "@testing-library/jest-dom": "^5.11.9", - "@types/jest": "26.0.8", - "@types/lodash-es": "^4.17.3", - "@types/node": "12.12.38", - "@typescript-eslint/eslint-plugin": "4.3.0", - "@typescript-eslint/parser": "4.3.0", - "codelyzer": "6.0.1", - "cypress-mochawesome-reporter": "^1.3.0", - "dotenv": "6.2.0", - "eslint": "7.10.0", - "eslint-config-prettier": "6.0.0", - "eslint-plugin-cypress": "^2.10.3", - "jest": "^26.2.2", - "jest-createspyobj": "^2.0.0", - "jest-junit": "^12.0.0", - "jest-marbles": "^2.5.1", - "jest-preset-angular": "8.3.2", - "jest-sonar-reporter": "^2.0.0", - "prettier": "2.2.1", - "sonarqube-scanner": "^2.8.0", - "ts-jest": "26.4.0", - "ts-node": "9.1.1", - "tslint": "6.1.3", - "typescript": "^4.0.7" - }, - "optionalDependencies": { - "cypress": "^6.6.0" - } + "name": "goofy-client", + "version": "0.0.0", + "license": "MIT", + "scripts": { + "nx": "nx", + "ng": "nx", + "postinstall": "node ./decorate-angular-cli.js && ngcc --properties es2015 browser module main --first-only --create-ivy-entry-points", + "start": "run-s \"nx -- serve --port 4300 --disable-host-check --proxy-config proxy.conf.json\" --", + "start:devbe": "run-s \"nx -- serve --port 4300 --disable-host-check --proxy-config proxy.dev.conf.json\" --", + "build": "ng build", + "test": "jest test a --runInBand", + "test:cov": "jest --coverage", + "test:lib": "run-s \"ng -- test {1} --runInBand --watchAll\" --", + "test:debug:lib": "run-s \"ng -- test {1} --detectOpenHandles --runInBand --watchAll\" --", + "ci-build": "ng build --outputHashing=all", + "ci-prodBuild": "ng build --prod --outputHashing=all --prod", + "ci-test": "jest test a --ci --coverage --testResultsProcessor='jest-sonar-reporter'", + "ci-sonar": "sonar-scanner", + "lint": "nx workspace-lint && ng lint", + "affected:apps": "nx affected:apps", + "affected:libs": "nx affected:libs", + "affected:build": "nx affected:build", + "affected:e2e": "nx affected:e2e", + "affected:test": "nx affected:test", + "affected:lint": "nx affected:lint", + "affected:dep-graph": "nx affected:dep-graph", + "affected": "nx affected", + "format": "nx format:write", + "format:write": "nx format:write", + "format:check": "nx format:check", + "update": "ng update @nrwl/workspace", + "dep-graph": "nx dep-graph", + "help": "nx help", + "favicon": "real-favicon generate favicon/faviconDescription.json favicon/faviconData.json src/favicon", + "cypress:open": "npx cypress open --project apps/goofy-e2e", + "cypress:run": "npx cypress run --project apps/goofy-e2e", + "cypress:version": "npx cypress version", + "cypress:merge-report": "mochawesome-merge apps/goofy-e2e/reports/mochawesome-report/*.json > apps/goofy-e2e/reports/report.json", + "cypress:generate-html": "marge apps/goofy-e2e/reports/report.json -f report -o apps/goofy-e2e/reports/", + "cypress:delete-old-reports": "node apps/goofy-e2e/src/support/delete-old-reports.ts", + "cypress:generate-report": "npm run cypress:merge-report ; npm run cypress:generate-html", + "cypress:ci-run": "npm run cypress:delete-old-reports ; npm run cypress:run -- --config-file ./cypress-ci.json ; test=$(echo \"$?\") ; npm run cypress:generate-report ; exit $test", + "workspace-generator": "nx workspace-generator", + "sonar-scanner": "jest test a --coverage --testResultsProcessor='jest-sonar-reporter' && sonar-scanner -Dsonar.host.url=https://sonarqube.ozg-sh.de/ -Dsonar.login=25dfb9ee83a79b0f4af445c63405651fcf391ee8" + }, + "private": true, + "dependencies": { + "@angular/animations": "11.1.2", + "@angular/cdk": "^11.1.2", + "@angular/common": "11.1.2", + "@angular/compiler": "11.1.2", + "@angular/core": "11.1.2", + "@angular/forms": "11.1.2", + "@angular/material": "^11.1.2", + "@angular/material-moment-adapter": "^11.2.3", + "@angular/platform-browser": "11.1.2", + "@angular/platform-browser-dynamic": "11.1.2", + "@angular/router": "11.1.2", + "@ngxp/rest": "^4.0.0", + "@nrwl/angular": "11.2.12", + "angular-oauth2-oidc": "^10.0.3", + "angular-oauth2-oidc-jwks": "^9.0.0", + "faker": "^5.4.0", + "include-media": "^1.4.9", + "lodash-es": "^4.17.21", + "material-design-icons-iconfont": "^6.1.0", + "mongodb": "^3.6.3", + "ng-mocks": "^11.9.0", + "rxjs": "~6.5.5", + "tslib": "^2.0.0", + "typeface-roboto": "^1.1.13", + "whatwg-fetch": "^3.6.2", + "zone.js": "^0.10.2", + "moment": "^2.29.1" + }, + "devDependencies": { + "@angular-devkit/build-angular": "0.1100.7", + "@angular-eslint/eslint-plugin": "~1.0.0", + "@angular-eslint/eslint-plugin-template": "~1.0.0", + "@angular-eslint/template-parser": "~1.0.0", + "@angular/cli": "11.0.7", + "@angular/compiler-cli": "11.1.2", + "@angular/language-service": "11.1.2", + "@nrwl/cli": "11.2.12", + "@nrwl/cypress": "11.2.12", + "@nrwl/eslint-plugin-nx": "11.2.12", + "@nrwl/jest": "11.2.12", + "@nrwl/workspace": "11.2.12", + "@testing-library/jest-dom": "^5.11.9", + "@types/jest": "26.0.8", + "@types/lodash-es": "^4.17.3", + "@types/node": "12.12.38", + "@typescript-eslint/eslint-plugin": "4.3.0", + "@typescript-eslint/parser": "4.3.0", + "codelyzer": "6.0.1", + "cypress-mochawesome-reporter": "^1.3.0", + "dotenv": "6.2.0", + "eslint": "7.10.0", + "eslint-config-prettier": "6.0.0", + "eslint-plugin-cypress": "^2.10.3", + "jest": "^26.2.2", + "jest-createspyobj": "^2.0.0", + "jest-junit": "^12.0.0", + "jest-marbles": "^2.5.1", + "jest-preset-angular": "8.3.2", + "jest-sonar-reporter": "^2.0.0", + "ng-bullet": "^1.0.3", + "prettier": "2.2.1", + "sonarqube-scanner": "^2.8.0", + "ts-jest": "26.4.0", + "ts-node": "9.1.1", + "tslint": "6.1.3", + "typescript": "^4.0.7" + }, + "optionalDependencies": { + "cypress": "^6.6.0" + } }