Skip to content

Commit

Permalink
chore(#8554): reduce spurious angular test logging
Browse files Browse the repository at this point in the history
  • Loading branch information
garethbowen authored Oct 25, 2023
1 parent 7202de5 commit 1e66b9e
Show file tree
Hide file tree
Showing 23 changed files with 164 additions and 29 deletions.
2 changes: 1 addition & 1 deletion webapp/src/ts/modules/modules.module.ts
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ import { MatIconModule } from '@angular/material/icon';
import { MatButtonModule } from '@angular/material/button';
import { MatMenuModule } from '@angular/material/menu';
import { MatBottomSheetModule } from '@angular/material/bottom-sheet';
import { MatExpansionModule} from '@angular/material/expansion';
import { MatExpansionModule } from '@angular/material/expansion';
import { MatDialogModule } from '@angular/material/dialog';

import { PipesModule } from '@mm-pipes/pipes.module';
Expand Down
7 changes: 5 additions & 2 deletions webapp/tests/karma/test.ts
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,9 @@ chai.config.truncateThreshold = 0;
// First, initialize the Angular testing environment.
getTestBed().initTestEnvironment(
BrowserDynamicTestingModule,
platformBrowserDynamicTesting()
platformBrowserDynamicTesting(),
{
errorOnUnknownElements: true,
errorOnUnknownProperties: true
}
);

Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,6 @@ import { MatBottomSheet } from '@angular/material/bottom-sheet';
import { MatDialog } from '@angular/material/dialog';
import { Router } from '@angular/router';
import { TranslateFakeLoader, TranslateLoader, TranslateModule } from '@ngx-translate/core';
import { Subject } from 'rxjs';
import { provideMockStore } from '@ngrx/store/testing';
import sinon from 'sinon';
import { expect } from 'chai';
Expand All @@ -28,7 +27,7 @@ describe('FastActionButtonComponent', () => {

beforeEach(async () => {
router = {
events: { pipe: sinon.stub().returns(new Subject()) },
events: { pipe: sinon.stub().returns({ subscribe: sinon.stub() }) },
};
authService = { has: sinon.stub() };
responsiveService = { isMobile: sinon.stub() };
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
import { ComponentFixture, fakeAsync, flush, TestBed, tick } from '@angular/core/testing';
import { FormsModule } from '@angular/forms';
import sinon from 'sinon';
import { expect } from 'chai';
import { TranslateFakeLoader, TranslateLoader, TranslateModule } from '@ngx-translate/core';
Expand Down Expand Up @@ -29,6 +30,7 @@ describe('Search Bar Component', () => {
.configureTestingModule({
imports: [
TranslateModule.forRoot({ loader: { provide: TranslateLoader, useClass: TranslateFakeLoader } }),
FormsModule
],
declarations: [
SearchBarComponent,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,8 @@ import { expect } from 'chai';
import { BulkDeleteConfirmComponent } from '@mm-modals/bulk-delete-confirm/bulk-delete-confirm.component';
import { DeleteDocsService } from '@mm-services/delete-docs.service';
import { TelemetryService } from '@mm-services/telemetry.service';
import { ModalLayoutComponent } from '@mm-components/modal-layout/modal-layout.component';
import { PanelHeaderComponent } from '@mm-components/panel-header/panel-header.component';

describe('BulkDeleteConfirmComponent', () => {
let component: BulkDeleteConfirmComponent;
Expand All @@ -29,7 +31,11 @@ describe('BulkDeleteConfirmComponent', () => {
FormsModule,
TranslateModule.forRoot({ loader: { provide: TranslateLoader, useClass: TranslateFakeLoader } }),
],
declarations: [ BulkDeleteConfirmComponent ],
declarations: [
BulkDeleteConfirmComponent,
ModalLayoutComponent,
PanelHeaderComponent
],
providers: [
{ provide: DeleteDocsService, useValue: deleteDocsService },
{ provide: TelemetryService, useValue: telemetryService },
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,8 @@ import { DeleteDocConfirmComponent } from '@mm-modals/delete-doc-confirm/delete-
import { DbService } from '@mm-services/db.service';
import { GlobalActions } from '@mm-actions/global';
import { Selectors } from '@mm-selectors/index';
import { ModalLayoutComponent } from '@mm-components/modal-layout/modal-layout.component';
import { PanelHeaderComponent } from '@mm-components/panel-header/panel-header.component';

describe('DeleteDocConfirmComponent', () => {
let component: DeleteDocConfirmComponent;
Expand Down Expand Up @@ -43,7 +45,11 @@ describe('DeleteDocConfirmComponent', () => {
imports: [
TranslateModule.forRoot({ loader: { provide: TranslateLoader, useClass: TranslateFakeLoader } }),
],
declarations: [ DeleteDocConfirmComponent ],
declarations: [
DeleteDocConfirmComponent,
ModalLayoutComponent,
PanelHeaderComponent,
],
providers: [
provideMockStore({ selectors: mockedSelectors }),
{ provide: DbService, useValue: dbService },
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,8 @@ import { TranslateFakeLoader, TranslateLoader, TranslateModule } from '@ngx-tran
import { EditGroupService } from '@mm-services/edit-group.service';
import { SettingsService } from '@mm-services/settings.service';
import { EditMessageGroupComponent } from '@mm-modals/edit-message-group/edit-message-group.component';
import { ModalLayoutComponent } from '@mm-components/modal-layout/modal-layout.component';
import { PanelHeaderComponent } from '@mm-components/panel-header/panel-header.component';

describe('EditMessageGroupComponent', () => {
let component: EditMessageGroupComponent;
Expand All @@ -28,7 +30,11 @@ describe('EditMessageGroupComponent', () => {
imports: [
TranslateModule.forRoot({ loader: { provide: TranslateLoader, useClass: TranslateFakeLoader } }),
],
declarations: [ EditMessageGroupComponent ],
declarations: [
EditMessageGroupComponent,
ModalLayoutComponent,
PanelHeaderComponent,
],
providers: [
{ provide: MatDialogRef, useValue: matDialogRef },
{ provide: MAT_DIALOG_DATA, useValue: {} },
Expand Down
8 changes: 7 additions & 1 deletion webapp/tests/karma/ts/modals/edit-report.component.spec.ts
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,8 @@ import { EditReportComponent } from '@mm-modals/edit-report/edit-report.componen
import { ContactTypesService } from '@mm-services/contact-types.service';
import { Select2SearchService } from '@mm-services/select2-search.service';
import { UpdateFacilityService } from '@mm-services/update-facility.service';
import { ModalLayoutComponent } from '@mm-components/modal-layout/modal-layout.component';
import { PanelHeaderComponent } from '@mm-components/panel-header/panel-header.component';

describe('EditReportComponent', () => {
let component: EditReportComponent;
Expand All @@ -32,7 +34,11 @@ describe('EditReportComponent', () => {
imports: [
TranslateModule.forRoot({ loader: { provide: TranslateLoader, useClass: TranslateFakeLoader } }),
],
declarations: [ EditReportComponent ],
declarations: [
EditReportComponent,
ModalLayoutComponent,
PanelHeaderComponent,
],
providers: [
{ provide: ContactTypesService, useValue: contactTypesService },
{ provide: Select2SearchService, useValue: select2SearchService },
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,8 @@ import { EditUserSettingsComponent } from '@mm-modals/edit-user/edit-user-settin
import { UserSettingsService } from '@mm-services/user-settings.service';
import { LanguagesService } from '@mm-services/languages.service';
import { SetLanguageService, LanguageService } from '@mm-services/language.service';
import { ModalLayoutComponent } from '@mm-components/modal-layout/modal-layout.component';
import { PanelHeaderComponent } from '@mm-components/panel-header/panel-header.component';

describe('EditUserSettingsComponent', () => {

Expand Down Expand Up @@ -51,12 +53,16 @@ describe('EditUserSettingsComponent', () => {

return TestBed
.configureTestingModule({
declarations: [ EditUserSettingsComponent ],
imports: [
TranslateModule.forRoot({ loader: { provide: TranslateLoader, useClass: TranslateFakeLoader } }),
RouterTestingModule,
FormsModule,
],
declarations: [
EditUserSettingsComponent,
ModalLayoutComponent,
PanelHeaderComponent,
],
providers: [
{ provide: UserSettingsService, useValue: userSettingsService },
{ provide: LanguageService, useValue: languageService },
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,8 @@ import { TranslateFakeLoader, TranslateLoader, TranslateModule } from '@ngx-tran

import { NavigationConfirmComponent } from '@mm-modals/navigation-confirm/navigation-confirm.component';
import { TelemetryService } from '@mm-services/telemetry.service';
import { ModalLayoutComponent } from '@mm-components/modal-layout/modal-layout.component';
import { PanelHeaderComponent } from '@mm-components/panel-header/panel-header.component';

describe('NavigationConfirmModal', () => {
let fixture:ComponentFixture<NavigationConfirmComponent>;
Expand All @@ -22,7 +24,11 @@ describe('NavigationConfirmModal', () => {
imports: [
TranslateModule.forRoot({ loader: { provide: TranslateLoader, useClass: TranslateFakeLoader } }),
],
declarations: [ NavigationConfirmComponent ],
declarations: [
NavigationConfirmComponent,
ModalLayoutComponent,
PanelHeaderComponent,
],
providers: [
{ provide: TelemetryService, useValue: telemetryService },
{ provide: MatDialogRef, useValue: matDialogRef },
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,8 @@ import { Select2SearchService } from '@mm-services/select2-search.service';
import { FormatProvider } from '@mm-providers/format.provider';
import { SettingsService } from '@mm-services/settings.service';
import { ContactTypesService } from '@mm-services/contact-types.service';
import { ModalLayoutComponent } from '@mm-components/modal-layout/modal-layout.component';
import { PanelHeaderComponent } from '@mm-components/panel-header/panel-header.component';

describe('SendMessageComponent', () => {
let component: SendMessageComponent;
Expand All @@ -36,7 +38,11 @@ describe('SendMessageComponent', () => {
FormsModule,
TranslateModule.forRoot({ loader: { provide: TranslateLoader, useClass: TranslateFakeLoader } }),
],
declarations: [ SendMessageComponent ],
declarations: [
SendMessageComponent,
ModalLayoutComponent,
PanelHeaderComponent,
],
providers: [
{ provide: SendMessageService, useValue: sendMessageService },
{ provide: Select2SearchService, useValue: select2SearchService },
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,9 @@ import { Selectors } from '@mm-selectors/index';
import { GlobalActions } from '@mm-actions/global';
import { TelemetryService } from '@mm-services/telemetry.service';
import { FeedbackService } from '@mm-services/feedback.service';
import { ModalLayoutComponent } from '@mm-components/modal-layout/modal-layout.component';
import { PanelHeaderComponent } from '@mm-components/panel-header/panel-header.component';
import { EnketoComponent } from '@mm-components/enketo/enketo.component';

describe('TrainingCardsComponent', () => {
let fixture: ComponentFixture<TrainingCardsComponent>;
Expand Down Expand Up @@ -65,7 +68,12 @@ describe('TrainingCardsComponent', () => {
imports: [
TranslateModule.forRoot({ loader: { provide: TranslateLoader, useClass: TranslateFakeLoader } }),
],
declarations: [ TrainingCardsComponent ],
declarations: [
TrainingCardsComponent,
ModalLayoutComponent,
PanelHeaderComponent,
EnketoComponent,
],
providers: [
provideMockStore({ selectors: mockedSelectors }),
{ provide: GeolocationService, useValue: geolocationService },
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,10 @@ import { ResponsiveService } from '@mm-services/responsive.service';
import { ContactMutedService } from '@mm-services/contact-muted.service';
import { MutingTransition } from '@mm-services/transitions/muting.transition';
import { FastActionButtonService } from '@mm-services/fast-action-button.service';
import { FastActionButtonComponent } from '@mm-components/fast-action-button/fast-action-button.component';
import { AuthService } from '@mm-services/auth.service';
import { MatBottomSheet } from '@angular/material/bottom-sheet';
import { MatDialog } from '@angular/material/dialog';

describe('Contacts content component', () => {
let component: ContactsContentComponent;
Expand Down Expand Up @@ -107,15 +111,19 @@ describe('Contacts content component', () => {
{ selector: Selectors.getFilters, value: {} },
];
activatedRoute = { params: of({}), snapshot: { params: {} } };
router = { navigate: sinon.stub() };
router = { navigate: sinon.stub(), events: { pipe: sinon.stub().returns({ subscribe: sinon.stub() }) } };
responsiveService = { isMobile: sinon.stub() };

return TestBed
.configureTestingModule({
imports: [
TranslateModule.forRoot({ loader: { provide: TranslateLoader, useClass: TranslateFakeLoader } }),
],
declarations: [ ContactsContentComponent, ResourceIconPipe ],
declarations: [
ContactsContentComponent,
ResourceIconPipe,
FastActionButtonComponent
],
providers: [
provideMockStore({ selectors: mockedSelectors }),
{ provide: ActivatedRoute, useValue: activatedRoute },
Expand All @@ -136,6 +144,9 @@ describe('Contacts content component', () => {
{ provide: ContactMutedService, useValue: contactMutedService },
{ provide: MutingTransition, useValue: mutingTransition },
{ provide: FastActionButtonService, useValue: fastActionButtonService },
{ provide: AuthService, useValue: { has: sinon.stub() } },
{ provide: MatBottomSheet, useValue: { open: sinon.stub() } },
{ provide: MatDialog, useValue: { open: sinon.stub() } },
]
})
.compileComponents()
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -42,6 +42,7 @@ describe('Contacts More Menu Component', () => {
imports: [
TranslateModule.forRoot({ loader: { provide: TranslateLoader, useClass: TranslateFakeLoader } }),
],
declarations: [ ContactsMoreMenuComponent ],
providers: [
provideMockStore({ selectors: mockedSelectors }),
{ provide: AuthService, useValue: authService },
Expand Down
24 changes: 16 additions & 8 deletions webapp/tests/karma/ts/modules/contacts/contacts.component.spec.ts
Original file line number Diff line number Diff line change
@@ -1,4 +1,6 @@
import { TestBed, ComponentFixture, fakeAsync, flush, waitForAsync } from '@angular/core/testing';
import { MatBottomSheet } from '@angular/material/bottom-sheet';
import { MatDialog } from '@angular/material/dialog';
import { provideMockStore, MockStore } from '@ngrx/store/testing';
import { FormsModule } from '@angular/forms';
import { RouterTestingModule } from '@angular/router/testing';
Expand Down Expand Up @@ -28,6 +30,9 @@ import { XmlFormsService } from '@mm-services/xml-forms.service';
import { GlobalActions } from '@mm-actions/global';
import { NavigationService } from '@mm-services/navigation.service';
import { FastActionButtonService } from '@mm-services/fast-action-button.service';
import { ContactsMoreMenuComponent } from '@mm-modules/contacts/contacts-more-menu.component';
import { FastActionButtonComponent } from '@mm-components/fast-action-button/fast-action-button.component';
import { SearchBarComponent } from '@mm-components/search-bar/search-bar.component';

describe('Contacts component', () => {
let searchResults;
Expand Down Expand Up @@ -63,7 +68,11 @@ describe('Contacts component', () => {
isAdmin: sinon.stub().returns(false),
isOnlineOnly: sinon.stub().returns(false),
};
authService = { has: sinon.stub().resolves(false) };
authService = {
has: sinon.stub().resolves(false),
online: sinon.stub().resolves(false),
any: sinon.stub().resolves(false)
};
changesService = { subscribe: sinon.stub().returns({ unsubscribe: sinon.stub() }) };
userSettingsService = {
get: sinon.stub().resolves({ facility_id: district._id })
Expand Down Expand Up @@ -122,10 +131,13 @@ describe('Contacts component', () => {
declarations: [
ContactsComponent,
ContactsFiltersComponent,
ContactsMoreMenuComponent,
FreetextFilterComponent,
NavigationComponent,
ResetFiltersComponent,
SortFilterComponent,
FastActionButtonComponent,
SearchBarComponent
],
providers: [
provideMockStore({ selectors: mockedSelectors }),
Expand All @@ -142,6 +154,8 @@ describe('Contacts component', () => {
{ provide: XmlFormsService, useValue: xmlFormsService },
{ provide: FastActionButtonService, useValue: fastActionButtonService },
{ provide: NavigationService, useValue: {} },
{ provide: MatBottomSheet, useValue: { open: sinon.stub() } },
{ provide: MatDialog, useValue: { open: sinon.stub() } },
]
})
.compileComponents().then(() => {
Expand Down Expand Up @@ -613,14 +627,11 @@ describe('Contacts component', () => {

describe('last visited date', () => {
it('does not enable LastVisitedDate features not allowed', () => {
expect(authService.has.callCount).equal(2);
expect(authService.has.args[0]).to.deep.equal(['can_view_last_visited_date']);
expect(authService.has.args[1]).to.deep.equal(['can_view_old_filter_and_search']);
expect(component.lastVisitedDateExtras).to.equal(false);
expect(component.visitCountSettings).to.deep.equal({});
expect(component.sortDirection).to.equal('alpha');
expect(component.defaultSortDirection).to.equal('alpha');
expect(userSettingsService.get.callCount).to.equal(1);
expect(userSettingsService.get.callCount).to.equal(2);
expect(searchService.search.callCount).to.equal(1);
expect(searchService.search.args[0]).to.deep.equal(
[
Expand All @@ -639,9 +650,6 @@ describe('Contacts component', () => {
userSettingsService.get.resetHistory();
component.ngOnInit();
flush();
expect(authService.has.callCount).equal(3);
expect(authService.has.args[2]).to.deep.equal(['can_view_last_visited_date']);
expect(authService.has.args[1]).to.deep.equal(['can_view_old_filter_and_search']);
expect(component.lastVisitedDateExtras).to.equal(true);
expect(component.visitCountSettings).to.deep.equal({});
expect(component.sortDirection).to.equal('alpha');
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,6 @@
import { ComponentFixture, TestBed, waitForAsync } from '@angular/core/testing';
import { FormsModule } from '@angular/forms';
import { CommonModule } from '@angular/common';
import { TranslateFakeLoader, TranslateLoader, TranslateModule } from '@ngx-translate/core';
import { RouterTestingModule } from '@angular/router/testing';
import { By } from '@angular/platform-browser';
Expand All @@ -19,6 +21,7 @@ import { ModalService } from '@mm-services/modal.service';
import { ActivatedRoute } from '@angular/router';
import { MessagesActions } from '@mm-actions/messages';
import { PipesModule } from '@mm-pipes/pipes.module';
import { SenderComponent } from '@mm-components/sender/sender.component';

describe('MessagesContentComponent', () => {
let component: MessagesContentComponent;
Expand Down Expand Up @@ -67,9 +70,12 @@ describe('MessagesContentComponent', () => {
TranslateModule.forRoot({ loader: { provide: TranslateLoader, useClass: TranslateFakeLoader } }),
RouterTestingModule,
PipesModule,
FormsModule,
CommonModule
],
declarations: [
MessagesContentComponent
MessagesContentComponent,
SenderComponent,
],
providers: [
provideMockStore({ selectors: mockedSelectors }),
Expand Down
Loading

0 comments on commit 1e66b9e

Please sign in to comment.