Use combined coverage

Author: cvle

.travis.yml

@@ -17,10 +17,7 @@ before_install:
 before_script:
 - npm prune
 script:
-- npm run lint
-- npm run test:coverage
-- npm run test:integration
-- npm run build
+- npm run all
 after_success:
 - npm run ci:coveralls
 deploy:

karma.conf.js

@@ -14,7 +14,8 @@ module.exports = (config) => {
       "tests.webpack.js": ["webpack", "sourcemap"],
     },
     remapCoverageReporter: {
-      "text-summary": null,
+      text: null,
+      lcovonly: "./coverage/lcov-integration.info",
 //      json: './coverage/coverage.json',
 //      html: './coverage/html'
     },
@@ -23,8 +24,7 @@ module.exports = (config) => {
         { type: "in-memory" },
       ],
     },
-    // TODO: enable coverage after https://github.com/deepsweet/istanbul-instrumenter-loader/pull/29.
-    reporters: ["dots"], // , "coverage", "remap-coverage"], // report results in this format
+    reporters: ["dots", "coverage", "remap-coverage"],
     webpack: {
       resolve: {
         extensions: [".tsx", ".ts", ".js", ".json"],

package.json

@@ -19,14 +19,14 @@
   "main": "./cjs/index.js",
   "typings": "./lib/index.d.ts",
   "scripts": {
+    "all": "npm run lint && npm run test && npm run build",
     "build": "gulp && webpack && cross-env BUILD_MINIFIED=true webpack",
     "clean": "rm -r -f dist lib cjs coverage",
-    "ci:coveralls": "cat coverage/lcov.info | coveralls",
+    "ci:coveralls": "lcov-result-merger './coverage/lcov*.info' | coveralls",
     "release": "npm version -m 'react-css-transition release %s'",
     "lint": "gulp lint",
     "test": "npm run test:unit && npm run test:integration",
-    "test:coverage": "cross-env TS_NODE_COMPILER_OPTIONS='{\"module\":\"commonjs\"}' istanbul cover node_modules/.bin/_mocha -- --opts mocha.opts",
-    "test:unit": "cross-env TS_NODE_COMPILER_OPTIONS='{\"module\":\"commonjs\"}' mocha --opts mocha.opts",
+    "test:unit": "cross-env TS_NODE_COMPILER_OPTIONS='{\"module\":\"commonjs\"}' istanbul cover node_modules/.bin/_mocha -- --opts mocha.opts",
     "test:unit:watch": "npm run test:unit -- --watch",
     "test:integration": "karma start",
     "test:integration:watch": "karma start --single-run=false"
@@ -72,22 +72,24 @@
     "gulp-typescript": "^3.1.3",
     "gulp-yaml-validate": "^1.0.2",
     "istanbul": "^1.1.0-alpha.1",
-    "istanbul-instrumenter-loader": "^1.0.0",
+    "istanbul-instrumenter-loader": "^1.1.0",
     "jsdom": "^9.8.0",
     "json-loader": "^0.5.4",
     "karma": "^1.3.0",
     "karma-chrome-launcher": "^2.0.0",
     "karma-coverage": "^1.1.1",
     "karma-mocha": "^1.2.0",
     "karma-mocha-reporter": "^2.2.0",
-    "karma-remap-coverage": "^0.1.2",
+    "karma-remap-coverage": "^0.1.3",
     "karma-sourcemap-loader": "^0.3.7",
     "karma-webpack": "^1.8.0",
+    "lcov-result-merger": "^1.2.0",
     "merge2": "^1.0.2",
     "mocha": "^3.1.2",
     "react": "^15.3.2",
     "react-addons-test-utils": "^15.3.2",
     "react-dom": "^15.3.2",
+    "remap-istanbul": "0.8.0",
     "sinon": "^2.0.0-pre.4",
     "ts-node": "~1.2.3",
     "tslint": "^4.1.1",

tests.webpack.js

@@ -1,4 +1,7 @@
 "use strict";
 
-const integrationContext = require.context("./test", true, /\.tsx?$/);
-integrationContext.keys().forEach(integrationContext);
+const srcContext = require.context("./src", true, /^(?!.*\.spec\.).*\.tsx?$/);
+srcContext.keys().forEach(srcContext);
+
+const testContext = require.context("./test", true, /\.tsx?$/);
+testContext.keys().forEach(testContext);