You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@zeppelin.apache.org by co...@apache.org on 2015/11/18 08:08:30 UTC
incubator-zeppelin git commit: ZEPPELIN-431 - Show Karma test results
Repository: incubator-zeppelin
Updated Branches:
refs/heads/master 36f3549be -> d457277f0
ZEPPELIN-431 - Show Karma test results
There has been a few karma issues during build, after trying it today I realized that running ``./grunt test`` wasn't really showing the usual output.
Some time Before:
<img width="697" alt="screen shot 2015-11-04 at 11 50 34 pm" src="https://cloud.githubusercontent.com/assets/710411/10941613/b557764a-834f-11e5-944d-073a629d35d2.png">
Now:
<img width="704" alt="screen shot 2015-11-04 at 11 51 18 pm" src="https://cloud.githubusercontent.com/assets/710411/10941618/b87c589a-834f-11e5-89da-706eab7aae5b.png">
I'm thinking that Karma coverage might have been hidding those karma results, and therefore we can't see what is really happening or which rest is failing.
Author: Damien CORNEAU <co...@gmail.com>
Closes #390 from corneadoug/fix/karmaProblems and squashes the following commits:
f231014 [Damien CORNEAU] Fix RAT
3c6006e [Damien CORNEAU] Re-activate karma test results on the CLI
Project: http://git-wip-us.apache.org/repos/asf/incubator-zeppelin/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-zeppelin/commit/d457277f
Tree: http://git-wip-us.apache.org/repos/asf/incubator-zeppelin/tree/d457277f
Diff: http://git-wip-us.apache.org/repos/asf/incubator-zeppelin/diff/d457277f
Branch: refs/heads/master
Commit: d457277f0ef7229b725b6605dfeb5292b0e78723
Parents: 36f3549
Author: Damien CORNEAU <co...@gmail.com>
Authored: Tue Nov 17 17:06:10 2015 +0900
Committer: Damien CORNEAU <co...@gmail.com>
Committed: Wed Nov 18 16:08:02 2015 +0900
----------------------------------------------------------------------
.gitignore | 2 +-
pom.xml | 5 +++--
zeppelin-web/pom.xml | 1 -
zeppelin-web/test/karma.conf.js | 5 +++--
4 files changed, 7 insertions(+), 6 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-zeppelin/blob/d457277f/.gitignore
----------------------------------------------------------------------
diff --git a/.gitignore b/.gitignore
index aa53060..1cdb809 100644
--- a/.gitignore
+++ b/.gitignore
@@ -17,6 +17,7 @@ conf/interpreter.json
# other generated files
spark/dependency-reduced-pom.xml
+reports
#webapp
zeppelin-web/node_modules
@@ -26,7 +27,6 @@ zeppelin-web/.sass-cache
zeppelin-web/bower_components
**nbproject/
**node/
-zeppelin-web/reports/coverage
# project level
http://git-wip-us.apache.org/repos/asf/incubator-zeppelin/blob/d457277f/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index 6cee836..696f26f 100755
--- a/pom.xml
+++ b/pom.xml
@@ -425,6 +425,7 @@
<configuration>
<excludes>
<exclude>**/*.keywords</exclude>
+ <exclude>reports/**</exclude>
<exclude>**/.idea/</exclude>
<exclude>**/*.iml</exclude>
<exclude>.git/</exclude>
@@ -480,10 +481,10 @@
<exclude>docs/Rakefile</exclude>
<exclude>docs/rss.xml</exclude>
<exclude>docs/sitemap.txt</exclude>
-
+
<!-- bundled from jekyll -->
<exclude>docs/assets/themes/zeppelin/css/syntax.css</exclude>
-
+
<!-- docs (website) build target dir -->
<exclude>docs/_site/**</exclude>
<exclude>docs/Gemfile.lock</exclude>
http://git-wip-us.apache.org/repos/asf/incubator-zeppelin/blob/d457277f/zeppelin-web/pom.xml
----------------------------------------------------------------------
diff --git a/zeppelin-web/pom.xml b/zeppelin-web/pom.xml
index b4c7def..6b278af 100644
--- a/zeppelin-web/pom.xml
+++ b/zeppelin-web/pom.xml
@@ -79,7 +79,6 @@
<exclude>bower.json</exclude>
<exclude>package.json</exclude>
<exclude>*.md</exclude>
- <exclude>reports/**</exclude>
</excludes>
</configuration>
</plugin>
http://git-wip-us.apache.org/repos/asf/incubator-zeppelin/blob/d457277f/zeppelin-web/test/karma.conf.js
----------------------------------------------------------------------
diff --git a/zeppelin-web/test/karma.conf.js b/zeppelin-web/test/karma.conf.js
index 409c3a7..b4813f0 100644
--- a/zeppelin-web/test/karma.conf.js
+++ b/zeppelin-web/test/karma.conf.js
@@ -81,7 +81,7 @@ module.exports = function(config) {
'PhantomJS'
],
- reporters: 'coverage',
+ reporters: ['coverage','progress'],
preprocessors: {
'src/*/{*.js,!(test)/**/*.js}': 'coverage'
@@ -89,7 +89,8 @@ module.exports = function(config) {
coverageReporter: {
type: 'html',
- dir: 'reports/coverage'
+ dir: '../reports/zeppelin-web-coverage',
+ subdir: '.'
},
// Which plugins to enable