Merge pull request #204 from bryk/timeout-update

Increase Karma no activiti timeout

build/build.js

@@ -89,5 +89,6 @@ gulp.task('assets', function() {
 /**
  * Cleans all build artifacts.
  */
-gulp.task(
-    'clean', function() { return del([conf.paths.dist, conf.paths.goWorkspace, conf.paths.tmp]); });
+gulp.task('clean', function() {
+  return del([conf.paths.dist, conf.paths.goWorkspace, conf.paths.tmp, conf.paths.coverage]);
+});

build/conf.js

@@ -85,6 +85,7 @@ export default {
     backendTmpSrc: path.join(basePath, '.tmp/backend/src/github.com/kubernetes/dashboard'),
     bowerComponents: path.join(basePath, 'bower_components'),
     build: path.join(basePath, 'build'),
+    coverage: path.join(basePath, 'coverage'),
     coverageReport: path.join(basePath, 'coverage/lcov'),
     deploySrc: path.join(basePath, 'src/app/deploy'),
     dist: path.join(basePath, 'dist'),

build/karma.conf.js

@@ -59,6 +59,8 @@ module.exports = function(config) {
 
     browsers: ['Chrome'],
 
+    browserNoActivityTimeout: 60 * 1000,  // 60 seconds.
+
     customLaunchers: {
       // Custom launcher for Travis CI. It is required because Travis environment cannot use
       // sandbox.
@@ -71,7 +73,7 @@ module.exports = function(config) {
     reporters: ['progress', 'coverage'],
 
     coverageReporter: {
-      dir: 'coverage/',
+      dir: conf.paths.coverage,
       reporters: [
         {type: 'html', subdir: 'html'},
         {type: 'lcovonly', subdir: 'lcov'},
@@ -100,7 +102,7 @@ module.exports = function(config) {
         // code coverage. TODO(floreks): try to make import work instead of require
         ['browserify-istanbul', {'instrumenter': require('isparta')}],
         // Transform ES6 code into ES5 so that browsers can digest it.
-        ['babelify', {'presets': ['es2015']}],
+        ['babelify'],
       ],
     },