Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions .prettierrc.json
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
"trailingComma": "none",
"endOfLine": "auto",
"tabWidth": 2,
"semi:": false,
"bracketSameLine:": true,
"semi": false,
"bracketSameLine": true,
"arrowParens": "always"
}
41 changes: 35 additions & 6 deletions angular.json
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{
"$schema": "./node_modules/@angular/cli/lib/config/schema.json",
"$schema": "node_modules/@angular/cli/lib/config/schema.json",
"version": 1,
"newProjectRoot": "projects",
"projects": {
Expand All @@ -15,7 +15,7 @@
"prefix": "app",
"architect": {
"build": {
"builder": "@angular-devkit/build-angular:application",
"builder": "@angular/build:application",
"options": {
"outputPath": {
"base": "dist",
Expand Down Expand Up @@ -93,7 +93,7 @@
"defaultConfiguration": "production"
},
"serve": {
"builder": "@angular-devkit/build-angular:dev-server",
"builder": "@angular/build:dev-server",
"options": {
"buildTarget": "hashtopolis:build"
},
Expand All @@ -108,19 +108,22 @@
"defaultConfiguration": "development"
},
"extract-i18n": {
"builder": "@angular-devkit/build-angular:extract-i18n",
"builder": "@angular/build:extract-i18n",
"options": {
"buildTarget": "hashtopolis:build"
}
},
"test": {
"builder": "@angular-devkit/build-angular:karma",
"builder": "@angular/build:karma",
"options": {
"main": "src/test.ts",
"polyfills": "src/polyfills.ts",
"polyfills": ["src/polyfills.ts"],
"tsConfig": "tsconfig.spec.json",
"karmaConfig": "karma.conf.js",
"inlineStyleLanguage": "scss",
"stylePreprocessorOptions": {
"includePaths": ["src/styles", "node_modules", "."]
},
"assets": [
"src/node_modules/bootstrap/dist/css/bootstrap.min.css",
"src/styles/styles.scss",
Expand Down Expand Up @@ -171,5 +174,31 @@
"@angular-eslint/schematics"
],
"analytics": false
},
"schematics": {
"@schematics/angular:component": {
"type": "component"
},
"@schematics/angular:directive": {
"type": "directive"
},
"@schematics/angular:service": {
"type": "service"
},
"@schematics/angular:guard": {
"typeSeparator": "."
},
"@schematics/angular:interceptor": {
"typeSeparator": "."
},
"@schematics/angular:module": {
"typeSeparator": "."
},
"@schematics/angular:pipe": {
"typeSeparator": "."
},
"@schematics/angular:resolver": {
"typeSeparator": "."
}
}
}
39 changes: 17 additions & 22 deletions karma.conf.js
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,6 @@
// https://karma-runner.github.io/1.0/config/configuration-file.html
process.env.CHROME_BIN = require('puppeteer').executablePath()


module.exports = function (config) {
config.set({
basePath: '',
Expand All @@ -12,8 +11,7 @@ module.exports = function (config) {
require('karma-jasmine'),
require('karma-chrome-launcher'),
require('karma-jasmine-html-reporter'),
require('karma-coverage'),
require('@angular-devkit/build-angular/plugins/karma')
require('karma-coverage')
],
client: {
jasmine: {
Expand All @@ -30,29 +28,26 @@ module.exports = function (config) {
},

specReporter: {
maxLogLines: 5, // limit number of lines logged per test
suppressSummary: true, // do not print summary
maxLogLines: 5, // limit number of lines logged per test
suppressSummary: true, // do not print summary
suppressErrorSummary: true, // do not print error summary
suppressFailed: false, // do not print information about failed tests
suppressPassed: false, // do not print information about passed tests
suppressSkipped: true, // do not print information about skipped tests
showBrowser: false, // print the browser for each spec
showSpecTiming: false, // print the time elapsed for each spec
failFast: false, // test would finish with error when a first fail occurs
suppressFailed: false, // do not print information about failed tests
suppressPassed: false, // do not print information about passed tests
suppressSkipped: true, // do not print information about skipped tests
showBrowser: false, // print the browser for each spec
showSpecTiming: false, // print the time elapsed for each spec
failFast: false, // test would finish with error when a first fail occurs
prefixes: {
success: ' OK: ', // override prefix for passed tests, default is '✓ '
failure: 'FAILED: ', // override prefix for failed tests, default is '✗ '
skipped: 'SKIPPED: ' // override prefix for skipped tests, default is '- '
success: ' OK: ', // override prefix for passed tests, default is '✓ '
failure: 'FAILED: ', // override prefix for failed tests, default is '✗ '
skipped: 'SKIPPED: ' // override prefix for skipped tests, default is '- '
}
},

coverageReporter: {
dir: require('path').join(__dirname, './coverage/hashtopolis'),
subdir: '.',
reporters: [
{ type: 'html' },
{ type: 'text-summary' }
]
reporters: [{ type: 'html' }, { type: 'text-summary' }]
},
reporters: ['spec', 'kjhtml'],
port: 9876,
Expand All @@ -61,7 +56,7 @@ module.exports = function (config) {
autoWatch: true,
browsers: ['ChromeHeadless'],
singleRun: true,
restartOnFileChange: true,
});
process.env.TZ = 'Europe/Berlin';
};
restartOnFileChange: true
})
process.env.TZ = 'Europe/Berlin'
}
Loading