Skip to content

Commit

Permalink
feat(angular): update Karma config path in Angular preset (#2548)
Browse files Browse the repository at this point in the history
* feat(angular): update default path for Karma configuration
* test(e2e): update Angular project
* test(perf): update Angular CLI project
* test(e2e): lock mutation report assertion
  • Loading branch information
LayZeeDK authored Oct 14, 2020
1 parent 23206ed commit 986acba
Show file tree
Hide file tree
Showing 48 changed files with 5,278 additions and 8,804 deletions.
2 changes: 1 addition & 1 deletion e2e/test/angular-project/.editorconfig
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# Editor configuration, see http://editorconfig.org
# Editor configuration, see https://editorconfig.org
root = true

[*]
Expand Down
10 changes: 9 additions & 1 deletion e2e/test/angular-project/.gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -4,10 +4,16 @@
/dist
/tmp
/out-tsc
# Only exists if Bazel was run
/bazel-out

# dependencies
/node_modules

# profiling files
chrome-profiler-events*.json
speed-measure-plugin*.json

# IDEs and editors
/.idea
.project
Expand All @@ -23,6 +29,7 @@
!.vscode/tasks.json
!.vscode/launch.json
!.vscode/extensions.json
.history/*

# misc
/.sass-cache
Expand All @@ -38,4 +45,5 @@ testem.log
.DS_Store
Thumbs.db

!package-lock.json
# stryker temp files
.stryker-tmp
2 changes: 1 addition & 1 deletion e2e/test/angular-project/README.md
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# AngularProject

This project was generated with [Angular CLI](https://github.com/angular/angular-cli) version 6.1.0-rc.0.
This project was generated with [Angular CLI](https://github.com/angular/angular-cli) version 9.0.7.

## Development server

Expand Down
65 changes: 12 additions & 53 deletions e2e/test/angular-project/angular.json
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@
"index": "src/index.html",
"main": "src/main.ts",
"polyfills": "src/polyfills.ts",
"tsConfig": "src/tsconfig.app.json",
"tsConfig": "tsconfig.app.json",
"assets": [
"src/favicon.ico",
"src/assets"
Expand All @@ -31,9 +31,15 @@
"configurations": {
"production": {
"budgets": [
{
"type": "initial",
"maximumWarning": "2mb",
"maximumError": "5mb"
},
{
"type": "anyComponentStyle",
"maximumWarning": "6kb"
"maximumWarning": "6kb",
"maximumError": "10kb"
}
],
"fileReplacements": [
Expand All @@ -47,7 +53,6 @@
"sourceMap": false,
"extractCss": true,
"namedChunks": false,
"aot": true,
"extractLicenses": true,
"vendorChunk": false,
"buildOptimizer": true
Expand All @@ -65,19 +70,13 @@
}
}
},
"extract-i18n": {
"builder": "@angular-devkit/build-angular:extract-i18n",
"options": {
"browserTarget": "angular-project:build"
}
},
"test": {
"builder": "@angular-devkit/build-angular:karma",
"options": {
"main": "src/test.ts",
"polyfills": "src/polyfills.ts",
"tsConfig": "src/tsconfig.spec.json",
"karmaConfig": "src/karma.conf.js",
"tsConfig": "tsconfig.spec.json",
"karmaConfig": "karma.conf.js",
"styles": [
"src/styles.css"
],
Expand All @@ -87,48 +86,8 @@
"src/assets"
]
}
},
"lint": {
"builder": "@angular-devkit/build-angular:tslint",
"options": {
"tsConfig": [
"src/tsconfig.app.json",
"src/tsconfig.spec.json"
],
"exclude": [
"**/node_modules/**"
]
}
}
}
},
"angular-project-e2e": {
"root": "e2e/",
"projectType": "application",
"architect": {
"e2e": {
"builder": "@angular-devkit/build-angular:protractor",
"options": {
"protractorConfig": "e2e/protractor.conf.js",
"devServerTarget": "angular-project:serve"
},
"configurations": {
"production": {
"devServerTarget": "angular-project:serve:production"
}
}
},
"lint": {
"builder": "@angular-devkit/build-angular:tslint",
"options": {
"tsConfig": "e2e/tsconfig.e2e.json",
"exclude": [
"**/node_modules/**"
]
}
}
}
}
},
}},
"defaultProject": "angular-project"
}
}
12 changes: 12 additions & 0 deletions e2e/test/angular-project/browserslist
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
# This file is used by the build system to adjust CSS and JS output to support the specified browsers below.
# For additional information regarding the format and rule options, please see:
# https://github.com/browserslist/browserslist#queries

# You can see what browsers were selected by your queries by running:
# npx browserslist

> 0.5%
last 2 versions
Firefox ESR
not dead
not IE 9-11 # For IE 9-11 support, remove 'not'.
28 changes: 0 additions & 28 deletions e2e/test/angular-project/e2e/protractor.conf.js

This file was deleted.

14 changes: 0 additions & 14 deletions e2e/test/angular-project/e2e/src/app.e2e-spec.ts

This file was deleted.

11 changes: 0 additions & 11 deletions e2e/test/angular-project/e2e/src/app.po.ts

This file was deleted.

Original file line number Diff line number Diff line change
Expand Up @@ -16,15 +16,17 @@ module.exports = function (config) {
clearContext: false // leave Jasmine Spec Runner output visible in browser
},
coverageIstanbulReporter: {
dir: require('path').join(__dirname, '../coverage'),
reports: ['html', 'lcovonly'],
dir: require('path').join(__dirname, './coverage/angular-project'),
reports: ['html', 'lcovonly', 'text-summary'],
fixWebpackSourcePaths: true
},
reporters: ['progress', 'kjhtml'],
port: 9876,
colors: true,
logLevel: config.LOG_INFO,
autoWatch: true,
browsers: ['Chrome'],
singleRun: false
singleRun: false,
restartOnFileChange: true
});
};
Loading

0 comments on commit 986acba

Please sign in to comment.