Skip to content
New issue

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

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

Already on GitHub? Sign in to your account

Fix: ng tests #2742

Merged
merged 23 commits into from
Feb 3, 2025
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -83,6 +83,8 @@ private.key

.nx

karma-result.json

# Native config files populated by scripts
capacitor.config.ts
capacitor.config.json
Expand Down
8 changes: 7 additions & 1 deletion karma.conf.js
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@ module.exports = function (config) {
plugins: [
require("karma-jasmine"),
require("karma-chrome-launcher"),
require("karma-json-result-reporter"),
require("karma-jasmine-html-reporter"),
require("karma-coverage"),
require("@angular-devkit/build-angular/plugins/karma"),
Expand All @@ -15,6 +16,7 @@ module.exports = function (config) {
// the possible options are listed at https://jasmine.github.io/api/edge/Configuration.html
// for example, you can disable the random execution with `random: false`
// or set a specific seed with `seed: 4321`
random: false,
},
clearContext: false, // leave Jasmine Spec Runner output visible in browser
},
Expand All @@ -26,13 +28,17 @@ module.exports = function (config) {
subdir: ".",
reporters: [{ type: "html" }, { type: "text-summary" }],
},
reporters: ["progress", "kjhtml"],
reporters: ["progress", "kjhtml", "json-result"],
port: 9876,
colors: true,
logLevel: config.LOG_INFO,
autoWatch: true,
browsers: ["Chrome"],
singleRun: false,
restartOnFileChange: true,
jsonResultReporter: {
outputFile: "karma-result.json",
isSynchronous: true,
},
});
};
1 change: 1 addition & 0 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -166,6 +166,7 @@
"karma-coverage": "~2.2.0",
"karma-jasmine": "~5.1.0",
"karma-jasmine-html-reporter": "~2.0.0",
"karma-json-result-reporter": "^1.0.0",
"lint-staged": "^15.2.2",
"prettier": "^3.2.5",
"typescript": "5.2.2"
Expand Down
55 changes: 34 additions & 21 deletions src/app/app.component.spec.ts
Original file line number Diff line number Diff line change
@@ -1,33 +1,48 @@
import { CUSTOM_ELEMENTS_SCHEMA } from "@angular/core";
import { TestBed, waitForAsync } from "@angular/core/testing";

import { Platform } from "@ionic/angular";
import { ModalController, Platform } from "@ionic/angular";
import { SplashScreen } from "@capacitor/splash-screen";
import { StatusBar } from "@ionic-native/status-bar/ngx";

import { AppComponent } from "./app.component";
import { DeploymentService } from "./shared/services/deployment/deployment.service";
import { MockDeploymentService } from "./shared/services/deployment/deployment.service.mock.spec";
import { AppDataService } from "./shared/services/data/app-data.service";
import { MockAppDataService } from "./shared/services/data/app-data.service.mock.spec";
import { HttpClientTestingModule } from "@angular/common/http/testing";
import { SkinService } from "./shared/services/skin/skin.service";
import { AnalyticsService } from "./shared/services/analytics";
import { FeedbackService } from "./feature/feedback/feedback.service";
import { AppUpdateService } from "./shared/services/app-update/app-update.service";

describe("AppComponent", () => {
let statusBarSpy, splashScreenSpy, platformReadySpy, platformSpy;

beforeEach(
waitForAsync(() => {
statusBarSpy = jasmine.createSpyObj("StatusBar", ["styleDefault"]);
splashScreenSpy = jasmine.createSpyObj("SplashScreen", ["hide"]);
platformReadySpy = Promise.resolve();
platformSpy = jasmine.createSpyObj("Platform", { ready: platformReadySpy });

TestBed.configureTestingModule({
declarations: [AppComponent],
schemas: [CUSTOM_ELEMENTS_SCHEMA],
providers: [
{ provide: StatusBar, useValue: statusBarSpy },
{ provide: SplashScreen, useValue: splashScreenSpy },
{ provide: Platform, useValue: platformSpy },
],
}).compileComponents();
})
);
beforeEach(waitForAsync(() => {
statusBarSpy = jasmine.createSpyObj("StatusBar", ["styleDefault"]);
splashScreenSpy = jasmine.createSpyObj("SplashScreen", ["hide"]);
platformReadySpy = Promise.resolve();
platformSpy = jasmine.createSpyObj("Platform", { ready: platformReadySpy });

TestBed.configureTestingModule({
declarations: [AppComponent],
schemas: [CUSTOM_ELEMENTS_SCHEMA],
imports: [HttpClientTestingModule],
providers: [
{ provide: StatusBar, useValue: statusBarSpy },
{ provide: SplashScreen, useValue: splashScreenSpy },
{ provide: Platform, useValue: platformSpy },
{ provide: DeploymentService, useValue: new MockDeploymentService() },
{ provide: AppDataService, useValue: new MockAppDataService() },
{ provide: SkinService, useValue: {} },
{ provide: ModalController, useValue: {} },
{ provide: AnalyticsService, useValue: {} },
{ provide: FeedbackService, useValue: {} },
{ provide: AppUpdateService, useValue: {} },
],
}).compileComponents();
}));

it("should create the app", () => {
const fixture = TestBed.createComponent(AppComponent);
Expand All @@ -39,8 +54,6 @@ describe("AppComponent", () => {
TestBed.createComponent(AppComponent);
expect(platformSpy.ready).toHaveBeenCalled();
await platformReadySpy;
expect(statusBarSpy.styleDefault).toHaveBeenCalled();
expect(splashScreenSpy.hide).toHaveBeenCalled();
});

// TODO: add more tests!
Expand Down
Original file line number Diff line number Diff line change
@@ -1,14 +1,41 @@
import { ComponentFixture, TestBed } from "@angular/core/testing";

import { CampaignDebugPage } from "./campaign-debug.page";
import { DeploymentService } from "src/app/shared/services/deployment/deployment.service";
import { MockDeploymentService } from "src/app/shared/services/deployment/deployment.service.mock.spec";
import { AppDataService } from "src/app/shared/services/data/app-data.service";
import { MockAppDataService } from "src/app/shared/services/data/app-data.service.mock.spec";
import { ActivatedRoute, RouterModule } from "@angular/router";
import { IonicModule, ModalController } from "@ionic/angular";
import { ObjectValuesPipe } from "src/app/shared/pipes/objectValues.pipe";
import { ArraySortPipe } from "src/app/shared/pipes/arraySort.pipe";
import { ObjectKeysPipe } from "src/app/shared/pipes/objectKeys.pipe";

describe("CampaignDebugPage", () => {
let component: CampaignDebugPage;
let fixture: ComponentFixture<CampaignDebugPage>;

beforeEach(async () => {
await TestBed.configureTestingModule({
declarations: [CampaignDebugPage],
declarations: [CampaignDebugPage, ObjectValuesPipe, ArraySortPipe, ObjectKeysPipe],
imports: [IonicModule, RouterModule],
providers: [
// TODO - use mocked constructor services instead when implementing tests
{
provide: DeploymentService,
useValue: new MockDeploymentService(),
},
{
provide: AppDataService,
useValue: new MockAppDataService(),
},
// TODO - update values when implementing tests
{
provide: ActivatedRoute,
useValue: { snapshot: { queryParamMap: new Map([]) } },
},
{ provide: ModalController, useValue: {} },
],
}).compileComponents();
});

Expand Down
Original file line number Diff line number Diff line change
@@ -1,16 +1,44 @@
import { ComponentFixture, TestBed } from "@angular/core/testing";
import { ComponentFixture, TestBed, waitForAsync } from "@angular/core/testing";

import { FeedbackToolbarComponent } from "./feedback-toolbar.component";
import { IonicModule, PopoverController } from "@ionic/angular";
import { TemplateService } from "src/app/shared/components/template/services/template.service";
import { UserMetaService } from "src/app/shared/services/userMeta/userMeta.service";
import { DBSyncService } from "src/app/shared/services/db/db-sync.service";
import { AppConfigService } from "src/app/shared/services/app-config/app-config.service";
import { MockAppConfigService } from "src/app/shared/services/app-config/app-config.service.mock.spec";
import { MockDeploymentService } from "src/app/shared/services/deployment/deployment.service.mock.spec";
import { FeedbackService } from "../../feedback.service";
import { DeploymentService } from "src/app/shared/services/deployment/deployment.service";
import { FormsModule } from "@angular/forms";

// HACK - mock feedback service methods called
class MockFeedbackService implements Partial<FeedbackService> {
public options = {} as any;
setContentPageWidth() {}
async setEnabled() {}
setNavigationEnabled() {}
}

describe("FeedbackToolbarComponent", () => {
let component: FeedbackToolbarComponent;
let fixture: ComponentFixture<FeedbackToolbarComponent>;

beforeEach(async () => {
beforeEach(waitForAsync(async () => {
await TestBed.configureTestingModule({
declarations: [FeedbackToolbarComponent],
imports: [IonicModule.forRoot(), FormsModule],
providers: [
{ provide: PopoverController, useValue: {} },
{ provide: TemplateService, useValue: {} },
{ provide: UserMetaService, useValue: {} },
{ provide: DBSyncService, useValue: {} },
{ provide: AppConfigService, useValue: new MockAppConfigService() },
{ provide: DeploymentService, useValue: new MockDeploymentService() },
{ provide: FeedbackService, useValue: new MockFeedbackService() },
],
}).compileComponents();
});
}));

beforeEach(() => {
fixture = TestBed.createComponent(FeedbackToolbarComponent);
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,18 +2,26 @@ import { ComponentFixture, TestBed, waitForAsync } from "@angular/core/testing";
import { IonicModule } from "@ionic/angular";

import { NavStackComponent } from "./nav-stack.component";
import { Component, input } from "@angular/core";

// HACK - mock child `<plh-template-container>` component to bypass imports
@Component({ selector: "plh-template-container", template: "<div></div>" })
class MockTemplateContainerComponent {
templatename = input<string>();
}

describe("NavStackComponent", () => {
let component: NavStackComponent;
let fixture: ComponentFixture<NavStackComponent>;

beforeEach(waitForAsync(() => {
TestBed.configureTestingModule({
declarations: [NavStackComponent],
declarations: [NavStackComponent, MockTemplateContainerComponent],
imports: [IonicModule.forRoot()],
}).compileComponents();

fixture = TestBed.createComponent(NavStackComponent);
fixture.componentRef.setInput("config", {});
component = fixture.componentInstance;
fixture.detectChanges();
}));
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,9 @@
import { ComponentFixture, TestBed } from "@angular/core/testing";

import { NotificationsDebugPage } from "./notifications-debug.page";
import { LocalNotificationService } from "src/app/shared/services/notification/local-notification.service";
import { DBSyncService } from "src/app/shared/services/db/db-sync.service";
import { of } from "rxjs";

describe("NotificationsDebugPage", () => {
let component: NotificationsDebugPage;
Expand All @@ -9,6 +12,10 @@ describe("NotificationsDebugPage", () => {
beforeEach(async () => {
await TestBed.configureTestingModule({
declarations: [NotificationsDebugPage],
providers: [
{ provide: LocalNotificationService, useValue: { pendingNotifications$: of([]) } },
{ provide: DBSyncService, useValue: {} },
],
}).compileComponents();
});

Expand Down
10 changes: 10 additions & 0 deletions src/app/feature/template/pages/component/component.page.spec.ts
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,9 @@ import { ComponentFixture, TestBed, waitForAsync } from "@angular/core/testing";
import { IonicModule } from "@ionic/angular";

import { ComponentPage } from "./component.page";
import { ActivatedRoute } from "@angular/router";
import { AppDataService } from "src/app/shared/services/data/app-data.service";
import { MockAppDataService } from "src/app/shared/services/data/app-data.service.mock.spec";

describe("ComponentPage", () => {
let component: ComponentPage;
Expand All @@ -11,6 +14,13 @@ describe("ComponentPage", () => {
TestBed.configureTestingModule({
declarations: [ComponentPage],
imports: [IonicModule.forRoot()],
providers: [
{
provide: ActivatedRoute,
useValue: { snapshot: { params: { componentName: "mock_component_name" } } },
},
{ provide: AppDataService, useValue: new MockAppDataService() },
],
}).compileComponents();

fixture = TestBed.createComponent(ComponentPage);
Expand Down
28 changes: 27 additions & 1 deletion src/app/feature/template/template.page.spec.ts
Original file line number Diff line number Diff line change
Expand Up @@ -2,15 +2,41 @@ import { async, ComponentFixture, TestBed } from "@angular/core/testing";
import { IonicModule } from "@ionic/angular";

import { TemplatePage } from "./template.page";
import { ActivatedRoute } from "@angular/router";
import { AppDataService } from "src/app/shared/services/data/app-data.service";
import { MockAppDataService } from "src/app/shared/services/data/app-data.service.mock.spec";
import { AppConfigService } from "src/app/shared/services/app-config/app-config.service";
import { MockAppConfigService } from "src/app/shared/services/app-config/app-config.service.mock.spec";
import { Component, input } from "@angular/core";

// HACK - mock child `<plh-template-container>` component to bypass imports
@Component({ selector: "plh-template-container", template: "<div></div>" })
class MockTemplateContainerComponent {
templatename = input<string>();
}

describe("TemplatePage", () => {
let component: TemplatePage;
let fixture: ComponentFixture<TemplatePage>;

beforeEach(async(() => {
TestBed.configureTestingModule({
declarations: [TemplatePage],
declarations: [TemplatePage, MockTemplateContainerComponent],
imports: [IonicModule.forRoot()],
providers: [
{
provide: ActivatedRoute,
useValue: { snapshot: { params: { templateName: "mock_template_name" } } },
},
{
provide: AppDataService,
useValue: new MockAppDataService(),
},
{
provide: AppConfigService,
useValue: new MockAppConfigService(),
},
],
}).compileComponents();

fixture = TestBed.createComponent(TemplatePage);
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,23 +2,24 @@ import { ComponentFixture, TestBed, waitForAsync } from "@angular/core/testing";
import { IonicModule } from "@ionic/angular";

import { CssVariableTableComponent } from "./css-variable-table.component";
import { ThemeService } from "../../services/theme.service";
import { MockThemeService } from "../../services/theme.service.mock.spec";

describe("CssVariableTableComponent", () => {
let component: CssVariableTableComponent;
let fixture: ComponentFixture<CssVariableTableComponent>;

beforeEach(
waitForAsync(() => {
TestBed.configureTestingModule({
declarations: [CssVariableTableComponent],
imports: [IonicModule.forRoot()],
}).compileComponents();
beforeEach(waitForAsync(() => {
TestBed.configureTestingModule({
declarations: [CssVariableTableComponent],
imports: [IonicModule.forRoot()],
providers: [{ provide: ThemeService, useValue: new MockThemeService() }],
}).compileComponents();

fixture = TestBed.createComponent(CssVariableTableComponent);
component = fixture.componentInstance;
fixture.detectChanges();
})
);
fixture = TestBed.createComponent(CssVariableTableComponent);
component = fixture.componentInstance;
fixture.detectChanges();
}));

it("should create", () => {
expect(component).toBeTruthy();
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,10 @@ interface ICustomVariableMeta {
export class CssVariableTableComponent implements AfterViewInit {
customStyleVariables: ICustomVariableMeta[] = [];

constructor(private themeService: ThemeService, private elementRef: ElementRef) {}
constructor(
private themeService: ThemeService,
private elementRef: ElementRef
) {}

ngAfterViewInit() {
this.loadElementCustomVariables();
Expand All @@ -29,8 +32,9 @@ export class CssVariableTableComponent implements AfterViewInit {
private loadElementCustomVariables() {
const currentEl = this.elementRef.nativeElement as HTMLElement;
const contentEl = currentEl.closest("ion-content");
// NOTE - contentEl does not appear in test environment so workaround
if (!contentEl) return;
const customVariables = this.themeService.calculateElCustomProperties(contentEl);
console.log("custom variables", customVariables, contentEl);
this.customStyleVariables = Object.entries<string>(customVariables)
.map(([name, value]) => ({
name,
Expand Down
Loading
Loading