Limit webpack instrumentation in CI environment

Upgrade CI Safari version to 11 Removes reports during CI builds - Adds Coveralls badge Signed-off-by: Christopher Rogers <chrissrogers@gmail.com>
recurly · Apr 8, 2018 · 174b346 · 174b346
1 parent 9c2f5cd
commit 174b346
Show file tree

Hide file tree

Showing 4 changed files with 23 additions and 9 deletions.
diff --git a/Makefile b/Makefile
@@ -35,6 +35,7 @@ test-ci: build build/test.js
 	@$(KARMA) start karma.ci.conf.js
 ifdef REPORT_COVERAGE
 	@cat ./build/reports/coverage/lcov.info | $(COVERALLS)
+	@rm -rf ./build/reports
 endif
 
 node_modules: package.json

diff --git a/README.md b/README.md
@@ -6,7 +6,7 @@
 
 [![build status][travis-image]][travis-url]
 [![Browser test status][sauce-image]][sauce-url]
-[![code quality][climate-image]][climate-url]
+[![coverage][coverage-image]][coverage-url]
 
 ## Documentation
 
@@ -48,12 +48,14 @@ $ make test
 
 [*aurea mediocritas*][aristotle]
 
-[travis-url]: https://travis-ci.org/recurly/recurly-js/builds
-[travis-image]: https://img.shields.io/travis/recurly/recurly-js/master.svg?style=flat-square
 [climate-url]: https://codeclimate.com/github/recurly/recurly-js
 [climate-image]: http://img.shields.io/codeclimate/github/recurly/recurly-js.svg?style=flat-square
+[coverage-url]: https://coveralls.io/github/recurly/recurly-js
+[coverage-image]: https://img.shields.io/coveralls/github/recurly/recurly-js.svg?style=flat-square
 [sauce-url]: https://saucelabs.com/u/recurly-js
-[sauce-image]: https://badges.herokuapp.com/travis/recurly/recurly-js/sauce/recurly-js?logos=none
+[sauce-image]: https://badges.herokuapp.com/travis/recurly/recurly-js/sauce/recurly-js?logos=none&style=flat-square
+[travis-url]: https://travis-ci.org/recurly/recurly-js/builds
+[travis-image]: https://img.shields.io/travis/recurly/recurly-js/master.svg?style=flat-square
 
 [docs]: https://docs.recurly.com/js
 [examples]: https://github.com/recurly/recurly-js-examples

diff --git a/karma.ci.conf.js b/karma.ci.conf.js
@@ -18,7 +18,8 @@ var sauceBrowsers = {
   sl_safari: {
     base: 'SauceLabs',
     browserName: 'safari',
-    platform: 'OS X 10.10'
+    platform: 'OS X 10.12',
+    version: '11'
   },
   sl_ie_11: {
     base: 'SauceLabs',

diff --git a/webpack.test.config.js b/webpack.test.config.js
@@ -2,6 +2,11 @@ var ExtractTextPlugin = require("extract-text-webpack-plugin");
 var glob = require('glob');
 var path = require('path');
 
+var plugins = ['transform-object-assign'];
+if (shouldInstrument()) {
+  plugins.push(['istanbul', { 'exclude': ['test/*'] }]);
+}
+
 module.exports = {
   entry: glob.sync('./test/**/*.test.js'),
   output: {
@@ -20,10 +25,7 @@ module.exports = {
             options: {
               cacheDirectory: true,
               presets: ['es2015'],
-              plugins: [
-                'transform-object-assign',
-                ['istanbul', { 'exclude': ['test/*'] }]
-              ]
+              plugins: plugins
             }
           }
         ]
@@ -53,3 +55,11 @@ module.exports = {
   ],
   devtool: 'inline-source-map'
 };
+
+// Only instrument in CI if we're set to report coverage
+function shouldInstrument () {
+  if (process.env.TRAVIS_JOB_ID) {
+    return !!process.env.REPORT_COVERAGE;
+  }
+  return true;
+}