Skip to content

Commit

Permalink
fix(perf/angular-cli): upgrade to latest angular version and fix bugs (…
Browse files Browse the repository at this point in the history 
…#1842)
  • Loading branch information
@simondel
simondel committed Nov 13, 2019
1 parent deb9a84 commit 4f81550
Show file tree
Hide file tree
Showing 9 changed files with 7,548 additions and 5,688 deletions.
0 perf/test/angular-cli/src/browserslist → perf/test/angular-cli/browserslist
View file
File renamed without changes.
13,100 changes: 7,491 additions & 5,609 deletions perf/test/angular-cli/package-lock.json
View file

Large diffs are not rendered by default.

67 changes: 33 additions & 34 deletions perf/test/angular-cli/package.json
View file
Expand Up @@ -14,44 +14,43 @@
},
"private": true,
"dependencies": {
"@angular/animations": "^7.2.3",
"@angular/common": "^7.2.3",
"@angular/compiler": "^7.2.3",
"@angular/core": "^7.2.3",
"@angular/forms": "^7.2.3",
"@angular/http": "^7.2.3",
"@angular/platform-browser": "^7.2.3",
"@angular/platform-browser-dynamic": "^7.2.3",
"@angular/router": "^7.2.3",
"@fortawesome/angular-fontawesome": "^0.3.0",
"@fortawesome/fontawesome-svg-core": "^1.2.12",
"@fortawesome/free-solid-svg-icons": "^5.6.3",
"bootstrap": "^4.2.1",
"core-js": "^2.5.4",
"rxjs": "~6.4.0",
"tslib": "^1.9.0",
"zone.js": "~0.8.29"
"@angular/animations": "~8.2.13",
"@angular/common": "~8.2.13",
"@angular/compiler": "~8.2.13",
"@angular/core": "~8.2.13",
"@angular/forms": "~8.2.13",
"@angular/platform-browser": "~8.2.13",
"@angular/platform-browser-dynamic": "~8.2.13",
"@angular/router": "~8.2.13",
"@fortawesome/angular-fontawesome": "~0.5.0",
"@fortawesome/fontawesome-svg-core": "~1.2.25",
"@fortawesome/free-solid-svg-icons": "~5.11.2",
"bootstrap": "~4.2.1",
"core-js": "~3.4.1",
"rxjs": "~6.5.3",
"tslib": "~1.10.0",
"zone.js": "~0.9.1"
},
"devDependencies": {
"@angular-devkit/build-angular": "~0.13.0",
"@angular/cli": "~7.3.0",
"@angular/compiler-cli": "^7.2.3",
"@angular/language-service": "^7.2.3",
"@types/jasmine": "~2.8.8",
"@types/jasminewd2": "~2.0.3",
"@types/node": "~8.9.4",
"codelyzer": "~4.3.0",
"jasmine-core": "~2.99.1",
"@angular-devkit/build-angular": "~0.803.18",
"@angular/cli": "~8.3.18",
"@angular/compiler-cli": "~8.2.13",
"@angular/language-service": "~8.2.13",
"@types/jasmine": "~3.4.6",
"@types/jasminewd2": "~2.0.8",
"@types/node": "~12.12.7",
"codelyzer": "~5.0.1",
"jasmine-core": "~3.5.0",
"jasmine-spec-reporter": "~4.2.1",
"karma": "~3.0.0",
"karma-chrome-launcher": "~2.2.0",
"karma-coverage-istanbul-reporter": "~2.0.1",
"karma-jasmine": "~1.1.2",
"karma-jasmine-html-reporter": "^0.2.2",
"karma": "~4.4.1",
"karma-chrome-launcher": "~3.1.0",
"karma-coverage-istanbul-reporter": "~2.1.0",
"karma-jasmine": "~2.0.1",
"karma-jasmine-html-reporter": "~1.4.2",
"protractor": "~5.4.0",
"ts-node": "~7.0.0",
"tslint": "~5.11.0",
"typescript": "~3.7.2"
"ts-node": "~8.5.0",
"tslint": "~5.20.1",
"typescript": "~3.5.3"
},
"localDependencies": {
"@stryker-mutator/core": "../../../packages/core",
Expand Down
3 changes: 2 additions & 1 deletion ...app/bestelling-plaatsen/klantgegevens-formulier/klantgegevens-formulier.component.spec.ts
View file
Expand Up @@ -70,7 +70,8 @@ describe('KlantgegevensFormulierComponent', () => {

describe('bestellingPlaatsen()', () => {
it('bestellingenService.plaatsBestelling should be called', () => {
spyOn(bestellingenServive, 'plaatsBestelling').and.returnValue(of(testKlant));
const bestelling = new Bestelling(testKlant, component.getBestelRegels(), 15);
spyOn(bestellingenServive, 'plaatsBestelling').and.returnValue(of(bestelling));
spyOn(component, 'getBestelRegels');
component.bestellingPlaatsen(testKlant);
expect(bestellingenServive.plaatsBestelling).toHaveBeenCalled();
Expand Down
3 changes: 2 additions & 1 deletion perf/test/angular-cli/src/app/models/winkelwagen.ts
View file
Expand Up @@ -19,7 +19,8 @@ export class Winkelwagen {
}

public setWinkelwagenRegels(regels: Array<WinkelwagenRegel>) {
sessionStorage.setItem(this.winkelwagenDataKey, JSON.stringify(regels));
this.winkelwagenRegels = regels;
sessionStorage.setItem(this.winkelwagenDataKey, JSON.stringify(this.winkelwagenRegels));
}

public addArtikel(artikel: Artikel) {
Expand Down
24 changes: 11 additions & 13 deletions perf/test/angular-cli/src/app/shopping-cart/shopping-cart-component.spec.ts
View file
Expand Up @@ -90,20 +90,18 @@ describe('ShoppingCartComponent', () => {


describe('animate()', () => {
const winkelwagen = new Winkelwagen();
const testArtikel1 = new Artikel(1, 'Test artikel', 'test', 10, 'images/foo.png', new Date(), new Date(), 'PRD1', [], 1);
const testArtikel2 = new Artikel(2, 'Test artikel 2', 'test 2', 15, 'images/foo.png', new Date(), new Date(), 'PRD2', [], 1);
const testData = [
new WinkelwagenRegel(testArtikel1),
new WinkelwagenRegel(testArtikel2)
];
testData[0].aantal = 2;
winkelwagen.setWinkelwagenRegels(testData);
let winkelwagen: Winkelwagen;

it('should change the itemcount', () => {
component.animate(winkelwagen).then(() =>
expect(component.itemCount).toBe(3)
);
beforeEach(() => {
winkelwagen = new Winkelwagen();
const testArtikel1 = new Artikel(1, 'Test artikel', 'test', 10, 'images/foo.png', new Date(), new Date(), 'PRD1', [], 2);
const testArtikel2 = new Artikel(2, 'Test artikel 2', 'test 2', 15, 'images/foo.png', new Date(), new Date(), 'PRD2', [], 1);
const testData = [
new WinkelwagenRegel(testArtikel1),
new WinkelwagenRegel(testArtikel2)
];
testData[0].aantal = 2;
winkelwagen.setWinkelwagenRegels(testData);
});

it('should call winkelwagen.getArtikelCount() once', () => {
Expand Down
26 changes: 2 additions & 24 deletions perf/test/angular-cli/src/polyfills.ts
View file
Expand Up @@ -15,31 +15,9 @@
*/

/***************************************************************************************************
* BROWSER POLYFILLS
*/

/** IE9, IE10 and IE11 requires all of the following polyfills. **/
import 'core-js/es6/symbol';
import 'core-js/es6/object';
import 'core-js/es6/function';
import 'core-js/es6/parse-int';
import 'core-js/es6/parse-float';
import 'core-js/es6/number';
import 'core-js/es6/math';
import 'core-js/es6/string';
import 'core-js/es6/date';
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';
* BROWSER POLYFILLS
*/

/**
* If the application will be indexed by Google Search, the following is required.
* Googlebot uses a renderer based on Chrome 41.
* https://developers.google.com/search/docs/guides/rendering
**/
import 'core-js/es6/array';

/** IE10 and IE11 requires the following for NgClass support on SVG elements */
// import 'classlist.js'; // Run `npm install --save classlist.js`.
Expand Down
5 changes: 3 additions & 2 deletions perf/test/angular-cli/tsconfig.json
View file
Expand Up @@ -2,15 +2,16 @@
"compileOnSave": false,
"compilerOptions": {
"baseUrl": "./",
"downlevelIteration": true,
"importHelpers": true,
"outDir": "./dist/out-tsc",
"sourceMap": true,
"declaration": false,
"module": "es2015",
"module": "esnext",
"moduleResolution": "node",
"emitDecoratorMetadata": true,
"experimentalDecorators": true,
"target": "es5",
"target": "es2015",
"typeRoots": [
"node_modules/@types"
],
Expand Down
8 changes: 4 additions & 4 deletions perf/test/angular-cli/tslint.json
View file
Expand Up @@ -118,12 +118,12 @@
"check-type"
],
"no-output-on-prefix": true,
"use-input-property-decorator": true,
"use-output-property-decorator": true,
"use-host-property-decorator": true,
"no-inputs-metadata-property": true,
"no-outputs-metadata-property": true,
"no-host-metadata-property": true,
"no-input-rename": true,
"no-output-rename": true,
"use-life-cycle-interface": true,
"use-lifecycle-interface": true,
"use-pipe-transform-interface": true,
"component-class-suffix": true,
"directive-class-suffix": true
Expand Down

0 comments on commit 4f81550

Please sign in to comment.