From ea61c70bfd3275614ee83e63a908eaa75822a8fc Mon Sep 17 00:00:00 2001 From: Will Mendes Date: Mon, 17 Aug 2020 20:02:18 +1000 Subject: [PATCH] test: improving types --- .../src/lib/ngx-skeleton-loader.component.spec.ts | 12 +++++------- .../src/lib/ngx-skeleton-loader.component.ts | 15 +++++++-------- src/app/app.component.spec.ts | 2 -- 3 files changed, 12 insertions(+), 17 deletions(-) diff --git a/projects/ngx-skeleton-loader/src/lib/ngx-skeleton-loader.component.spec.ts b/projects/ngx-skeleton-loader/src/lib/ngx-skeleton-loader.component.spec.ts index 307ad35..3e89cc4 100644 --- a/projects/ngx-skeleton-loader/src/lib/ngx-skeleton-loader.component.spec.ts +++ b/projects/ngx-skeleton-loader/src/lib/ngx-skeleton-loader.component.spec.ts @@ -1,4 +1,4 @@ -import { Component, NO_ERRORS_SCHEMA, PLATFORM_ID } from '@angular/core'; +import { Component, PLATFORM_ID } from '@angular/core'; import { async as waitForAsync, TestBed } from '@angular/core/testing'; import { start, end } from 'perf-marks/marks'; @@ -58,7 +58,6 @@ describe('NgxSkeletonLoaderComponent', () => { fixture = TestBed.configureTestingModule({ declarations: [ContainerComponent, NgxSkeletonLoaderComponent], providers: [{ provide: PLATFORM_ID, useValue: 'browser' }], - schemas: [NO_ERRORS_SCHEMA], }).createComponent(ContainerComponent); fixture.detectChanges(); }), @@ -141,9 +140,9 @@ describe('NgxSkeletonLoaderComponent', () => { }); describe('When rendering server side', () => { - let spyStart; - let spyEnd; - let ngxSkeletonLoaderComponent; + let spyStart: jasmine.Spy; + let spyEnd: jasmine.Spy; + let ngxSkeletonLoaderComponent: NgxSkeletonLoaderComponent; beforeEach(() => { spyStart = jasmine.createSpy('start', start); @@ -151,8 +150,7 @@ describe('NgxSkeletonLoaderComponent', () => { ngxSkeletonLoaderComponent = TestBed.createComponent(NgxSkeletonLoaderComponent) .componentInstance; - - spyOn(ngxSkeletonLoaderComponent, 'isBrowser').and.returnValue(false); + ngxSkeletonLoaderComponent.isBrowser = false; }); it('should not call perf-marks render and load marks', () => { diff --git a/projects/ngx-skeleton-loader/src/lib/ngx-skeleton-loader.component.ts b/projects/ngx-skeleton-loader/src/lib/ngx-skeleton-loader.component.ts index bdc42c8..cf24ac6 100644 --- a/projects/ngx-skeleton-loader/src/lib/ngx-skeleton-loader.component.ts +++ b/projects/ngx-skeleton-loader/src/lib/ngx-skeleton-loader.component.ts @@ -20,11 +20,14 @@ export class NgxSkeletonLoaderComponent implements OnInit, AfterViewInit, OnDest @Input() theme: { [k: string]: string } = {}; items: Array = []; + isBrowser: boolean; - constructor(@Inject(PLATFORM_ID) private readonly platformId: any) {} + constructor(@Inject(PLATFORM_ID) private readonly platformId: any) { + this.isBrowser = isPlatformBrowser(this.platformId); + } ngOnInit() { - if (this.isBrowser()) { + if (this.isBrowser) { start('NgxSkeletonLoader:Rendered'); start('NgxSkeletonLoader:Loaded'); } @@ -45,18 +48,14 @@ export class NgxSkeletonLoaderComponent implements OnInit, AfterViewInit, OnDest } ngAfterViewInit() { - if (this.isBrowser()) { + if (this.isBrowser) { end('NgxSkeletonLoader:Rendered'); } } ngOnDestroy() { - if (this.isBrowser()) { + if (this.isBrowser) { end('NgxSkeletonLoader:Loaded'); } } - - isBrowser(): boolean { - return isPlatformBrowser(this.platformId); - } } diff --git a/src/app/app.component.spec.ts b/src/app/app.component.spec.ts index ead6d47..0262e02 100644 --- a/src/app/app.component.spec.ts +++ b/src/app/app.component.spec.ts @@ -1,12 +1,10 @@ import { TestBed, async } from '@angular/core/testing'; -import { NO_ERRORS_SCHEMA } from '@angular/core'; import { AppComponent } from './app.component'; describe('AppComponent', () => { beforeEach(async(() => { TestBed.configureTestingModule({ declarations: [AppComponent], - schemas: [NO_ERRORS_SCHEMA], }).compileComponents(); }));