Fix js unit tests

diff --git a/sonar-server/karma.conf.js b/sonar-server/karma.conf.js
index d588aedbfd0e75178ef1cf5c4d2b410bd744b715..bc9e4686b67d4f62c543e861314c7ba574a75b62 100644 (file)
--- a/sonar-server/karma.conf.js
+++ b/sonar-server/karma.conf.js
@@ -25,7 +25,6 @@ module.exports = function(config) {
     files: [
         // dependencies
         'third-party/jquery.js',
-        'third-party/jquery.mockjax.js',
         'third-party/underscore.js',
         'third-party/require.js',
 
@@ -35,6 +34,9 @@ module.exports = function(config) {
         // templates
         { pattern: '../WEB-INF/app/views/**/*.hbs.erb', included: false },
 
+        // common
+        { pattern: 'common/**/*.js', included: false },
+
         // app
         { pattern: 'navigator/**/*.js', included: false },
         { pattern: 'quality-gate/**/*.js', included: false },

diff --git a/sonar-server/src/main/webapp/javascripts/common/handlebars-extensions.js b/sonar-server/src/main/webapp/javascripts/common/handlebars-extensions.js
index 9ad0be77bd4201bbbf1a1f7c962761da148c523f..87b650dbe28b642eadab55d37ba7a07ca66aca7e 100644 (file)
--- a/sonar-server/src/main/webapp/javascripts/common/handlebars-extensions.js
+++ b/sonar-server/src/main/webapp/javascripts/common/handlebars-extensions.js
@@ -4,7 +4,7 @@ define(['handlebars'], function (Handlebars) {
    * Shortcut for templates retrieving
    */
   window.getTemplate = function(templateSelector) {
-    return Handlebars.compile(jQuery(templateSelector).html());
+    return Handlebars.compile(jQuery(templateSelector).html() || '');
   };
 
   var defaultActions = ['comment', 'assign', 'assign_to_me', 'plan', 'set_severity'];