diff --git a/package.json b/package.json index fd9812c2c..28f86d4bf 100644 --- a/package.json +++ b/package.json @@ -59,16 +59,16 @@ "cross-env": "5.0.5", "dotenv": "5.0.0", "electron": "1.8.2", - "electron-builder": "20.0.4", + "electron-builder": "20.0.5", "electron-reload": "1.2.2", "enhanced-resolve": "3.3.0", "fs-extra": "5.0.0", - "jasmine-core": "2.8.0", + "jasmine-core": "2.99.1", "jasmine-spec-reporter": "4.2.1", "karma": "2.0.0", "karma-chrome-launcher": "2.2.0", - "karma-coverage-istanbul-reporter": "1.2.1", - "karma-jasmine": "1.1.0", + "karma-coverage-istanbul-reporter": "1.4.1", + "karma-jasmine": "1.1.1", "karma-jasmine-html-reporter": "0.2.2", "npm-run-all": "4.1.2", "npx": "9.7.1", diff --git a/src/app/app.component.spec.ts b/src/app/app.component.spec.ts index cf9241c1f..7d76493b6 100644 --- a/src/app/app.component.spec.ts +++ b/src/app/app.component.spec.ts @@ -1,9 +1,7 @@ import { TestBed, async } from '@angular/core/testing'; import { RouterTestingModule } from '@angular/router/testing'; import { AppComponent } from './app.component'; -import { ElectronService } from './providers/electron.service'; - -import { TranslateService, TranslateModule } from '@ngx-translate/core'; +import { ElectronService } from 'app/providers/electron.service'; describe('AppComponent', () => { beforeEach(async(() => { @@ -12,12 +10,12 @@ describe('AppComponent', () => { AppComponent ], providers: [ - ElectronService, - { provide: TranslateService, useClass: TranslateServiceStub } + ElectronService ], - imports: [RouterTestingModule, - TranslateModule.forRoot() - ] + imports: [ + RouterTestingModule, + TranslateModule.forRoot() + ] }).compileComponents(); })); diff --git a/src/app/app.module.ts b/src/app/app.module.ts index 74b7b727a..d9c04f70d 100644 --- a/src/app/app.module.ts +++ b/src/app/app.module.ts @@ -1,6 +1,6 @@ import 'zone.js/dist/zone-mix'; import 'reflect-metadata'; -import 'polyfills'; +import '../polyfills'; import { BrowserModule } from '@angular/platform-browser'; import { NgModule } from '@angular/core'; import { FormsModule } from '@angular/forms'; diff --git a/src/app/components/home/home.component.spec.ts b/src/app/components/home/home.component.spec.ts index f957f0988..cd75937ff 100644 --- a/src/app/components/home/home.component.spec.ts +++ b/src/app/components/home/home.component.spec.ts @@ -29,6 +29,6 @@ describe('HomeComponent', () => { it('should render title in a h1 tag', async(() => { const compiled = fixture.debugElement.nativeElement; - expect(compiled.querySelector('h1').textContent).toBeTruthy(); + expect(compiled.querySelector('h1').textContent).toContain('PAGES.HOME.TITLE'); })); }); diff --git a/src/polyfills.ts b/src/polyfills.ts index 6114d69a4..4474f2f9e 100644 --- a/src/polyfills.ts +++ b/src/polyfills.ts @@ -31,37 +31,49 @@ // import 'core-js/es6/array'; // import 'core-js/es6/regexp'; // import 'core-js/es6/map'; +// import 'core-js/es6/weak-map'; // import 'core-js/es6/set'; /** IE10 and IE11 requires the following for NgClass support on SVG elements */ // import 'classlist.js'; // Run `npm install --save classlist.js`. -/** IE10 and IE11 requires the following to support `@angular/animation`. */ -// import 'web-animations-js'; // Run `npm install --save web-animations-js`. +/** IE10 and IE11 requires the following for the Reflect API. */ +// import 'core-js/es6/reflect'; /** Evergreen browsers require these. **/ -import 'core-js/es6/reflect'; +// Used for reflect-metadata in JIT. If you use AOT (and only Angular decorators), you can remove. import 'core-js/es7/reflect'; -/** ALL Firefox browsers require the following to support `@angular/animation`. **/ +/** + * Required to support Web Animations `@angular/platform-browser/animations`. + * Needed for: All but Chrome, Firefox and Opera. http://caniuse.com/#feat=web-animation + **/ // import 'web-animations-js'; // Run `npm install --save web-animations-js`. +/** + * By default, zone.js will patch all possible macroTask and DomEvents + * user can disable parts of macroTask/DomEvents patch by setting following flags + */ + + // (window as any).__Zone_disable_requestAnimationFrame = true; // disable patch requestAnimationFrame + // (window as any).__Zone_disable_on_property = true; // disable patch onProperty such as onclick + // (window as any).__zone_symbol__BLACK_LISTED_EVENTS = ['scroll', 'mousemove']; // disable patch specified eventNames + /* + * in IE/Edge developer tools, the addEventListener will also be wrapped by zone.js + * with the following flag, it will bypass `zone.js` patch for IE/Edge + */ +// (window as any).__Zone_enable_cross_context_check = true; /*************************************************************************************************** - * Zone JS is required by Angular itself. + * Zone JS is required by default for Angular itself. */ -import 'zone.js/dist/zone-mix'; // Included with Angular CLI. +import 'zone.js/dist/zone-mix'; // Included with Angular CLI. + /*************************************************************************************************** * APPLICATION IMPORTS */ - -/** - * Date, currency, decimal and percent pipes. - * Needed for: All but Chrome, Firefox, Edge, IE11 and Safari 10 - */ -// import 'intl'; // Run `npm install --save intl`. diff --git a/src/test.ts b/src/test.ts index 9998c9e3c..2f4b926c5 100644 --- a/src/test.ts +++ b/src/test.ts @@ -1,11 +1,6 @@ // This file is required by karma.conf.js and loads recursively all the .spec and framework files -import 'zone.js/dist/long-stack-trace-zone'; -import 'zone.js/dist/proxy.js'; -import 'zone.js/dist/sync-test'; -import 'zone.js/dist/jasmine-patch'; -import 'zone.js/dist/async-test'; -import 'zone.js/dist/fake-async-test'; +import 'zone.js/dist/zone-testing'; import { getTestBed } from '@angular/core/testing'; import { BrowserDynamicTestingModule, @@ -14,13 +9,8 @@ import { import { Observable } from 'rxjs/Observable'; import { TranslateLoader, TranslateService } from '@ngx-translate/core'; -// Unfortunately there's no typing for the `__karma__` variable. Just declare it as any. -declare const __karma__: any; declare const require: any; -// Prevent Karma from running prematurely. -__karma__.loaded = function () { }; - // First, initialize the Angular testing environment. getTestBed().initTestEnvironment( BrowserDynamicTestingModule, @@ -30,6 +20,3 @@ getTestBed().initTestEnvironment( const context = require.context('./', true, /\.spec\.ts$/); // And load the modules. context.keys().map(context); - -// Finally, start Karma to run the tests. -__karma__.start();