diff --git a/src/app/common/progress/progress.component.spec.ts b/src/app/common/progress/progress.component.spec.ts index 735354d2..748a0d69 100644 --- a/src/app/common/progress/progress.component.spec.ts +++ b/src/app/common/progress/progress.component.spec.ts @@ -58,9 +58,9 @@ describe('ProgressComponent', () => { }); it('should set error state when error defined', () => { - const error = new Error('test'); + const error = {error: 'test'}; progressService.setError(error); - expect(component.error).toEqual(error); + expect(component.error).toEqual(error.error); }); it('should clear error when changes route', () => { diff --git a/src/app/common/progress/progress.component.ts b/src/app/common/progress/progress.component.ts index d3a04851..b9ce8f91 100644 --- a/src/app/common/progress/progress.component.ts +++ b/src/app/common/progress/progress.component.ts @@ -10,7 +10,7 @@ import { Subscription } from 'rxjs'; }) export class ProgressComponent implements OnInit, OnDestroy { visible = false; - error: Error; + error: any; routerSubscription: Subscription; constructor(private progressService: ProgressService, private router: Router) {} diff --git a/src/app/common/progress/progress.service.spec.ts b/src/app/common/progress/progress.service.spec.ts index 80a30d5b..23a76f08 100644 --- a/src/app/common/progress/progress.service.spec.ts +++ b/src/app/common/progress/progress.service.spec.ts @@ -30,9 +30,9 @@ describe('ProgressService', () => { }); it('should propagate event on error', () => { - const error = new Error(); + const error = {error: 'Error'}; progressService.setError(error); - expect(progressService.state.next).toHaveBeenCalledWith(new State(false, error)); + expect(progressService.state.next).toHaveBeenCalledWith(new State(false, error.error)); }); it('should clear an error', () => { diff --git a/src/app/common/progress/progress.service.ts b/src/app/common/progress/progress.service.ts index b2aa634a..45895536 100644 --- a/src/app/common/progress/progress.service.ts +++ b/src/app/common/progress/progress.service.ts @@ -4,10 +4,10 @@ import { BehaviorSubject } from 'rxjs'; export class State { public visible: boolean; - public error: Error; + public error: any; public clear: boolean; - constructor(visible: boolean, error?: Error, clear: boolean = false) { + constructor(visible: boolean, error?: any, clear: boolean = false) { this.visible = visible; this.error = error; this.clear = clear;