From 59babfd7185f2fb4f30f9322333d59cd571aced8 Mon Sep 17 00:00:00 2001 From: Oliver Sahner Date: Fri, 15 Dec 2017 09:37:16 +0100 Subject: [PATCH] fix: update Test --- src/http-client-busy.directive.spec.ts | 121 +++++++++++++++---------- 1 file changed, 72 insertions(+), 49 deletions(-) diff --git a/src/http-client-busy.directive.spec.ts b/src/http-client-busy.directive.spec.ts index a806a22..b5b2cd1 100644 --- a/src/http-client-busy.directive.spec.ts +++ b/src/http-client-busy.directive.spec.ts @@ -1,10 +1,14 @@ -import { ComponentFixture, fakeAsync, TestBed, tick } from '@angular/core/testing'; +import { async, ComponentFixture, fakeAsync, inject, TestBed } from '@angular/core/testing'; import { Component } from '@angular/core'; -import { HTTP_INTERCEPTORS, HttpClientModule } from '@angular/common/http'; -import { HttpClientTestingModule } from '@angular/common/http/testing'; +import { HTTP_INTERCEPTORS, HttpClient, HttpClientModule, HttpHeaders } from '@angular/common/http'; +import { CounterService, HttpClientBusyInterceptor, HttpClientBusyModule } from './index'; import { By } from '@angular/platform-browser'; -import { CounterService, HttpClientBusyDirective, HttpClientBusyInterceptor, HttpClientBusyModule } from './index'; - +import { Observable } from 'rxjs/Observable'; +import 'rxjs/add/observable/throw'; +import 'rxjs/add/observable/of'; +import 'rxjs/add/operator/map'; +import 'rxjs/add/operator/catch'; +import { HttpClientBusyDirective } from './http-client-busy.directive'; @Component({ selector: 'test-cmp', @@ -17,61 +21,80 @@ class TestComponent { } describe('HttpClientBusyDirective', () => { + let http: HttpClient; let fixture: ComponentFixture; - let component: TestComponent; - beforeEach( - () => { - TestBed.configureTestingModule({ - declarations: [ - TestComponent - ], - imports: [ - HttpClientTestingModule, - HttpClientModule, - HttpClientBusyModule - ], - providers: [ - CounterService, - { provide: HTTP_INTERCEPTORS, useClass: HttpClientBusyInterceptor, multi: true } - ] - }).compileComponents().then(() => { - }); - fixture = TestBed.createComponent(TestComponent); - component = fixture.componentInstance; + beforeEach(async(() => { + TestBed.configureTestingModule({ + declarations: [ + TestComponent + ], + imports: [ + HttpClientModule, + HttpClientBusyModule + ], + providers: [ + CounterService, + { provide: HTTP_INTERCEPTORS, useClass: HttpClientBusyInterceptor, multi: true } + ] }); + TestBed.compileComponents(); + })); + beforeEach(inject([HttpClient], (s: HttpClient) => { + jasmine.DEFAULT_TIMEOUT_INTERVAL = 5000; + http = s; + fixture = TestBed.createComponent(TestComponent); + fixture.detectChanges(); + })); it('init directive', fakeAsync(() => { - // fixture = TestBed.overrideTemplate(TestComponent, - // `
`).createComponent(TestComponent); - fixture.detectChanges(); - tick(100); + const directiveEl = fixture.debugElement.query(By.directive(HttpClientBusyDirective)); + expect(directiveEl).not.toBeNull(); + }) + ); - const directiveEl = fixture.debugElement.query(By.directive(HttpClientBusyDirective)); - expect(directiveEl).not.toBeNull(); - // const directiveInstance = directiveEl.injector.get(HttpClientBusyDirective); - })); + it('update directive class', + async(() => { + const directiveEl = fixture.debugElement.query(By.directive(HttpClientBusyDirective)); - // TODO Get the HttpClient Test running - /*it('update directive', inject([HttpClient], (http: HttpClient) => { - fixture.detectChanges(); - tick(100); + http.put('https://www.mocky.io/v2/5185415ba171ea3a00704eed?mocky-delay=1s', { + headers: new HttpHeaders().set('Accept', 'application/json') + }) + .subscribe(() => { + expect(directiveEl.nativeElement.classList.contains('idle')) + .toBe(true, 'should contain idle class'); + }); + + setTimeout(function () { + expect(directiveEl.nativeElement.classList.contains('busy')) + .toBe(true, 'should contain busy class'); + }, 500) + + }) + ); - const directiveEl = fixture.debugElement.query(By.directive(HttpClientBusyDirective)); - expect(directiveEl).not.toBeNull(); + it('handle errors', + async(() => { + const directiveEl = fixture.debugElement.query(By.directive(HttpClientBusyDirective)); - http.put('https://www.mocky.io/v2/5185415ba171ea3a00704eed?mocky-delay=2s', { - headers: new HttpHeaders().set('Accept', 'application/json') - }) - .subscribe(() => { - console.error('longrunning done'); - }); + http.put('http://www.mocky.io/v2/5a2fae752d00009614a83b2f?mocky-delay=1s', { + headers: new HttpHeaders().set('Accept', 'application/json') + }) + .catch(() => { + return Observable.of({}); + }) + .subscribe(() => { + expect(directiveEl.nativeElement.classList.contains('idle')) + .toBe(true, 'should contain idle class'); + }); - flushMicrotasks(); - tick(100); + setTimeout(function () { + expect(directiveEl.nativeElement.classList.contains('busy')) + .toBe(true, 'should contain busy class'); + }, 500) - expect(directiveEl).not.toBeNull(); - }));*/ + }) + ); });