From 48128becdd4200b334d7701a97a3835924f0b3de Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Adrian=20F=C3=A2ciu?= Date: Wed, 7 Sep 2016 22:24:43 +0300 Subject: [PATCH] Fixing tests and lint errors --- .../file-upload/file-drop.directive.spec.ts | 20 ++++++++++++------- components/file-upload/file-upload.module.ts | 3 ++- demo/app.component.ts | 2 +- demo/components/file-upload-section.ts | 6 ++---- demo/ng2-file-upload-demo.module.ts | 4 ++-- 5 files changed, 20 insertions(+), 15 deletions(-) diff --git a/components/file-upload/file-drop.directive.spec.ts b/components/file-upload/file-drop.directive.spec.ts index 264e409..1ca0a5c 100644 --- a/components/file-upload/file-drop.directive.spec.ts +++ b/components/file-upload/file-drop.directive.spec.ts @@ -1,20 +1,26 @@ import {Component} from '@angular/core'; -import {it, inject, beforeEachProviders} from '@angular/core/testing'; -import {ComponentFixture} from '@angular/compiler/testing'; +import {inject,ComponentFixture, TestBed} from '@angular/core/testing'; + import {FileUploader} from './file-uploader.class'; -import {FileSelectDirective} from './file-select.directive'; +import {FileUploadModule} from './file-upload.module'; + @Component({ selector: 'container', - template: ``, - directives: [FileSelectDirective] + template: `` }) export class ContainerComponent { public uploader:FileUploader = new FileUploader({url: 'localhost:3000'}); } + describe('Directive: FileSelectDirective', () => { - beforeEachProviders(() => [ - ContainerComponent + beforeEach(() => [ + TestBed.configureTestingModule({ + imports: [FileUploadModule], + declarations: [ContainerComponent], + providers: [ContainerComponent] + }) ]); + it('should be fine', inject([ContainerComponent], (fixture:ComponentFixture) => { expect(fixture).not.toBeNull(); })); diff --git a/components/file-upload/file-upload.module.ts b/components/file-upload/file-upload.module.ts index 180bfa8..258c2bb 100644 --- a/components/file-upload/file-upload.module.ts +++ b/components/file-upload/file-upload.module.ts @@ -9,4 +9,5 @@ import { FileSelectDirective } from './file-select.directive'; declarations: [FileDropDirective, FileSelectDirective], exports: [FileDropDirective, FileSelectDirective] }) -export class FileUploadModule { } \ No newline at end of file +export class FileUploadModule { +} diff --git a/demo/app.component.ts b/demo/app.component.ts index 2097d7e..9a0a4ba 100644 --- a/demo/app.component.ts +++ b/demo/app.component.ts @@ -31,4 +31,4 @@ let gettingStarted = require('./getting-started.md'); ` }) export class DemoComponent { -} \ No newline at end of file +} diff --git a/demo/components/file-upload-section.ts b/demo/components/file-upload-section.ts index fe7f070..c7ca4b3 100644 --- a/demo/components/file-upload-section.ts +++ b/demo/components/file-upload-section.ts @@ -11,8 +11,6 @@ let tabDesc:Array = [ } ]; -// <{{desc.heading.toLowerCase()}}-demo *ngIf="currentHeading === '{{desc.heading}}'"> - @Component({ selector: 'file-upload-section', template: ` @@ -55,7 +53,7 @@ let tabDesc:Array = [
- `, + ` }) export class FileUploadSectionComponent { public name:string = 'File Upload'; @@ -68,4 +66,4 @@ export class FileUploadSectionComponent { this.currentHeading = e.heading; } } -} \ No newline at end of file +} diff --git a/demo/ng2-file-upload-demo.module.ts b/demo/ng2-file-upload-demo.module.ts index 60c48a2..016a61f 100644 --- a/demo/ng2-file-upload-demo.module.ts +++ b/demo/ng2-file-upload-demo.module.ts @@ -3,7 +3,7 @@ import { NgModule } from '@angular/core'; import { FormsModule } from '@angular/forms'; import { BrowserModule } from '@angular/platform-browser'; -import { Ng2BootstrapModule } from 'ng2-bootstrap/ng2-bootstrap' +import { Ng2BootstrapModule } from 'ng2-bootstrap/ng2-bootstrap'; import { FileUploadModule } from '../components/file-upload/file-upload.module'; import { DemoComponent } from './app.component.ts'; import { FileUploadSectionComponent } from './components/file-upload-section'; @@ -15,4 +15,4 @@ import { SimpleDemoComponent } from './components/file-upload/simple-demo'; bootstrap: [DemoComponent] }) export class NgFileUploadDemo { -} \ No newline at end of file +}