From b200eab4665460e27955d7b8d8646c9870a704ec Mon Sep 17 00:00:00 2001 From: Will Abson Date: Wed, 5 Oct 2016 10:18:01 +0100 Subject: [PATCH] Rename fixture variable to clean up test code Refs #737 --- ...esco-search-autocomplete.component.spec.ts | 52 ++++++------ .../alfresco-search-control.component.spec.ts | 80 +++++++++---------- .../alfresco-search.component.spec.ts | 36 ++++----- 3 files changed, 84 insertions(+), 84 deletions(-) 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 f8e55488e5..7694f261e1 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 @@ -31,7 +31,7 @@ import { describe('AlfrescoSearchAutocompleteComponent', () => { - let alfrescoSearchComponentFixture: ComponentFixture, element: HTMLElement; + let fixture: ComponentFixture, element: HTMLElement; let component: AlfrescoSearchAutocompleteComponent; let result = { @@ -110,16 +110,16 @@ describe('AlfrescoSearchAutocompleteComponent', () => { AlfrescoSearchService ] }).compileComponents().then(() => { - alfrescoSearchComponentFixture = TestBed.createComponent(AlfrescoSearchAutocompleteComponent); - component = alfrescoSearchComponentFixture.componentInstance; - element = alfrescoSearchComponentFixture.nativeElement; + fixture = TestBed.createComponent(AlfrescoSearchAutocompleteComponent); + component = fixture.componentInstance; + element = fixture.nativeElement; }); })); it('should setup i18n folder', () => { - let translationService = alfrescoSearchComponentFixture.debugElement.injector.get(AlfrescoTranslationService); + let translationService = fixture.debugElement.injector.get(AlfrescoTranslationService); spyOn(translationService, 'addTranslationFolder'); - alfrescoSearchComponentFixture.detectChanges(); + fixture.detectChanges(); expect(translationService.addTranslationFolder).toHaveBeenCalledWith('node_modules/ng2-alfresco-search/dist/src'); }); @@ -130,21 +130,21 @@ describe('AlfrescoSearchAutocompleteComponent', () => { component.ngOnChanges({ searchTerm: searchTerm }); - alfrescoSearchComponentFixture.detectChanges(); + fixture.detectChanges(); expect(component.displaySearchResults).toHaveBeenCalledWith(searchTerm.currentValue); }); it('should clear results straight away when a new search term is entered', (done) => { - let searchService = alfrescoSearchComponentFixture.debugElement.injector.get(AlfrescoSearchService); + let searchService = fixture.debugElement.injector.get(AlfrescoSearchService); spyOn(searchService, 'getSearchNodesPromise') .and.returnValue(Promise.resolve(result)); component.resultsEmitter.subscribe(x => { - alfrescoSearchComponentFixture.detectChanges(); + fixture.detectChanges(); component.searchTerm = 'searchTerm2'; component.ngOnChanges({searchTerm: { currentValue: 'searchTerm2', previousValue: 'searchTerm'} }); - alfrescoSearchComponentFixture.detectChanges(); + fixture.detectChanges(); expect(element.querySelectorAll('table[data-automation-id="autocomplete_results"] tbody tr').length).toBe(0); done(); }); @@ -155,12 +155,12 @@ describe('AlfrescoSearchAutocompleteComponent', () => { it('should display the returned search results', (done) => { - let searchService = alfrescoSearchComponentFixture.debugElement.injector.get(AlfrescoSearchService); + let searchService = fixture.debugElement.injector.get(AlfrescoSearchService); spyOn(searchService, 'getSearchNodesPromise') .and.returnValue(Promise.resolve(result)); component.resultsEmitter.subscribe(x => { - alfrescoSearchComponentFixture.detectChanges(); + fixture.detectChanges(); expect( element.querySelector('#result_user_0').innerHTML).toBe('John Doe'); expect( element.querySelector('#result_name_0').innerHTML).toBe('MyDoc'); done(); @@ -172,18 +172,18 @@ describe('AlfrescoSearchAutocompleteComponent', () => { it('should display the correct thumbnail for result items', (done) => { - let searchService = alfrescoSearchComponentFixture.debugElement.injector.get(AlfrescoSearchService); + let searchService = fixture.debugElement.injector.get(AlfrescoSearchService); spyOn(searchService, 'getSearchNodesPromise') .and.returnValue(Promise.resolve(result)); component.baseComponentPath = 'http://localhost'; - let thumbnailService = alfrescoSearchComponentFixture.debugElement.injector.get(AlfrescoThumbnailService); + let thumbnailService = fixture.debugElement.injector.get(AlfrescoThumbnailService); spyOn(thumbnailService, 'getMimeTypeIcon').and.returnValue('fake-type-icon.svg'); spyOn(thumbnailService, 'getMimeTypeKey').and.returnValue('FAKE_TYPE'); component.resultsEmitter.subscribe(() => { - alfrescoSearchComponentFixture.detectChanges(); + fixture.detectChanges(); let imgEl = element.querySelector('#result_row_0 img'); expect(imgEl).not.toBeNull(); expect(imgEl.src).toBe('http://localhost/img/fake-type-icon.svg'); @@ -197,12 +197,12 @@ describe('AlfrescoSearchAutocompleteComponent', () => { it('should display no result if no result are returned', (done) => { - let searchService = alfrescoSearchComponentFixture.debugElement.injector.get(AlfrescoSearchService); + let searchService = fixture.debugElement.injector.get(AlfrescoSearchService); spyOn(searchService, 'getSearchNodesPromise') .and.returnValue(Promise.resolve(noResult)); component.resultsEmitter.subscribe(x => { - alfrescoSearchComponentFixture.detectChanges(); + fixture.detectChanges(); expect(element.querySelector('#search_no_result')).not.toBeNull(); done(); }); @@ -213,12 +213,12 @@ describe('AlfrescoSearchAutocompleteComponent', () => { it('should display an error if an error is encountered running the search', (done) => { - let searchService = alfrescoSearchComponentFixture.debugElement.injector.get(AlfrescoSearchService); + let searchService = fixture.debugElement.injector.get(AlfrescoSearchService); spyOn(searchService, 'getSearchNodesPromise') .and.returnValue(Promise.reject(errorJson)); component.errorEmitter.subscribe(() => { - alfrescoSearchComponentFixture.detectChanges(); + fixture.detectChanges(); let resultsEl = element.querySelector('[data-automation-id="autocomplete_results"]'); let errorEl = element.querySelector('[data-automation-id="autocomplete_error_message"]'); expect(resultsEl).toBeNull(); @@ -233,15 +233,15 @@ describe('AlfrescoSearchAutocompleteComponent', () => { it('should clear errors straight away when a new search is performed', (done) => { - let searchService = alfrescoSearchComponentFixture.debugElement.injector.get(AlfrescoSearchService); + let searchService = fixture.debugElement.injector.get(AlfrescoSearchService); spyOn(searchService, 'getSearchNodesPromise') .and.returnValue(Promise.reject(errorJson)); component.errorEmitter.subscribe(() => { - alfrescoSearchComponentFixture.detectChanges(); + fixture.detectChanges(); component.searchTerm = 'searchTerm2'; component.ngOnChanges({searchTerm: { currentValue: 'searchTerm2', previousValue: 'searchTerm'} }); - alfrescoSearchComponentFixture.detectChanges(); + fixture.detectChanges(); let errorEl = element.querySelector('[data-automation-id="autocomplete_error_message"]'); expect(errorEl).toBeNull(); done(); @@ -253,12 +253,12 @@ describe('AlfrescoSearchAutocompleteComponent', () => { it('should emit preview when file item clicked', (done) => { - let searchService = alfrescoSearchComponentFixture.debugElement.injector.get(AlfrescoSearchService); + let searchService = fixture.debugElement.injector.get(AlfrescoSearchService); spyOn(searchService, 'getSearchNodesPromise') .and.returnValue(Promise.resolve(result)); component.resultsEmitter.subscribe(x => { - alfrescoSearchComponentFixture.detectChanges(); + fixture.detectChanges(); ( element.querySelector('#result_row_0')).click(); }); @@ -272,13 +272,13 @@ describe('AlfrescoSearchAutocompleteComponent', () => { it('should not emit preview if a non-file item is clicked', (done) => { - let searchService = alfrescoSearchComponentFixture.debugElement.injector.get(AlfrescoSearchService); + let searchService = fixture.debugElement.injector.get(AlfrescoSearchService); spyOn(searchService, 'getSearchNodesPromise') .and.returnValue(Promise.resolve(folderResult)); spyOn(component.preview, 'emit'); component.resultsEmitter.subscribe(x => { - alfrescoSearchComponentFixture.detectChanges(); + fixture.detectChanges(); ( element.querySelector('#result_row_0')).click(); expect(component.preview.emit).not.toHaveBeenCalled(); done(); 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 703c811f2b..f1836f456a 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 @@ -33,7 +33,7 @@ import { AlfrescoSearchService } from '../services/alfresco-search.service'; describe('AlfrescoSearchControlComponent', () => { - let alfrescoSearchControlComponentFixture: ComponentFixture; + let fixture: ComponentFixture; let component: AlfrescoSearchControlComponent, element: HTMLElement; beforeEach(async(() => { @@ -55,76 +55,76 @@ describe('AlfrescoSearchControlComponent', () => { AlfrescoSearchService ] }).compileComponents().then(() => { - alfrescoSearchControlComponentFixture = TestBed.createComponent(AlfrescoSearchControlComponent); - component = alfrescoSearchControlComponentFixture.componentInstance; - element = alfrescoSearchControlComponentFixture.nativeElement; + fixture = TestBed.createComponent(AlfrescoSearchControlComponent); + component = fixture.componentInstance; + element = fixture.nativeElement; }); })); it('should setup i18n folder', () => { - let translationService = alfrescoSearchControlComponentFixture.debugElement.injector.get(AlfrescoTranslationService); + let translationService = fixture.debugElement.injector.get(AlfrescoTranslationService); spyOn(translationService, 'addTranslationFolder'); - alfrescoSearchControlComponentFixture.detectChanges(); + fixture.detectChanges(); expect(translationService.addTranslationFolder) .toHaveBeenCalledWith('node_modules/ng2-alfresco-search/dist/src'); }); it('should emit searchChange when search term input changed', (done) => { - alfrescoSearchControlComponentFixture.componentInstance.searchChange.subscribe(e => { + fixture.componentInstance.searchChange.subscribe(e => { expect(e.value).toBe('customSearchTerm'); done(); }); - alfrescoSearchControlComponentFixture.detectChanges(); - alfrescoSearchControlComponentFixture.componentInstance.searchTerm = 'customSearchTerm'; - alfrescoSearchControlComponentFixture.detectChanges(); + fixture.detectChanges(); + fixture.componentInstance.searchTerm = 'customSearchTerm'; + fixture.detectChanges(); }); it('should emit searchChange when search term changed by user', (done) => { - alfrescoSearchControlComponentFixture.detectChanges(); - alfrescoSearchControlComponentFixture.componentInstance.searchChange.subscribe(e => { + fixture.detectChanges(); + fixture.componentInstance.searchChange.subscribe(e => { expect(e.value).toBe('customSearchTerm211'); done(); }); component.searchControl.setValue('customSearchTerm211', true); - alfrescoSearchControlComponentFixture.detectChanges(); + fixture.detectChanges(); }); describe('Component rendering', () => { it('should display a text input field by default', () => { - alfrescoSearchControlComponentFixture.detectChanges(); + fixture.detectChanges(); expect(element.querySelectorAll('input[type="text"]').length).toBe(1); }); it('should display a search input field when specified', () => { - alfrescoSearchControlComponentFixture.componentInstance.inputType = 'search'; - alfrescoSearchControlComponentFixture.detectChanges(); + fixture.componentInstance.inputType = 'search'; + fixture.detectChanges(); expect(element.querySelectorAll('input[type="search"]').length).toBe(1); }); it('should set browser autocomplete to off by default', () => { - alfrescoSearchControlComponentFixture.detectChanges(); + fixture.detectChanges(); let attr = element.querySelectorAll('input[type="text"]')[0].getAttribute('autocomplete'); expect(attr).toBe('off'); }); it('should set browser autocomplete to on when configured', () => { - alfrescoSearchControlComponentFixture.componentInstance.autocomplete = true; - alfrescoSearchControlComponentFixture.detectChanges(); + fixture.componentInstance.autocomplete = true; + fixture.detectChanges(); expect(element.querySelectorAll('input[type="text"]')[0].getAttribute('autocomplete')).toBe('on'); }); it('should show an expanding control by default', () => { - alfrescoSearchControlComponentFixture.detectChanges(); + fixture.detectChanges(); expect(element.querySelectorAll('div.mdl-textfield--expandable').length).toBe(1); expect(element.querySelectorAll('div.mdl-textfield__expandable-holder').length).toBe(1); expect(element.querySelectorAll('label.mdl-button--icon').length).toBe(1); }); it('should show a normal non-expanding control when configured', () => { - alfrescoSearchControlComponentFixture.detectChanges(); - alfrescoSearchControlComponentFixture.componentInstance.expandable = false; - alfrescoSearchControlComponentFixture.detectChanges(); + fixture.detectChanges(); + fixture.componentInstance.expandable = false; + fixture.detectChanges(); expect(element.querySelectorAll('div.mdl-textfield--expandable').length).toBe(0); expect(element.querySelectorAll('div.mdl-textfield__expandable-holder').length).toBe(0); expect(element.querySelectorAll('label.mdl-button--icon').length).toBe(0); @@ -140,31 +140,31 @@ describe('AlfrescoSearchControlComponent', () => { }); it('should display a find-as-you-type control by default', () => { - alfrescoSearchControlComponentFixture.detectChanges(); + fixture.detectChanges(); let autocomplete: Element = element.querySelector('alfresco-search-autocomplete'); expect(autocomplete).not.toBeNull(); }); it('should make find-as-you-type control hidden initially', () => { - alfrescoSearchControlComponentFixture.detectChanges(); + fixture.detectChanges(); let autocomplete: Element = element.querySelector('alfresco-search-autocomplete'); expect(autocomplete.classList.contains('active')).toBe(false); }); it('should make find-as-you-type control visible when search box has focus', () => { - alfrescoSearchControlComponentFixture.detectChanges(); + fixture.detectChanges(); inputEl.dispatchEvent(new Event('focus')); - alfrescoSearchControlComponentFixture.detectChanges(); + fixture.detectChanges(); let autocomplete: Element = element.querySelector('alfresco-search-autocomplete'); expect(autocomplete.classList.contains('active')).toBe(true); }); it('should hide find-as-you-type results when the search box loses focus', (done) => { - alfrescoSearchControlComponentFixture.detectChanges(); + fixture.detectChanges(); inputEl.dispatchEvent(new Event('focus')); inputEl.dispatchEvent(new Event('blur')); window.setTimeout(() => { - alfrescoSearchControlComponentFixture.detectChanges(); + fixture.detectChanges(); let autocomplete: Element = element.querySelector('alfresco-search-autocomplete'); expect(autocomplete.classList.contains('active')).toBe(false); done(); @@ -172,18 +172,18 @@ describe('AlfrescoSearchControlComponent', () => { }); it('should hide find-as-you-type results when escape key pressed', () => { - alfrescoSearchControlComponentFixture.detectChanges(); + fixture.detectChanges(); inputEl.dispatchEvent(new Event('focus')); inputEl.dispatchEvent(new KeyboardEvent('keyup', { key: 'Escape' })); - alfrescoSearchControlComponentFixture.detectChanges(); + fixture.detectChanges(); let autocomplete: Element = element.querySelector('alfresco-search-autocomplete'); expect(autocomplete.classList.contains('active')).toBe(false); }); it('should make find-as-you-type control visible again when down arrow is pressed', () => { - alfrescoSearchControlComponentFixture.detectChanges(); + fixture.detectChanges(); inputEl.dispatchEvent(new Event('focus')); inputEl.dispatchEvent(new KeyboardEvent('keyup', { key: 'Escape' @@ -191,14 +191,14 @@ describe('AlfrescoSearchControlComponent', () => { inputEl.dispatchEvent(new KeyboardEvent('keyup', { key: 'ArrowDown' })); - alfrescoSearchControlComponentFixture.detectChanges(); + fixture.detectChanges(); let autocomplete: Element = element.querySelector('alfresco-search-autocomplete'); expect(autocomplete.classList.contains('active')).toBe(true); }); it('should NOT display a find-as-you-type control when configured not to', () => { - alfrescoSearchControlComponentFixture.componentInstance.autocompleteEnabled = false; - alfrescoSearchControlComponentFixture.detectChanges(); + fixture.componentInstance.autocompleteEnabled = false; + fixture.detectChanges(); let autocomplete: Element = element.querySelector('alfresco-search-autocomplete'); expect(autocomplete).toBeNull(); }); @@ -209,14 +209,14 @@ describe('AlfrescoSearchControlComponent', () => { it('should fire a search when a term has been entered', () => { spyOn(component.searchSubmit, 'emit'); - alfrescoSearchControlComponentFixture.detectChanges(); + fixture.detectChanges(); let formEl: HTMLElement = element.querySelector('form'); component.searchTerm = 'searchTerm1'; component.searchControl.setValue('searchTerm1', true); - alfrescoSearchControlComponentFixture.detectChanges(); + fixture.detectChanges(); formEl.dispatchEvent(new Event('submit')); - alfrescoSearchControlComponentFixture.detectChanges(); + fixture.detectChanges(); expect(component.searchSubmit.emit).toHaveBeenCalledWith({ 'value': 'searchTerm1' @@ -225,13 +225,13 @@ describe('AlfrescoSearchControlComponent', () => { it('should not fire a search when no term has been entered', () => { spyOn(component.searchSubmit, 'emit'); - alfrescoSearchControlComponentFixture.detectChanges(); + fixture.detectChanges(); let inputEl: HTMLInputElement = element.querySelector('input[type="text"]'); let formEl: HTMLElement = element.querySelector('form'); inputEl.value = ''; formEl.dispatchEvent(new Event('submit')); - alfrescoSearchControlComponentFixture.detectChanges(); + fixture.detectChanges(); expect(component.searchSubmit.emit).not.toHaveBeenCalled(); }); 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 ec6cd7d195..b4278936c4 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 @@ -34,7 +34,7 @@ import { describe('AlfrescoSearchComponent', () => { - let alfrescoSearchComponentFixture: ComponentFixture, element: HTMLElement; + let fixture: ComponentFixture, element: HTMLElement; let component: AlfrescoSearchComponent; let result = { @@ -113,9 +113,9 @@ describe('AlfrescoSearchComponent', () => { AlfrescoContentService ] }).compileComponents().then(() => { - alfrescoSearchComponentFixture = TestBed.createComponent(AlfrescoSearchComponent); - component = alfrescoSearchComponentFixture.componentInstance; - element = alfrescoSearchComponentFixture.nativeElement; + fixture = TestBed.createComponent(AlfrescoSearchComponent); + component = fixture.componentInstance; + element = fixture.nativeElement; }); })); @@ -148,9 +148,9 @@ describe('AlfrescoSearchComponent', () => { }); it('should setup i18n folder', () => { - let translationService = alfrescoSearchComponentFixture.debugElement.injector.get(AlfrescoTranslationService); + let translationService = fixture.debugElement.injector.get(AlfrescoTranslationService); spyOn(translationService, 'addTranslationFolder'); - alfrescoSearchComponentFixture.detectChanges(); + fixture.detectChanges(); expect(translationService.addTranslationFolder).toHaveBeenCalledWith('node_modules/ng2-alfresco-search/dist/src'); }); @@ -158,12 +158,12 @@ describe('AlfrescoSearchComponent', () => { it('should display search results when a search term is provided', (done) => { - let searchService = alfrescoSearchComponentFixture.debugElement.injector.get(AlfrescoSearchService); + let searchService = fixture.debugElement.injector.get(AlfrescoSearchService); spyOn(searchService, 'getSearchNodesPromise') .and.returnValue(Promise.resolve(result)); component.resultsEmitter.subscribe(x => { - alfrescoSearchComponentFixture.detectChanges(); + fixture.detectChanges(); expect(searchService.getSearchNodesPromise).toHaveBeenCalled(); expect(element.querySelector('#result_user_0')).not.toBeNull(); expect(element.querySelector('#result_user_0').innerHTML).toBe('John Doe'); @@ -177,12 +177,12 @@ describe('AlfrescoSearchComponent', () => { it('should display no result if no result are returned', (done) => { - let searchService = alfrescoSearchComponentFixture.debugElement.injector.get(AlfrescoSearchService); + let searchService = fixture.debugElement.injector.get(AlfrescoSearchService); spyOn(searchService, 'getSearchNodesPromise') .and.returnValue(Promise.resolve(noResult)); component.resultsEmitter.subscribe(x => { - alfrescoSearchComponentFixture.detectChanges(); + fixture.detectChanges(); expect(element.querySelector('#search_no_result')).not.toBeNull(); done(); }); @@ -193,12 +193,12 @@ describe('AlfrescoSearchComponent', () => { it('should display an error if an error is encountered running the search', (done) => { - let searchService = alfrescoSearchComponentFixture.debugElement.injector.get(AlfrescoSearchService); + let searchService = fixture.debugElement.injector.get(AlfrescoSearchService); spyOn(searchService, 'getSearchNodesPromise') .and.returnValue(Promise.reject(errorJson)); component.errorEmitter.subscribe(() => { - alfrescoSearchComponentFixture.detectChanges(); + fixture.detectChanges(); let resultsEl = element.querySelector('[data-automation-id="search_result_table"]'); let errorEl = element.querySelector('[data-automation-id="search_error_message"]'); expect(resultsEl).toBeNull(); @@ -213,12 +213,12 @@ describe('AlfrescoSearchComponent', () => { it('should update search results when the search term input is changed', (done) => { - let searchService = alfrescoSearchComponentFixture.debugElement.injector.get(AlfrescoSearchService); + let searchService = fixture.debugElement.injector.get(AlfrescoSearchService); spyOn(searchService, 'getSearchNodesPromise') .and.returnValue(Promise.resolve(result)); component.resultsEmitter.subscribe(x => { - alfrescoSearchComponentFixture.detectChanges(); + fixture.detectChanges(); expect(searchService.getSearchNodesPromise).toHaveBeenCalledWith('searchTerm2'); expect(element.querySelector('#result_user_0')).not.toBeNull(); expect(element.querySelector('#result_user_0').innerHTML).toBe('John Doe'); @@ -234,12 +234,12 @@ describe('AlfrescoSearchComponent', () => { it('should emit preview when file item clicked', (done) => { - let searchService = alfrescoSearchComponentFixture.debugElement.injector.get(AlfrescoSearchService); + let searchService = fixture.debugElement.injector.get(AlfrescoSearchService); spyOn(searchService, 'getSearchNodesPromise') .and.returnValue(Promise.resolve(result)); component.resultsEmitter.subscribe(() => { - alfrescoSearchComponentFixture.detectChanges(); + fixture.detectChanges(); ( element.querySelector('#result_row_0')).click(); }); @@ -253,13 +253,13 @@ describe('AlfrescoSearchComponent', () => { it('should not emit preview when non-file item is clicked', (done) => { - let searchService = alfrescoSearchComponentFixture.debugElement.injector.get(AlfrescoSearchService); + let searchService = fixture.debugElement.injector.get(AlfrescoSearchService); spyOn(searchService, 'getSearchNodesPromise') .and.returnValue(Promise.resolve(folderResult)); spyOn(component.preview, 'emit'); component.resultsEmitter.subscribe(x => { - alfrescoSearchComponentFixture.detectChanges(); + fixture.detectChanges(); ( element.querySelector('#result_row_0')).click(); expect(component.preview.emit).not.toHaveBeenCalled(); done();