inteligr8/alfresco-ng2-components
1
0
Fork 0
mirror of https://github.com/Alfresco/alfresco-ng2-components.git synced 2025-05-26 17:24:56 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #735 from Alfresco/dev-valbano-fix-671

Browse Source 
Fix wrong reference to search term
This commit is contained in:
Denys Vuika 2016-09-12 19:07:41 +01:00 committed by GitHub
commit 4f079ed7fd
4 changed files with 12 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
ng2-components/ng2-alfresco-search/src/components/alfresco-search-autocomplete.component.spec.ts
View File

@ -101,14 +101,14 @@ describe('AlfrescoSearchAutocompleteComponent', () => {
}); });
it('should display search results when a search term is provided', () => { it('should display search results when a search term is provided', () => {
let searchTerm = 'customSearchTerm'; let searchTerm = { currentValue: 'customSearchTerm', previousValue: ''};
spyOn(component, 'displaySearchResults').and.stub(); spyOn(component, 'displaySearchResults').and.stub();
component.searchTerm = searchTerm; component.searchTerm = searchTerm;
component.ngOnChanges({ component.ngOnChanges({
searchTerm: searchTerm searchTerm: searchTerm
}); });
alfrescoSearchComponentFixture.detectChanges(); alfrescoSearchComponentFixture.detectChanges();
expect(component.displaySearchResults).toHaveBeenCalledWith(searchTerm); expect(component.displaySearchResults).toHaveBeenCalledWith(searchTerm.currentValue);
}); });
it('should display the returned search results', (done) => { it('should display the returned search results', (done) => {
@ -119,8 +119,8 @@ describe('AlfrescoSearchAutocompleteComponent', () => {
done(); done();
}); });
component.searchTerm = 'searchTerm'; component.searchTerm = { currentValue: 'searchTerm', previousValue: ''};
component.ngOnChanges({searchTerm: component.searchTerm}); component.ngOnChanges({searchTerm: component.searchTerm });
jasmine.Ajax.requests.mostRecent().respondWith({ jasmine.Ajax.requests.mostRecent().respondWith({
status: 200, status: 200,
@ -136,7 +136,7 @@ describe('AlfrescoSearchAutocompleteComponent', () => {
done(); done();
}); });
component.searchTerm = 'searchTerm'; component.searchTerm = { currentValue: 'searchTerm', previousValue: ''};
component.ngOnChanges({searchTerm: component.searchTerm}); component.ngOnChanges({searchTerm: component.searchTerm});
jasmine.Ajax.requests.mostRecent().respondWith({ jasmine.Ajax.requests.mostRecent().respondWith({
@ -152,7 +152,7 @@ describe('AlfrescoSearchAutocompleteComponent', () => {
element.querySelector('#result_row_0').click(); element.querySelector('#result_row_0').click();
}); });
component.searchTerm = 'searchTerm'; component.searchTerm = { currentValue: 'searchTerm', previousValue: ''};
component.ngOnChanges({searchTerm: component.searchTerm}); component.ngOnChanges({searchTerm: component.searchTerm});
jasmine.Ajax.requests.mostRecent().respondWith({ jasmine.Ajax.requests.mostRecent().respondWith({
@ -169,7 +169,7 @@ describe('AlfrescoSearchAutocompleteComponent', () => {
it('should not emit preview when non-file item is clicked', () => { it('should not emit preview when non-file item is clicked', () => {
spyOn(component, 'onItemClick').and.stub(); spyOn(component, 'onItemClick').and.stub();
component.ngOnChanges({searchTerm: 'searchTerm'}); component.ngOnChanges({searchTerm: { currentValue: 'searchTerm', previousValue: ''} });
component.preview.subscribe(e => { component.preview.subscribe(e => {
expect(e.value).toBe(component.results[0]); expect(e.value).toBe(component.results[0]);
@ -183,4 +183,5 @@ describe('AlfrescoSearchAutocompleteComponent', () => {
expect(component.onItemClick).not.toHaveBeenCalled(); expect(component.onItemClick).not.toHaveBeenCalled();
}); });
}); });

2
ng2-components/ng2-alfresco-search/src/components/alfresco-search-autocomplete.component.ts
View File

@ -61,7 +61,7 @@ export class AlfrescoSearchAutocompleteComponent implements OnChanges {
ngOnChanges(changes) { ngOnChanges(changes) {
if (changes.searchTerm) { if (changes.searchTerm) {
this.displaySearchResults(changes.searchTerm); this.displaySearchResults(changes.searchTerm.currentValue);
} }
} }

4
ng2-components/ng2-alfresco-search/src/components/alfresco-search.component.spec.ts
View File

@ -123,7 +123,7 @@ describe('AlfrescoSearchComponent', () => {
it('should display search results when a search term is provided', (done) => { it('should display search results when a search term is provided', (done) => {
component.searchTerm = 'searchTerm'; component.searchTerm = { currentValue: 'searchTerm', previousValue: ''};
component.ngOnChanges({searchTerm: component.searchTerm}); component.ngOnChanges({searchTerm: component.searchTerm});
component.resultsEmitter.subscribe(x => { component.resultsEmitter.subscribe(x => {
@ -148,7 +148,7 @@ describe('AlfrescoSearchComponent', () => {
done(); done();
}); });
component.searchTerm = 'searchTerm'; component.searchTerm = { currentValue: 'searchTerm', previousValue: ''};
component.ngOnChanges({searchTerm: component.searchTerm}); component.ngOnChanges({searchTerm: component.searchTerm});
jasmine.Ajax.requests.mostRecent().respondWith({ jasmine.Ajax.requests.mostRecent().respondWith({

2
ng2-components/ng2-alfresco-search/src/components/alfresco-search.component.ts
View File

@ -71,7 +71,7 @@ export class AlfrescoSearchComponent implements OnChanges, OnInit {
ngOnChanges(changes): void { ngOnChanges(changes): void {
if (changes.searchTerm) { if (changes.searchTerm) {
this.displaySearchResults(changes.searchTerm); this.displaySearchResults(changes.searchTerm.currentValue);
} }
} }