Merge pull request bokeh#2 from bokeh/master

nathanielatom · web-flow · commit 2cde05898dc9 · 2017-05-01T22:59:40.000+02:00
Merged from Upstream.
diff --git a/bokehjs/.gitignore b/bokehjs/.gitignore
@@ -1,5 +1,7 @@
 /build
 /node_modules
+/coverage
+.coverrun
 *~
 *.sw[opn]
 *.bak
diff --git a/bokehjs/.istanbul.yml b/bokehjs/.istanbul.yml
@@ -0,0 +1,2 @@
+instrumentation:
+    excludes: ['**/vendor/**']
diff --git a/bokehjs/gulp/tasks/test.coffee b/bokehjs/gulp/tasks/test.coffee
@@ -12,12 +12,23 @@ mocha = (options={}) ->
     (file) ->
       if @_files? then @_files.push(file.path) else @_files = [file.path]
     () ->
-      args = [
-        "node_modules/mocha/bin/_mocha",
-        "--compilers", "coffee:coffee-script/register",
-        "--reporter", argv.reporter ? "spec",
-        "./test/index.coffee"
-      ].concat(@_files)
+      if options.coverage? and options.coverage
+        args = [
+          "node_modules/.bin/istanbul",
+          "cover",
+          "node_modules/mocha/bin/_mocha",
+          "--",
+          "--compilers", "coffee:coffee-script/register",
+          "--reporter", argv.reporter ? "spec",
+          "./test/index.coffee"
+        ].concat(@_files)
+      else
+        args = [
+          "node_modules/mocha/bin/_mocha",
+          "--compilers", "coffee:coffee-script/register",
+          "--reporter", argv.reporter ? "spec",
+          "./test/index.coffee"
+        ].concat(@_files)
 
       if argv.debug
         args.unshift("debug")
@@ -39,6 +50,9 @@ mocha = (options={}) ->
       process.on('SIGINT',  handler)
   )
 
+gulp.task "test:coverage", ["defaults:generate"], () ->
+  gulp.src(["./test/all.coffee"]).pipe(mocha({coverage: true}))
+
 gulp.task "test", ["defaults:generate"], () ->
   gulp.src(["./test/all.coffee"]).pipe(mocha())
 
diff --git a/bokehjs/package.json b/bokehjs/package.json
@@ -24,6 +24,7 @@
     "cheerio": "^0.19.0",
     "coffeeify": "^0.7.0",
     "del": "^1.1.1",
+    "istanbul": "^0.4.5",
     "gulp": "^3.9.0",
     "gulp-change": "^1.0.0",
     "gulp-insert": "^0.5.0",

Original file line number	Diff line number	Diff line change
`@@ -0,0 +1,2 @@`
	`1`	`+instrumentation:`
	`2`	`+ excludes: ['/vendor/']`