Skip to content

Commit

Permalink
Fixed demo-app failing unit tests
Browse files Browse the repository at this point in the history
  • Loading branch information
Frederic Ghilini committed Nov 12, 2017
1 parent a4b182f commit cf7c967
Show file tree
Hide file tree
Showing 6 changed files with 73 additions and 106 deletions.
9 changes: 6 additions & 3 deletions demo-app/.angular-cli.json
Original file line number Diff line number Diff line change
Expand Up @@ -31,13 +31,16 @@
},
"lint": [
{
"project": "src/tsconfig.app.json"
"project": "src/tsconfig.app.json",
"exclude": "**/node_modules/**"
},
{
"project": "src/tsconfig.spec.json"
"project": "src/tsconfig.spec.json",
"exclude": "**/node_modules/**"
},
{
"project": "e2e/tsconfig.e2e.json"
"project": "e2e/tsconfig.e2e.json",
"exclude": "**/node_modules/**"
}
],
"test": {
Expand Down
130 changes: 47 additions & 83 deletions demo-app/package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

32 changes: 16 additions & 16 deletions demo-app/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -12,32 +12,32 @@
},
"private": true,
"dependencies": {
"@angular/animations": "^5.0.0",
"@angular/animations": "^5.0.1",
"@angular/cdk": "^5.0.0-rc0",
"@angular/common": "^5.0.0",
"@angular/compiler": "^5.0.0",
"@angular/core": "^5.0.0",
"@angular/forms": "^5.0.0",
"@angular/http": "^5.0.0",
"@angular/common": "^5.0.1",
"@angular/compiler": "^5.0.1",
"@angular/core": "^5.0.1",
"@angular/forms": "^5.0.1",
"@angular/http": "^5.0.1",
"@angular/material": "^5.0.0-rc0",
"@angular/platform-browser": "^5.0.0",
"@angular/platform-browser-dynamic": "^5.0.0",
"@angular/router": "^5.0.0",
"@types/lodash-es": "^4.14.7",
"@angular/platform-browser": "^5.0.1",
"@angular/platform-browser-dynamic": "^5.0.1",
"@angular/router": "^5.0.1",
"@types/lodash-es": "^4.17.0",
"core-js": "^2.4.1",
"lodash-es": "^4.17.4",
"ng2-md-datatable": "^1.6.0",
"ng2-md-datatable": "^1.6.1",
"rxjs": "^5.5.2",
"web-animations-js": "^2.3.1",
"zone.js": "^0.8.18"
},
"devDependencies": {
"@angular/cli": "^1.5.0",
"@angular/compiler-cli": "^5.0.0",
"@angular/language-service": "^5.0.0",
"@types/jasmine": "~2.6.0",
"@angular/compiler-cli": "^5.0.1",
"@angular/language-service": "^5.0.1",
"@types/jasmine": "^2.6.3",
"@types/jasminewd2": "~2.0.2",
"@types/node": "^8.0.50",
"@types/node": "^8.0.51",
"codelyzer": "^4.0.1",
"jasmine-core": "^2.8.0",
"jasmine-spec-reporter": "^4.2.1",
Expand All @@ -48,7 +48,7 @@
"karma-jasmine": "~1.1.0",
"karma-jasmine-html-reporter": "^0.2.2",
"karma-junit-reporter": "^1.2.0",
"prettier": "^1.8.1",
"prettier": "^1.8.2",
"protractor": "~5.1.2",
"ts-node": "~3.3.0",
"tslint": "^5.8.0",
Expand Down
1 change: 1 addition & 0 deletions demo-app/src/app/app.component.ts
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@ import {

import shuffle from "lodash-es/shuffle";
import "rxjs/add/observable/from";
import "rxjs/add/operator/let";
import { BehaviorSubject } from "rxjs/BehaviorSubject";
import { Observable } from "rxjs/Observable";
import { takeUntil } from "rxjs/operators";
Expand Down
2 changes: 1 addition & 1 deletion demo-app/src/polyfills.ts
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@
// import 'classlist.js'; // Run `npm install --save classlist.js`.

// Evergreen browsers require these.
import "core-js/es6/reflect";
// import "core-js/es6/reflect";
import "core-js/es7/reflect";

// Required to support Web Animations `@angular/animation`.
Expand Down
5 changes: 2 additions & 3 deletions demo-app/tsconfig.json
Original file line number Diff line number Diff line change
Expand Up @@ -4,12 +4,11 @@
"outDir": "./dist/out-tsc",
"sourceMap": true,
"declaration": false,
"allowJs": false,
"moduleResolution": "node",
"emitDecoratorMetadata": true,
"experimentalDecorators": true,
"target": "es2015",
"target": "es5",
"typeRoots": ["node_modules/@types"],
"lib": ["es5", "es2015", "dom"]
"lib": ["es2017", "dom"]
}
}

0 comments on commit cf7c967

Please sign in to comment.