complete and refactorin test

ng2-components/ng2-alfresco-viewer/src/pdfViewer.component.html

@@ -13,7 +13,7 @@
 
 
 <!-- Pagination toolbar start -->
-<div *ngIf="showToolbar]" id="viewer-toolbar-pagination" class="viewer-toolbar-pagination mdl-cell--hide-tablet mdl-cell--hide-phone">
+<div *ngIf="showToolbar" id="viewer-toolbar-pagination" class="viewer-toolbar-pagination mdl-cell--hide-tablet mdl-cell--hide-phone">
     <div id="viewer-previous-page-button" class="button-page left" (click)="previousPage()">
         <i class="icon material-icons">keyboard_arrow_left</i>
     </div>

ng2-components/ng2-alfresco-viewer/src/pdfViewer.component.spec.ts

@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 
-import { describe, expect, it, inject, beforeEachProviders } from '@angular/core/testing';
+import {describe, expect, it, inject, beforeEachProviders, beforeEach} from '@angular/core/testing';
 import {TestComponentBuilder} from '@angular/compiler/testing';
 
 import {PdfViewerComponent} from './pdfViewer.component';
@@ -29,6 +29,9 @@ import { AlfrescoAuthenticationService, AlfrescoSettingsService } from 'ng2-alfr
 
 describe('PdfViewer', () => {
 
+    let pdfComponentFixture, element, component;
+
+
     beforeEachProviders(() => {
         return [
             HTTP_PROVIDERS,
@@ -37,52 +40,48 @@ describe('PdfViewer', () => {
         ];
     });
 
-    describe('View', () => {
+    beforeEach(inject([TestComponentBuilder], (tcb: TestComponentBuilder) => {
-        it('Canvas should be present', inject([TestComponentBuilder], (tcb: TestComponentBuilder) => {
         return tcb
             .createAsync(PdfViewerComponent)
-                .then((fixture) => {
+            .then(fixture => {
-                    let element = fixture.nativeElement;
+                pdfComponentFixture = fixture;
+                element = fixture.nativeElement;
+                component = fixture.componentInstance;
 
-                    fixture.detectChanges();
+                spyOn(component, 'getPDFJS').and.returnValue(new PDFJSmock());
+                spyOn(component, 'initPDFViewer').and.callFake(() => {
+                    component.pdfViewer = new PDFViewermock();
+                });
 
+                component.showToolbar = true;
+                component.urlFile = 'fake-url-file';
+                pdfComponentFixture.detectChanges();
+            });
+    }));
+
+    describe('View', () => {
+        it('Canvas should be present', () => {
             expect(element.querySelector('#viewer-viewerPdf')).not.toBeNull();
             expect(element.querySelector('#viewer-pdf-container')).not.toBeNull();
         });
-        }));
 
-        it('Loader should be present', inject([TestComponentBuilder], (tcb: TestComponentBuilder) => {
+        it('Loader should be present', () => {
-            return tcb
+            pdfComponentFixture.detectChanges();
-                .createAsync(PdfViewerComponent)
-                .then((fixture) => {
-                    let element = fixture.nativeElement;
-
-                    fixture.detectChanges();
 
             expect(element.querySelector('#loader-container')).not.toBeNull();
+
         });
-        }));
 
-        it('Next an Previous Buttons should be present', inject([TestComponentBuilder], (tcb: TestComponentBuilder) => {
+        it('Next an Previous Buttons should be present', () => {
-            return tcb
+            pdfComponentFixture.detectChanges();
-                .createAsync(PdfViewerComponent)
-                .then((fixture) => {
-                    let element = fixture.nativeElement;
-
-                    fixture.detectChanges();
 
             expect(element.querySelector('#viewer-previous-page-button')).not.toBeNull();
             expect(element.querySelector('#viewer-next-page-button')).not.toBeNull();
         });
-        }));
 
-        it('Input Page elements should be present', inject([TestComponentBuilder], (tcb: TestComponentBuilder) => {
-            return tcb
-                .createAsync(PdfViewerComponent)
-                .then((fixture) => {
-                    let element = fixture.nativeElement;
 
-                    fixture.detectChanges();
+        it('Input Page elements should be present', () => {
+            pdfComponentFixture.detectChanges();
 
             expect(element.querySelector('#viewer-pagenumber-input')).toBeDefined();
             expect(element.querySelector('#viewer-total-pages')).toBeDefined();
@@ -90,284 +89,153 @@ describe('PdfViewer', () => {
             expect(element.querySelector('#viewer-previous-page-button')).not.toBeNull();
             expect(element.querySelector('#viewer-next-page-button')).not.toBeNull();
         });
-        }));
+
+        it('Toolbar should be hide if showToolbar is false', () => {
+            component.showToolbar = false;
+
+            pdfComponentFixture.detectChanges();
+
+            expect(element.querySelector('#viewer-toolbar-command')).toBeNull();
+            expect(element.querySelector('#viewer-toolbar-pagination')).toBeNull();
+        });
     });
 
     describe('User interaction', () => {
-        it('Total number of pages should be loaded', inject([TestComponentBuilder], (tcb: TestComponentBuilder) => {
+
-            return tcb
+        beforeEach(() => {
-                .createAsync(PdfViewerComponent)
+            component.inputPage(1);
-                .then((fixture) => {
-                    let component = fixture.componentInstance;
-                    component.urlFile = 'fake-url-file';
-                    spyOn(component, 'getPDFJS').and.returnValue(new PDFJSmock());
-                    spyOn(component, 'initPDFViewer').and.callFake(() => {
-                        component.pdfViewer = new PDFViewermock();
         });
 
+        it('Total number of pages should be loaded', () => {
             component.ngOnChanges().then(() => {
                 expect(component.totalPages).toEqual('10');
             });
         });
-        }));
-
-
-        it('right arrow should move to the next page', inject([TestComponentBuilder], (tcb: TestComponentBuilder) => {
-            return tcb
-                .createAsync(PdfViewerComponent)
-                .then((fixture) => {
-                    let component = fixture.componentInstance;
-                    spyOn(component, 'getPDFJS').and.returnValue(new PDFJSmock());
-                    spyOn(component, 'initPDFViewer').and.callFake(() => {
-                        component.pdfViewer = new PDFViewermock();
-                    });
-
-                    component.urlFile = 'fake-url-file';
 
+        it('right arrow should move to the next page', (done) => {
             component.ngOnChanges().then(() => {
-                        fixture.detectChanges();
+                pdfComponentFixture.detectChanges();
                 expect(component.displayPage).toBe(1);
                 EventMock.keyDown(39);
-                        fixture.detectChanges();
+                pdfComponentFixture.detectChanges();
                 expect(component.displayPage).toBe(2);
-                    }).catch((error) => {
+                done();
-                        expect(error).toBeUndefined();
             });
         });
-        }));
-
-        it('nextPage should move to the next page', inject([TestComponentBuilder], (tcb: TestComponentBuilder) => {
-            return tcb
-                .createAsync(PdfViewerComponent)
-                .then((fixture) => {
-                    let component = fixture.componentInstance;
-                    let element = fixture.nativeElement;
-
-                    spyOn(component, 'getPDFJS').and.returnValue(new PDFJSmock());
-                    spyOn(component, 'initPDFViewer').and.callFake(() => {
-                        component.pdfViewer = new PDFViewermock();
-                    });
-
-                    component.urlFile = 'fake-url-file';
 
+        it('nextPage should move to the next page', (done) => {
             let nextPageButton = element.querySelector('#viewer-next-page-button');
 
             component.ngOnChanges().then(() => {
-                        fixture.detectChanges();
+                pdfComponentFixture.detectChanges();
                 expect(component.displayPage).toBe(1);
                 nextPageButton.click();
-                        fixture.detectChanges();
+                pdfComponentFixture.detectChanges();
                 expect(component.displayPage).toBe(2);
-                    }).catch((error) => {
+                done();
-                        expect(error).toBeUndefined();
             });
         });
-        }));
-
-        it('left arrow should move to the previous page', inject([TestComponentBuilder], (tcb: TestComponentBuilder) => {
-            return tcb
-                .createAsync(PdfViewerComponent)
-                .then((fixture) => {
-                    let component = fixture.componentInstance;
-                    spyOn(component, 'getPDFJS').and.returnValue(new PDFJSmock());
-                    spyOn(component, 'initPDFViewer').and.callFake(() => {
-                        component.pdfViewer = new PDFViewermock();
-                    });
-
-                    component.urlFile = 'fake-url-file';
 
+        it('left arrow should move to the previous page', (done) => {
             component.ngOnChanges().then(() => {
-                        fixture.detectChanges();
+                pdfComponentFixture.detectChanges();
                 expect(component.displayPage).toBe(1);
                 EventMock.keyDown(39);
                 EventMock.keyDown(39);
                 EventMock.keyDown(37);
-                        fixture.detectChanges();
+                pdfComponentFixture.detectChanges();
                 expect(component.displayPage).toBe(2);
-                    }).catch((error) => {
+                done();
-                        expect(error).toBeUndefined();
             });
         });
-        }));
 
-        it('previous page should move to the previous page', inject([TestComponentBuilder], (tcb: TestComponentBuilder) => {
+        it('previous page should move to the previous page', (done) => {
-            return tcb
-                .createAsync(PdfViewerComponent)
-                .then((fixture) => {
-                    let component = fixture.componentInstance;
-                    let element = fixture.nativeElement;
-
-                    spyOn(component, 'getPDFJS').and.returnValue(new PDFJSmock());
-                    spyOn(component, 'initPDFViewer').and.callFake(() => {
-                        component.pdfViewer = new PDFViewermock();
-                    });
-
-                    component.urlFile = 'fake-url-file';
             let previousPageButton = element.querySelector('#viewer-previous-page-button');
             let nextPageButton = element.querySelector('#viewer-next-page-button');
 
             component.ngOnChanges().then(() => {
-                        fixture.detectChanges();
+                pdfComponentFixture.detectChanges();
                 expect(component.displayPage).toBe(1);
                 nextPageButton.click();
                 nextPageButton.click();
                 previousPageButton.click();
-                        fixture.detectChanges();
+                pdfComponentFixture.detectChanges();
                 expect(component.displayPage).toBe(2);
-                    }).catch((error) => {
+                done();
-                        expect(error).toBeUndefined();
             });
         });
-        }));
 
         /* tslint:disable:max-line-length */
-        it('previous page should not move to the previous page if is page 1', inject([TestComponentBuilder], (tcb: TestComponentBuilder) => {
+        it('previous page should not move to the previous page if is page 1', (done) => {
-            return tcb
-                .createAsync(PdfViewerComponent)
-                .then((fixture) => {
-                    let component = fixture.componentInstance;
-                    spyOn(component, 'getPDFJS').and.returnValue(new PDFJSmock());
-                    spyOn(component, 'initPDFViewer').and.callFake(() => {
-                        component.pdfViewer = new PDFViewermock();
-                    });
-
-                    component.urlFile = 'fake-url-file';
-
             component.ngOnChanges().then(() => {
-                        fixture.detectChanges();
+                pdfComponentFixture.detectChanges();
                 expect(component.displayPage).toBe(1);
                 component.previousPage();
-                        fixture.detectChanges();
+                pdfComponentFixture.detectChanges();
                 expect(component.displayPage).toBe(1);
-                    }).catch((error) => {
+                done();
-                        expect(error).toBeUndefined();
             });
         });
-        }));
-
-        it('Input page should move to the inserted page', inject([TestComponentBuilder], (tcb: TestComponentBuilder) => {
-            return tcb
-                .createAsync(PdfViewerComponent)
-                .then((fixture) => {
-                    let component = fixture.componentInstance;
-
-                    spyOn(component, 'getPDFJS').and.returnValue(new PDFJSmock());
-                    spyOn(component, 'initPDFViewer').and.callFake(() => {
-                        component.pdfViewer = new PDFViewermock();
-                    });
-
-                    component.urlFile = 'fake-url-file';
 
+        it('Input page should move to the inserted page', (done) => {
             component.ngOnChanges().then(() => {
-                        fixture.detectChanges();
+                pdfComponentFixture.detectChanges();
                 expect(component.displayPage).toBe(1);
                 component.inputPage('4');
-                        fixture.detectChanges();
+                pdfComponentFixture.detectChanges();
                 expect(component.displayPage).toBe(4);
-                    }).catch((error) => {
+                done();
-                        expect(error).toBeUndefined();
             });
         });
-        }));
 
         /* tslint:disable:max-line-length */
-        it('zoomIn should increment the scale value', inject([TestComponentBuilder], (tcb: TestComponentBuilder) => {
+        it('zoomIn should increment the scale value', (done) => {
-            return tcb
-                .createAsync(PdfViewerComponent)
-                .then((fixture) => {
-                    let component = fixture.componentInstance;
-                    let element = fixture.nativeElement;
-
-                    spyOn(component, 'getPDFJS').and.returnValue(new PDFJSmock());
-                    spyOn(component, 'initPDFViewer').and.callFake(() => {
-                        component.pdfViewer = new PDFViewermock();
-                    });
-
-                    component.urlFile = 'fake-url-file';
             component.currentScale = 1;
 
             let zoomInButton = element.querySelector('#viewer-zoom-in-button');
 
             component.ngOnChanges().then(() => {
-                        fixture.detectChanges();
+                pdfComponentFixture.detectChanges();
                 zoomInButton.click();
                 expect(component.currentScaleMode).toBe('auto');
                 expect(component.currentScale).toBe(1.1);
-                    }).catch((error) => {
+                done();
-                        expect(error).toBeUndefined();
             });
         });
-        }));
 
-        it('zoomOut should decrement the scale value', inject([TestComponentBuilder], (tcb: TestComponentBuilder) => {
+        it('zoomOut should decrement the scale value', (done) => {
-            return tcb
-                .createAsync(PdfViewerComponent)
-                .then((fixture) => {
-                    let component = fixture.componentInstance;
-                    let element = fixture.nativeElement;
-
-                    spyOn(component, 'getPDFJS').and.returnValue(new PDFJSmock());
-                    spyOn(component, 'initPDFViewer').and.callFake(() => {
-                        component.pdfViewer = new PDFViewermock();
-                    });
-
-                    component.urlFile = 'fake-url-file';
             component.currentScale = 1;
 
             let zoomOutButton = element.querySelector('#viewer-zoom-out-button');
 
             component.ngOnChanges().then(() => {
-                        fixture.detectChanges();
+                pdfComponentFixture.detectChanges();
                 zoomOutButton.click();
                 expect(component.currentScaleMode).toBe('auto');
                 expect(component.currentScale).toBe(0.9);
-                    }).catch((error) => {
+                done();
-                        expect(error).toBeUndefined();
             });
         });
-        }));
 
-        it('fit in button should toggle page-fit and auto scale mode', inject([TestComponentBuilder], (tcb: TestComponentBuilder) => {
+        it('fit in button should toggle page-fit and auto scale mode', (done) => {
-            return tcb
-                .createAsync(PdfViewerComponent)
-                .then((fixture) => {
-                    let component = fixture.componentInstance;
-                    let element = fixture.nativeElement;
-
-                    spyOn(component, 'getPDFJS').and.returnValue(new PDFJSmock());
-                    spyOn(component, 'initPDFViewer').and.callFake(() => {
-                        component.pdfViewer = new PDFViewermock();
-                    });
-
-                    component.urlFile = 'fake-url-file';
             component.currentScale = 1;
 
             let fitPage = element.querySelector('#viewer-scale-page-button');
 
             component.ngOnChanges().then(() => {
-                        fixture.detectChanges();
+                pdfComponentFixture.detectChanges();
                 expect(component.currentScaleMode).toBe('auto');
                 fitPage.click();
                 expect(component.currentScaleMode).toBe('page-fit');
                 fitPage.click();
                 expect(component.currentScaleMode).toBe('auto');
-                    }).catch((error) => {
+                done();
-                        expect(error).toBeUndefined();
             });
         });
-        }));
     });
 
     describe('Resize interaction', () => {
-        it('resize event should trigger setScaleUpdatePages', inject([TestComponentBuilder], (tcb: TestComponentBuilder) => {
+        it('resize event should trigger setScaleUpdatePages', () => {
-            return tcb
-                .createAsync(PdfViewerComponent)
-                .then((fixture) => {
-                    let component = fixture.componentInstance;
-                    let element = fixture.nativeElement;
-
-                    spyOn(component, 'getPDFJS').and.returnValue(new PDFJSmock());
-                    spyOn(component, 'initPDFViewer');
             spyOn(component, 'setScaleUpdatePages');
 
             component.documentContainer = element.querySelector('#viewer-pdf-container');
@@ -378,36 +246,20 @@ describe('PdfViewer', () => {
 
             expect(component.setScaleUpdatePages).toHaveBeenCalled();
         });
-        }));
     });
 
     describe('scroll interaction', () => {
-        it('scroll page should return the current page', inject([TestComponentBuilder], (tcb: TestComponentBuilder) => {
+        it('scroll page should return the current page', (done) => {
-            return tcb
-                .createAsync(PdfViewerComponent)
-                .then((fixture) => {
-                    let component = fixture.componentInstance;
-
-                    spyOn(component, 'getPDFJS').and.returnValue(new PDFJSmock());
-                    spyOn(component, 'initPDFViewer').and.callFake(() => {
-                        component.pdfViewer = new PDFViewermock();
-                    });
-
-                    component.urlFile = 'fake-url-file';
-
             component.ngOnChanges().then(() => {
-                        fixture.detectChanges();
+                pdfComponentFixture.detectChanges();
                 expect(component.displayPage).toBe(1);
                 component.inputPage('4');
-                        fixture.detectChanges();
+                pdfComponentFixture.detectChanges();
                 expect(component.displayPage).toBe(4);
                 component.watchScroll({scrollTop: 10000});
                 expect(component.displayPage).toBe(4);
-                    }).catch((error) => {
+                done();
-                        expect(error).toBeUndefined();
             });
         });
-        }));
     });
-
 });

ng2-components/ng2-alfresco-viewer/src/viewer.component.spec.ts

@@ -19,7 +19,6 @@ import { describe, expect, it, inject, beforeEachProviders } from '@angular/core
 import { TestComponentBuilder } from '@angular/compiler/testing';
 import { ViewerComponent } from './viewer.component';
 import { EventMock } from './assets/event.mock';
-
 import { HTTP_PROVIDERS } from '@angular/http';
 import { AlfrescoSettingsServiceMock } from '../src/assets/AlfrescoSettingsService.service.mock';
 import { AlfrescoAuthenticationService, AlfrescoSettingsService } from 'ng2-alfresco-core';