Dir tests deleted

test:watch added
webpack library updated
protractor installed locally
This commit is contained in:
Giuseppe Digilio
2017-01-10 09:45:29 +01:00
parent 4eb49883d5
commit 144324e023
7 changed files with 23 additions and 13 deletions

View File

@@ -99,7 +99,7 @@ module.exports = function(config) {
logLevel: config.LOG_INFO, logLevel: config.LOG_INFO,
// enable / disable watching file and executing tests whenever any file changes // enable / disable watching file and executing tests whenever any file changes
autoWatch: false, //autoWatch: true,
/* /*
* start these browsers * start these browsers
@@ -136,7 +136,7 @@ module.exports = function(config) {
* Continuous Integration mode * Continuous Integration mode
* if true, Karma captures browsers, runs the tests and exits * if true, Karma captures browsers, runs the tests and exits
*/ */
singleRun: true //singleRun: true
}; };
if (process.env.TRAVIS){ if (process.env.TRAVIS){

View File

@@ -50,14 +50,14 @@
"debug:build:prod": "node-nightly --inspect --debug-brk node_modules/webpack/bin/webpack.js --config webpack.prod.config.ts", "debug:build:prod": "node-nightly --inspect --debug-brk node_modules/webpack/bin/webpack.js --config webpack.prod.config.ts",
"docs": "typedoc --options typedoc.json ./src", "docs": "typedoc --options typedoc.json ./src",
"lint": "tslint \"src/**/*.ts\" || true", "lint": "tslint \"src/**/*.ts\" || true",
"global": "npm install -g angular-cli nodemon npm-check-updates rimraf ts-node typedoc typescript webpack webpack-bundle-size-analyzer rollup marked node-gyp protractor", "global": "npm install -g angular-cli nodemon npm-check-updates rimraf ts-node typedoc typescript webpack webpack-bundle-size-analyzer rollup marked node-gyp",
"postglobal": "npm link protractor", "protractor": "node node_modules/protractor/bin/protractor",
"protractor": "protractor",
"e2e": "npm run protractor", "e2e": "npm run protractor",
"test": "karma start", "test": "karma start --single-run",
"test:watch": "karma start --no-single-run --auto-watch",
"coverage": "http-server -c-1 -o -p 9875 ./coverage", "coverage": "http-server -c-1 -o -p 9875 ./coverage",
"webdriver:start": "webdriver-manager start --seleniumPort 4444", "webdriver:start": "node node_modules/protractor/bin/webdriver-manager start --seleniumPort 4444",
"webdriver:update": "webdriver-manager update --standalone" "webdriver:update": "node node_modules/protractor/bin/webdriver-manager update --standalone"
}, },
"dependencies": { "dependencies": {
"@angular/common": "2.2.3", "@angular/common": "2.2.3",
@@ -140,6 +140,7 @@
"karma-webpack": "1.8.0", "karma-webpack": "1.8.0",
"node-sass": "4.0.0", "node-sass": "4.0.0",
"nodemon": "1.11.0", "nodemon": "1.11.0",
"protractor": "~4.0.14",
"protractor-istanbul-plugin": "~2.0.0", "protractor-istanbul-plugin": "~2.0.0",
"raw-loader": "0.5.1", "raw-loader": "0.5.1",
"reflect-metadata": "0.1.8", "reflect-metadata": "0.1.8",
@@ -159,10 +160,10 @@
"typedoc": "0.5.1", "typedoc": "0.5.1",
"typescript": "2.0.10", "typescript": "2.0.10",
"v8-lazy-parse-webpack-plugin": "0.3.0", "v8-lazy-parse-webpack-plugin": "0.3.0",
"webpack": "2.1.0-beta.27", "webpack": "2.2.0-rc.3",
"webpack-bundle-analyzer": "1.4.1", "webpack-bundle-analyzer": "1.4.1",
"webpack-dev-middleware": "1.9.0", "webpack-dev-middleware": "1.9.0",
"webpack-dev-server": "2.1.0-beta.11", "webpack-dev-server": "2.2.0-rc.0",
"webpack-merge": "1.1.1" "webpack-merge": "1.1.1"
} }
} }

View File

@@ -47,7 +47,7 @@ testing.TestBed.initTestEnvironment(
* any file that ends with spec.ts and get its path. By passing in true * any file that ends with spec.ts and get its path. By passing in true
* we say do this recursively * we say do this recursively
*/ */
var testContext = require.context('./src/tests', true, /\.spec\.ts/); var testContext = require.context('./src', true, /\.spec\.ts/);
/* /*
* get all the files, for each file, call the context function * get all the files, for each file, call the context function

View File

@@ -15,8 +15,8 @@ import { Store } from "@ngrx/store";
// Load the implementations that should be tested // Load the implementations that should be tested
import { AppComponent } from '../app/app.component'; import { AppComponent } from './app.component';
import { HeaderComponent } from '../app/header/header.component'; import { HeaderComponent } from './header/header.component';
import { CommonModule } from '@angular/common'; import { CommonModule } from '@angular/common';

View File

View File

@@ -67,6 +67,11 @@ export var commonConfig = {
} }
], ],
}, },
performance: {
hints: false
},
plugins: [ plugins: [
// Use commonPlugins. // Use commonPlugins.
] ]

View File

@@ -166,6 +166,10 @@ module.exports = function (options) {
] ]
}, },
performance: {
hints: false
},
/** /**
* Add additional plugins to the compiler. * Add additional plugins to the compiler.
* *