hardi
/
angular4-testing
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Update to Angular4

merge-requests/1/head
Florian Hartwich 2017-03-25 06:09:25 +01:00
parent 12101dfc93
commit fc741a0469
3 changed files with 23 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
project-manager/.angular-cli.json
View File

@ -46,7 +46,7 @@
}, },
"test": { "test": {
"karma": { "karma": {
"config": "./karma.conf.js" "config": "./.karma.conf.js"
} }
}, },
"defaults": { "defaults": {

18
project-manager/karma.conf.js → project-manager/.karma.conf.js
View File

@ -1,5 +1,5 @@
// Karma configuration // Karma configuration
// Generated on Thu Mar 2 2017 04:57:32 GMT+0100 (CET) // Generated on Sat Mar 25 2017 06:01:47 GMT+0100 (CET)
module.exports = function(config) { module.exports = function(config) {
config.set({ config.set({
@ -15,21 +15,19 @@ module.exports = function(config) {
// list of files / patterns to load in the browser // list of files / patterns to load in the browser
files: [ files: [
{ pattern: 'src/**/*.spec.ts' } './src/**/*.spec.ts'
], ],
// Redefine default mapping from file extensions to MIME-type
// Set property name to required MIME, provide Array of extensions (without dots) as it's value
mime: {
'text/x-typescript': ['ts','tsx']
},
// list of files to exclude // list of files to exclude
exclude: [ exclude: [
], ],
// Redefine default mapping from file extensions to MIME-type
// Set property name to required MIME, provide Array of extensions (without dots) as it's value
mime: {
'text/x-typescript': ['ts','tsx']
},
// preprocess matching files before serving them to the browser // preprocess matching files before serving them to the browser
// available preprocessors: https://npmjs.org/browse/keyword/karma-preprocessor // available preprocessors: https://npmjs.org/browse/keyword/karma-preprocessor
@ -40,7 +38,7 @@ module.exports = function(config) {
// test results reporter to use // test results reporter to use
// possible values: 'dots', 'progress' // possible values: 'dots', 'progress'
// available reporters: https://npmjs.org/browse/keyword/karma-reporter // available reporters: https://npmjs.org/browse/keyword/karma-reporter
reporters: ['spec'], reporters: ['progress'],
// web server port // web server port

31
project-manager/package.json
View File

@ -17,40 +17,37 @@
}, },
"private": true, "private": true,
"dependencies": { "dependencies": {
"@angular/common": "^2.4.3", "@angular/common": "^4.0.0",
"@angular/compiler": "^2.4.3", "@angular/compiler": "^4.0.0",
"@angular/core": "^2.4.3", "@angular/core": "^4.0.0",
"@angular/forms": "^2.4.3", "@angular/forms": "^4.0.0",
"@angular/http": "^2.4.3", "@angular/http": "^4.0.0",
"@angular/platform-browser": "^2.4.3", "@angular/platform-browser": "^4.0.0",
"@angular/platform-browser-dynamic": "^2.4.3", "@angular/platform-browser-dynamic": "^4.0.0",
"@angular/router": "^3.4.3", "@angular/router": "^4.0.0",
"bootstrap": "^3.3.7", "bootstrap": "^3.3.7",
"core-js": "^2.4.1", "core-js": "^2.4.1",
"jquery": "^3.1.0", "jquery": "^3.1.0",
"jquery-ui": "^1.12.0", "jquery-ui": "^1.12.0",
"jquery-ui-bundle": "^1.11.4", "jquery-ui-bundle": "^1.11.4",
"rxjs": "^5.0.1", "rxjs": "^5.2.0",
"socket.io-client": "^1.4.8", "socket.io-client": "^1.4.8",
"ts-helpers": "^1.1.1", "ts-helpers": "^1.1.1",
"ts-md5": "^1.2.0", "ts-md5": "^1.2.0",
"zone.js": "^0.7.2" "zone.js": "^0.8.5"
}, },
"devDependencies": { "devDependencies": {
"@angular/cli": "^1.0.0", "@angular/cli": "1.0.0",
"@angular/compiler-cli": "^2.4.3", "@angular/compiler-cli": "^4.0.0",
"@types/jasmine": "2.5.38", "@types/jasmine": "2.5.38",
"@types/node": "^6.0.42", "@types/node": "~6.0.60",
"@types/socket.io-client": "^1.4.26", "@types/socket.io-client": "^1.4.26",
"codelyzer": "~2.0.0-beta.1", "codelyzer": "~2.0.0-beta.1",
"concurrently": "^2.0.0", "concurrently": "^2.0.0",
"jasmine": "^2.5.3",
"karma": "^1.5.0",
"karma-chrome-launcher": "^2.0.0", "karma-chrome-launcher": "^2.0.0",
"karma-jasmine": "^1.1.0", "karma-jasmine": "^1.1.0",
"karma-spec-reporter": "0.0.30",
"ts-node": "1.2.1", "ts-node": "1.2.1",
"tslint": "^4.3.0", "tslint": "^4.3.0",
"typescript": "~2.0.3" "typescript": "~2.2.1"
} }
} }