diff --git a/ng2-components/ng2-alfresco-documentlist/src/assets/alfresco.service.mock.ts b/ng2-components/ng2-alfresco-documentlist/src/assets/alfresco.service.mock.ts index 1a30abe443..5a37ff8720 100644 --- a/ng2-components/ng2-alfresco-documentlist/src/assets/alfresco.service.mock.ts +++ b/ng2-components/ng2-alfresco-documentlist/src/assets/alfresco.service.mock.ts @@ -16,6 +16,7 @@ */ import {Observable} from 'rxjs/Observable'; +import { MinimalNodeEntity } from '../models/document-library.model'; import {AlfrescoService} from '../../src/services/alfresco.service'; import { AlfrescoSettingsService, @@ -41,4 +42,8 @@ export class AlfrescoServiceMock extends AlfrescoService { observer.complete(); }); } + + getDocumentThumbnailUrl(folder: MinimalNodeEntity) { + return ''; + } } diff --git a/ng2-components/ng2-alfresco-documentlist/src/components/document-list.spec.ts b/ng2-components/ng2-alfresco-documentlist/src/components/document-list.spec.ts index fa29f46362..0e4cd5390f 100644 --- a/ng2-components/ng2-alfresco-documentlist/src/components/document-list.spec.ts +++ b/ng2-components/ng2-alfresco-documentlist/src/components/document-list.spec.ts @@ -100,20 +100,34 @@ describe('DocumentList', () => { expect(documentList.folder).toBe(folder); }); - it('should get content url', () => { + it('should return thumbnail url for a file when thumbnails turned on', () => { let url = 'URL'; - spyOn(alfrescoServiceMock, 'getContentUrl').and.returnValue(url); + spyOn(alfrescoServiceMock, 'getDocumentThumbnailUrl').and.returnValue(url); - let result = documentList.getContentUrl(null); + let node = new MinimalNodeEntity(); + node.entry = new MinimalNodeEntryEntity(); + node.entry.isFile = true; + documentList.thumbnails = true; + let result = documentList.getThumbnailUrl(node); expect(result).toBe(url); - expect(alfrescoServiceMock.getContentUrl).toHaveBeenCalled(); + expect(alfrescoServiceMock.getDocumentThumbnailUrl).toHaveBeenCalled(); }); - it('should return no content url without service', () => { + it('should return a null thumbnail url for a null item', () => { + let url = 'URL'; + spyOn(alfrescoServiceMock, 'getDocumentThumbnailUrl').and.returnValue(url); + + let result = documentList.getThumbnailUrl(null); + + expect(result).toBeNull(); + expect(alfrescoServiceMock.getDocumentThumbnailUrl).not.toHaveBeenCalled(); + }); + + it('should return no thumbnail url without service', () => { let list = new DocumentList(null); let node = new MinimalNodeEntity(); - expect(list.getContentUrl(node)).toBeNull(); + expect(list.getThumbnailUrl(node)).toBeNull(); }); it('should execute action with node', () => { diff --git a/ng2-components/ng2-alfresco-documentlist/src/components/document-list.ts b/ng2-components/ng2-alfresco-documentlist/src/components/document-list.ts index bb4575a6ba..119bbedf1b 100644 --- a/ng2-components/ng2-alfresco-documentlist/src/components/document-list.ts +++ b/ng2-components/ng2-alfresco-documentlist/src/components/document-list.ts @@ -298,18 +298,6 @@ export class DocumentList implements OnInit, AfterViewChecked, AfterContentInit, } } - /** - * Gets content URL for the given node. - * @param node Node to get URL for. - * @returns {string} URL address. - */ - getContentUrl(node: MinimalNodeEntity): string { - if (this._alfrescoService) { - return this._alfrescoService.getContentUrl(node); - } - return null; - } - /** * Gets thumbnail URL for the given node. * @param node Node to get URL for.