feat(test): test without ci flag will not run coverage

fix isCI logic
antonybudianto · Dec 5, 2016 · a7b2ac3 · a7b2ac3
1 parent 6633b3e
commit a7b2ac3
Show file tree

Hide file tree

Showing 4 changed files with 38 additions and 14 deletions.
diff --git a/config/webpack/webpack.test.js b/config/webpack/webpack.test.js
@@ -1,33 +1,32 @@
 const webpack = require('webpack');
 const webpackMerge = require('webpack-merge');
 const path = require('path');
+const chalk = require('chalk');
 const _ = require('lodash');
 
 const coreConfig = require('./webpack.core');
 const helpers = require('./helpers');
 
+const isCI = process.argv.indexOf('--ci') !== -1;
+
+if (isCI) {
+  console.log(chalk.bgBlue('CI flag is on'));
+} else {
+  console.log(chalk.bgGreen('CI flag is off'))
+}
+
 module.exports = webpackMerge(coreConfig, {
   devtool: 'inline-source-map',
 
   module: {
     rules: [
-      {
-        test: /\.(js|ts)$/,
-        enforce: 'post',
-        loader: 'istanbul-instrumenter-loader',
-        include: helpers.root('src'),
-        exclude: [
-          /\.(e2e|spec)\.ts$/,
-          /node_modules/
-        ]
-      },
       {
         test: /\.ts$/,
         loader: 'awesome-typescript-loader',
         query: {
           module: 'commonjs',
-          sourceMap: false,
-          inlineSourceMap: true,
+          sourceMap: !isCI,
+          inlineSourceMap: isCI,
           forkChecker: true
         }
       },
@@ -55,5 +54,17 @@ module.exports = webpackMerge(coreConfig, {
         loader: 'raw-loader'
       }
     ]
+    .concat(!isCI ? [] : [
+      {
+        test: /\.(js|ts)$/,
+        enforce: 'post',
+        loader: 'istanbul-instrumenter-loader',
+        include: helpers.root('src'),
+        exclude: [
+          /\.(e2e|spec)\.ts$/,
+          /node_modules/
+        ]
+      }
+    ])
   }
 });
diff --git a/karma.conf.js b/karma.conf.js
@@ -15,7 +15,7 @@ module.exports = function (config) {
     ],
 
     preprocessors: {
-      './config/test/karma-test-shim.js': ['coverage', 'webpack']
+      './config/test/karma-test-shim.js': ['webpack', 'sourcemap']
     },
 
     webpack: webpackConfig,
@@ -39,7 +39,7 @@ module.exports = function (config) {
       'lcovonly': './coverage/lcov.info'
     },
 
-    reporters: ['progress', 'coverage', 'remap-coverage'],
+    reporters: ['progress', 'remap-coverage'],
     port: 9876,
     colors: true,
     logLevel: config.LOG_INFO,
@@ -48,5 +48,10 @@ module.exports = function (config) {
     singleRun: config.ci
   };
 
+  if (config.ci) {
+    _config.preprocessors['./config/test/karma-test-shim.js'].unshift('coverage');
+    _config.reporters.push('coverage');
+  }
+
   config.set(_config);
 };
diff --git a/package.json b/package.json
@@ -17,6 +17,7 @@
     "start:dll": "run-s build:dll start",
     "pretest": "npm run clean:coverage",
     "test": "karma start",
+    "test:ci": "npm test -- --ci",
     "tslint": "tslint",
     "lint": "npm run tslint \"src/**/*.ts\"",
     "serve": "lite-server -c config/browser-sync/bs-config.js",
@@ -91,6 +92,7 @@
     "karma-jasmine": "~1.0.2",
     "karma-phantomjs-launcher": "~1.0.2",
     "karma-remap-coverage": "^0.1.2",
+    "karma-sourcemap-loader": "^0.3.7",
     "karma-webpack": "1.8.0",
     "lodash": "^4.17.2",
     "npm-run-all": "^3.1.2",

diff --git a/yarn.lock b/yarn.lock
@@ -3001,6 +3001,12 @@ karma-remap-coverage@^0.1.2:
   dependencies:
     remap-istanbul "^0.7.0"
 
+karma-sourcemap-loader@^0.3.7:
+  version "0.3.7"
+  resolved "https://registry.yarnpkg.com/karma-sourcemap-loader/-/karma-sourcemap-loader-0.3.7.tgz#91322c77f8f13d46fed062b042e1009d4c4505d8"
+  dependencies:
+    graceful-fs "^4.1.2"
+
 karma-webpack@1.8.0:
   version "1.8.0"
   resolved "https://registry.yarnpkg.com/karma-webpack/-/karma-webpack-1.8.0.tgz#340c7999eb3745b47becab47d0d304dac2c55257"