Commit 708343b

committed

Small refactoring in loading component

1 parent 64d4a26 commit 708343bCopy full SHA for 708343b

File tree

+13

-16

lines changed

src/app/shared
- components/loading
  - loading.component.spec.ts
- services
  - loading.service.ts

+13

-16

lines changed

Lines changed: 12 additions & 2 deletions

Original file line number	Diff line number	Diff line change
`@@ -28,7 +28,17 @@ describe('LoadingComponent', () => {`
`28`	`28`	`const fixture = TestBed.createComponent(LoadingComponent);`
`29`	`29`	`loader.loadingOn();`
`30`	`30`	`fixture.detectChanges();`
`31`		`- const compiled = fixture.nativeElement as HTMLElement;`
`32`		`- expect(compiled.querySelector('progress-spinner')).toBeDefined();`
	`31`	`+ const progressBarElement =`
	`32`	`+ fixture.nativeElement.querySelector('mat-progress-bar');`
	`33`	`+ expect(progressBarElement).toBeTruthy();`
	`34`	`+ });`
	`35`	`+`
	`36`	`+ it('should hide display loader', () => {`
	`37`	`+ const fixture = TestBed.createComponent(LoadingComponent);`
	`38`	`+ loader.loadingOff();`
	`39`	`+ fixture.detectChanges();`
	`40`	`+ const progressBarElement =`
	`41`	`+ fixture.nativeElement.querySelector('mat-progress-bar');`
	`42`	`+ expect(progressBarElement).toBeFalsy();`
`33`	`43`	`});`
`34`	`44`	`});`

Lines changed: 1 addition & 14 deletions

Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,5 @@`
`1`	`1`	`import { Injectable } from '@angular/core';`
`2`		`-import { BehaviorSubject, Observable, Subject,of } from 'rxjs';`
	`2`	`+import { BehaviorSubject, Observable, of } from 'rxjs';`
`3`	`3`	`import { concatMap, finalize, tap } from 'rxjs/operators';`
`4`	`4`
`5`	`5`	`@Injectable({`
`@@ -11,19 +11,6 @@ export class LoadingService {`
`11`	`11`	`loading$: Observable<boolean> = this.loadingSubject.asObservable();`
`12`	`12`
`13`	`13`	`constructor() {}`
`14`		`- /**`
`15`		`- *`
`16`		`- * @param obs$ passed any Obsrable`
`17`		`- * @returns same obs$`
`18`		`- * Methode use to manage loader on API call`
`19`		`- */`
`20`		`- showLoaderUntilCompleted<T>(obs$: Observable<T>): Observable<T> {`
`21`		`- return of(null).pipe(`
`22`		`- tap(() => this.loadingOn()),`
`23`		`- concatMap(() => obs$),`
`24`		`- finalize(() => this.loadingOff())`
`25`		`- );`
`26`		`- }`
`27`	`14`	`/**`
`28`	`15`	`* loadingOn method will use for emit loader ON`
`29`	`16`	`*/`

Comments

(0)