aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorStas Vilchik <vilchiks@gmail.com>2014-04-02 14:54:44 +0600
committerStas Vilchik <vilchiks@gmail.com>2014-04-02 14:54:52 +0600
commitd85412197fb55f4a1459bb40c3e79a43767b5fad (patch)
treec1feef17c8d52c2d3df6baf814630fa85bc4c6e7
parent8af1b17016ec268368f3d5b85adcf2399005adac (diff)
downloadsonarqube-d85412197fb55f4a1459bb40c3e79a43767b5fad.tar.gz
sonarqube-d85412197fb55f4a1459bb40c3e79a43767b5fad.zip
Update js unit tests configuration
-rw-r--r--sonar-server/Gruntfile.coffee2
-rw-r--r--sonar-server/karma.conf.js2
2 files changed, 3 insertions, 1 deletions
diff --git a/sonar-server/Gruntfile.coffee b/sonar-server/Gruntfile.coffee
index 39e53bac7dd..1350a4853b9 100644
--- a/sonar-server/Gruntfile.coffee
+++ b/sonar-server/Gruntfile.coffee
@@ -249,3 +249,5 @@ module.exports = (grunt) ->
'coffee:build', 'handlebars:build', 'copy:js',
'uglify:build',
'requirejs', 'clean:js', 'copy:build', 'copy:requirejs', 'clean:build']
+
+ grunt.registerTask 'test', ['coffee:build', 'handlebars:build', 'copy:js', 'karma:unit']
diff --git a/sonar-server/karma.conf.js b/sonar-server/karma.conf.js
index 8ce085110ce..72936a7621d 100644
--- a/sonar-server/karma.conf.js
+++ b/sonar-server/karma.conf.js
@@ -14,7 +14,7 @@ module.exports = function(config) {
config.set({
// base path, that will be used to resolve files and exclude
- basePath: 'src/main/js',
+ basePath: 'src/main/webapp/js',
// frameworks to use