From 65a4271b8990341d2826009b7a5162a99f8a3852 Mon Sep 17 00:00:00 2001 From: Denys Vuika Date: Thu, 23 Jun 2016 14:47:39 +0100 Subject: [PATCH] Unit test fixes --- .../assets/alfresco-search.service.mock.ts | 33 +++++++++++-------- ...esco-search-autocomplete.component.spec.ts | 7 ++-- .../alfresco-search-control.component.spec.ts | 8 ++--- .../components/alfresco-search.component.html | 4 +-- .../alfresco-search.component.spec.ts | 30 +++++++---------- .../src/services/alfresco-search.service.ts | 6 ++-- 6 files changed, 40 insertions(+), 48 deletions(-) diff --git a/ng2-components/ng2-alfresco-search/src/assets/alfresco-search.service.mock.ts b/ng2-components/ng2-alfresco-search/src/assets/alfresco-search.service.mock.ts index ca0c907b31..822ceae126 100644 --- a/ng2-components/ng2-alfresco-search/src/assets/alfresco-search.service.mock.ts +++ b/ng2-components/ng2-alfresco-search/src/assets/alfresco-search.service.mock.ts @@ -15,29 +15,36 @@ * limitations under the License. */ -import { provide } from '@angular/core'; import { AlfrescoSearchService } from '../services/alfresco-search.service'; import { Observable } from 'rxjs/Rx'; -export class SearchServiceMock { +export class SearchServiceMock extends AlfrescoSearchService { - public getLiveSearchResults(term: string): Observable { + getLiveSearchResults(term: string): Observable { if (term.length > 3) { return Observable.of({ - entries: [ - { - entry: { - id: '123' + list: { + entries: [ + { + entry: { + id: '123', + name: 'MyDoc', + content: { + mimetype: 'text/plain' + }, + createdByUser: { + displayName: 'John Doe' + }, + modifiedByUser: { + displayName: 'John Doe' + } + } } - } - ] + ] + } }); } else { return Observable.throw('Fake server error'); } } - - getProviders(): Array { - return [provide(AlfrescoSearchService, {useValue: this})]; - } } diff --git a/ng2-components/ng2-alfresco-search/src/components/alfresco-search-autocomplete.component.spec.ts b/ng2-components/ng2-alfresco-search/src/components/alfresco-search-autocomplete.component.spec.ts index 9dc2702de5..f8da51679f 100644 --- a/ng2-components/ng2-alfresco-search/src/components/alfresco-search-autocomplete.component.spec.ts +++ b/ng2-components/ng2-alfresco-search/src/components/alfresco-search-autocomplete.component.spec.ts @@ -21,6 +21,7 @@ import { TestComponentBuilder } from '@angular/compiler/testing'; import { AlfrescoSearchAutocompleteComponent } from './alfresco-search-autocomplete.component'; import { SearchServiceMock } from './../assets/alfresco-search.service.mock'; import { AlfrescoThumbnailService } from './../services/alfresco-thumbnail.service'; +import { AlfrescoSearchService } from '../services/alfresco-search.service'; import { AlfrescoSettingsService, AlfrescoAuthenticationService, @@ -29,13 +30,9 @@ import { describe('AlfrescoSearchAutocompleteComponent', () => { - let searchService; - beforeEachProviders(() => { - searchService = new SearchServiceMock(); - return [ - searchService.getProviders(), + provide(AlfrescoSearchService, {useClass: SearchServiceMock}), provide(AlfrescoThumbnailService, {}), provide(AlfrescoTranslationService, {}), provide(AlfrescoSettingsService, {}), diff --git a/ng2-components/ng2-alfresco-search/src/components/alfresco-search-control.component.spec.ts b/ng2-components/ng2-alfresco-search/src/components/alfresco-search-control.component.spec.ts index 6891a677e7..e53186ff4a 100644 --- a/ng2-components/ng2-alfresco-search/src/components/alfresco-search-control.component.spec.ts +++ b/ng2-components/ng2-alfresco-search/src/components/alfresco-search-control.component.spec.ts @@ -27,16 +27,14 @@ import { AlfrescoAuthenticationService, AlfrescoContentService, AlfrescoTranslationService } from 'ng2-alfresco-core'; +import { AlfrescoSearchService } from '../services/alfresco-search.service'; + describe('AlfrescoSearchControlComponent', () => { - let searchService; - beforeEachProviders(() => { - searchService = new SearchServiceMock(); - return [ - searchService.getProviders(), + provide(AlfrescoSearchService, {useClass: SearchServiceMock}), provide(AlfrescoThumbnailService, {}), provide(AlfrescoTranslationService, {useClass: TranslationMock}), provide(AlfrescoSettingsService, {}), diff --git a/ng2-components/ng2-alfresco-search/src/components/alfresco-search.component.html b/ng2-components/ng2-alfresco-search/src/components/alfresco-search.component.html index 4602934958..42797d84a7 100644 --- a/ng2-components/ng2-alfresco-search/src/components/alfresco-search.component.html +++ b/ng2-components/ng2-alfresco-search/src/components/alfresco-search.component.html @@ -22,8 +22,8 @@ {{result.entry.name}} - {{result.entry.modifiedByUser - .displayName}} + + {{result.entry.modifiedByUser.displayName}} {{result.entry.modifiedAt | date}} diff --git a/ng2-components/ng2-alfresco-search/src/components/alfresco-search.component.spec.ts b/ng2-components/ng2-alfresco-search/src/components/alfresco-search.component.spec.ts index 02f45e3ed9..001aef6ec1 100644 --- a/ng2-components/ng2-alfresco-search/src/components/alfresco-search.component.spec.ts +++ b/ng2-components/ng2-alfresco-search/src/components/alfresco-search.component.spec.ts @@ -23,6 +23,7 @@ import { AlfrescoSearchComponent } from './alfresco-search.component'; import { SearchServiceMock } from './../assets/alfresco-search.service.mock'; import { AlfrescoThumbnailService } from './../services/alfresco-thumbnail.service'; import { TranslationMock } from './../assets/translation.service.mock'; +import { AlfrescoSearchService } from '../services/alfresco-search.service'; import { AlfrescoSettingsService, AlfrescoAuthenticationService, @@ -31,18 +32,15 @@ import { describe('AlfrescoSearchComponent', () => { - let searchService; - beforeEachProviders(() => { - searchService = new SearchServiceMock(); return [ - searchService.getProviders(), - provide(AlfrescoThumbnailService, {}), - provide(AlfrescoTranslationService, {useClass: TranslationMock}), - provide(AlfrescoSettingsService, {}), - provide(AlfrescoAuthenticationService, {}), - provide(AlfrescoContentService, {}) + { provide: AlfrescoSearchService, useClass: SearchServiceMock }, + { provide: AlfrescoThumbnailService }, + { provide: AlfrescoTranslationService, useClass: TranslationMock }, + { provide: AlfrescoSettingsService }, + { provide: AlfrescoAuthenticationService }, + { provide: AlfrescoContentService } ]; }); @@ -94,19 +92,13 @@ describe('AlfrescoSearchComponent', () => { it('should display the returned search results', inject([TestComponentBuilder], (tcb: TestComponentBuilder) => { return tcb + .overrideProviders(AlfrescoSearchComponent, [ + { provide: AlfrescoSearchService, useClass: SearchServiceMock } + ]) .createAsync(AlfrescoSearchComponent) .then((fixture) => { let componentInstance = fixture.componentInstance; - componentInstance.results = [{ - entry: { - id: '123', - name: 'MyDoc', - content: { - mimetype: 'text/plain' - } - } - }]; - + componentInstance.searchTerm = ''; componentInstance.ngOnChanges(); fixture.detectChanges(); diff --git a/ng2-components/ng2-alfresco-search/src/services/alfresco-search.service.ts b/ng2-components/ng2-alfresco-search/src/services/alfresco-search.service.ts index 7808ccb321..c06f58ca69 100644 --- a/ng2-components/ng2-alfresco-search/src/services/alfresco-search.service.ts +++ b/ng2-components/ng2-alfresco-search/src/services/alfresco-search.service.ts @@ -20,8 +20,7 @@ import { Observable } from 'rxjs/Rx'; import { AlfrescoSettingsService, - AlfrescoAuthenticationService, - AlfrescoContentService + AlfrescoAuthenticationService } from 'ng2-alfresco-core'; declare let AlfrescoApi: any; @@ -33,8 +32,7 @@ declare let AlfrescoApi: any; export class AlfrescoSearchService { constructor(private settings: AlfrescoSettingsService, - private authService: AlfrescoAuthenticationService, - private contentService: AlfrescoContentService) { + private authService: AlfrescoAuthenticationService) { } private getAlfrescoClient() {