From 0e7e397f7db9e2bfe37184d8b683fcedd05fb576 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Adrian=20F=C3=A2ciu?= Date: Sat, 10 Sep 2016 12:14:21 +0300 Subject: [PATCH] Fixing test execution --- .../file-upload/file-drop.directive.spec.ts | 15 ++++++++------- test.bundle.js | 19 +++++++++++-------- 2 files changed, 19 insertions(+), 15 deletions(-) diff --git a/components/file-upload/file-drop.directive.spec.ts b/components/file-upload/file-drop.directive.spec.ts index 1ca0a5c..da2bcc4 100644 --- a/components/file-upload/file-drop.directive.spec.ts +++ b/components/file-upload/file-drop.directive.spec.ts @@ -1,8 +1,8 @@ -import {Component} from '@angular/core'; -import {inject,ComponentFixture, TestBed} from '@angular/core/testing'; +import { Component} from '@angular/core'; +import { inject, ComponentFixture, TestBed } from '@angular/core/testing'; -import {FileUploader} from './file-uploader.class'; -import {FileUploadModule} from './file-upload.module'; +import { FileUploader } from './file-uploader.class'; +import { FileUploadModule } from './file-upload.module'; @Component({ selector: 'container', @@ -13,13 +13,14 @@ export class ContainerComponent { } describe('Directive: FileSelectDirective', () => { - beforeEach(() => [ + + beforeEach(() => { TestBed.configureTestingModule({ imports: [FileUploadModule], declarations: [ContainerComponent], providers: [ContainerComponent] - }) - ]); + }); + }); it('should be fine', inject([ContainerComponent], (fixture:ComponentFixture) => { expect(fixture).not.toBeNull(); diff --git a/test.bundle.js b/test.bundle.js index 9ade857..c2d6e67 100644 --- a/test.bundle.js +++ b/test.bundle.js @@ -17,18 +17,21 @@ require('es6-promise'); require('es6-shim'); require('es7-reflect-metadata/dist/browser'); -// require('zone.js'); -require('zone.js/dist/zone.js'); -require('zone.js/dist/long-stack-trace-zone.js'); -require('zone.js/dist/jasmine-patch.js'); -require('zone.js/dist/async-test.js'); +require('zone.js/dist/zone'); +require('zone.js/dist/long-stack-trace-zone'); +require('zone.js/dist/async-test'); +require('zone.js/dist/fake-async-test'); +require('zone.js/dist/sync-test'); +require('zone.js/dist/proxy'); +require('zone.js/dist/jasmine-patch'); var testing = require('@angular/core/testing'); var browser = require('@angular/platform-browser-dynamic/testing'); -testing.setBaseTestProviders( - browser.TEST_BROWSER_DYNAMIC_PLATFORM_PROVIDERS, - browser.TEST_BROWSER_DYNAMIC_APPLICATION_PROVIDERS); +testing.TestBed.initTestEnvironment( + browser.BrowserDynamicTestingModule, + browser.platformBrowserDynamicTesting() +); /* Ok, this is kinda crazy. We can use the the context method on