Commit 2e2ffa6aeb14b1b1e95851c1651768791cb43df3
1 parent
47d614bd
Exists in
master
and in
34 other branches
change karma basePath. added karma npm script
Showing
2 changed files
with
4 additions
and
3 deletions
Show diff stats
karma.conf.js
@@ -89,7 +89,7 @@ var webpackConfig = require("./webpack.config.js"); | @@ -89,7 +89,7 @@ var webpackConfig = require("./webpack.config.js"); | ||
89 | module.exports = function (config) { | 89 | module.exports = function (config) { |
90 | 90 | ||
91 | var configuration = { | 91 | var configuration = { |
92 | - basePath: '../angular-theme', | 92 | + basePath: './', |
93 | 93 | ||
94 | files: listFiles(), | 94 | files: listFiles(), |
95 | 95 | ||
@@ -144,14 +144,14 @@ module.exports = function (config) { | @@ -144,14 +144,14 @@ module.exports = function (config) { | ||
144 | } | 144 | } |
145 | };*/ | 145 | };*/ |
146 | /*configuration.webpack = _.merge({ | 146 | /*configuration.webpack = _.merge({ |
147 | - | 147 | + |
148 | }, webpackConfig, { | 148 | }, webpackConfig, { |
149 | devtool: 'source-map' | 149 | devtool: 'source-map' |
150 | }), | 150 | }), |
151 | configuration.webpackServer = { | 151 | configuration.webpackServer = { |
152 | quite: true | 152 | quite: true |
153 | };*/ | 153 | };*/ |
154 | - | 154 | + |
155 | // This is the default preprocessors configuration for a usage with Karma cli | 155 | // This is the default preprocessors configuration for a usage with Karma cli |
156 | // The coverage preprocessor is added in gulp/unit-test.js only for single tests | 156 | // The coverage preprocessor is added in gulp/unit-test.js only for single tests |
157 | // It was not possible to do it there because karma doesn't let us now if we are | 157 | // It was not possible to do it there because karma doesn't let us now if we are |
package.json
@@ -7,6 +7,7 @@ | @@ -7,6 +7,7 @@ | ||
7 | "moment": "^2.11.2" | 7 | "moment": "^2.11.2" |
8 | }, | 8 | }, |
9 | "scripts": { | 9 | "scripts": { |
10 | + "webpack": "webpack", | ||
10 | "karma": "karma", | 11 | "karma": "karma", |
11 | "coverage": "karma start --single-run; npm run remap-coverage", | 12 | "coverage": "karma start --single-run; npm run remap-coverage", |
12 | "remap-coverage": "ts-node --project ./dev-scripts ./dev-scripts/remapCoverage.ts", | 13 | "remap-coverage": "ts-node --project ./dev-scripts ./dev-scripts/remapCoverage.ts", |