summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorStas Vilchik <vilchiks@gmail.com>2014-06-27 18:20:47 +0600
committerStas Vilchik <vilchiks@gmail.com>2014-06-27 18:20:47 +0600
commit0d1466d148c50124e1b5f41f0dfe5434f5cfc161 (patch)
treec4c311f6a9049de0414851945675cb70f06581bc
parentcdef699e9089916e8c3bbc80891bd45f8bfcf153 (diff)
downloadsonarqube-0d1466d148c50124e1b5f41f0dfe5434f5cfc161.tar.gz
sonarqube-0d1466d148c50124e1b5f41f0dfe5434f5cfc161.zip
SONAR-5209 Fix tests tab
-rw-r--r--sonar-server/src/main/hbs/component-viewer/header/tests-header.hbs4
-rw-r--r--sonar-server/src/main/js/common/handlebars-extensions.js8
2 files changed, 10 insertions, 2 deletions
diff --git a/sonar-server/src/main/hbs/component-viewer/header/tests-header.hbs b/sonar-server/src/main/hbs/component-viewer/header/tests-header.hbs
index f5a6de029f3..a1040d7a85b 100644
--- a/sonar-server/src/main/hbs/component-viewer/header/tests-header.hbs
+++ b/sonar-server/src/main/hbs/component-viewer/header/tests-header.hbs
@@ -58,7 +58,7 @@
{{name}}</span>
</span></li>
{{else}}
- {{#if coveredLines}}
+ {{#ifTestData this}}
<li><a class="item js-unit-test" data-name="{{name}}" data-status="{{status}}" title="{{name}}">
<span class="label">{{testStatusIcon status}}
<span class="duration subtitle">{{durationInMs}}ms</span>
@@ -71,7 +71,7 @@
<span class="label">{{testStatusIcon status}}
<span class="duration subtitle">{{durationInMs}}ms</span> {{name}}</span>
</span></li>
- {{/if}}
+ {{/ifTestData}}
{{/eq}}
{{/each}}
</ul>
diff --git a/sonar-server/src/main/js/common/handlebars-extensions.js b/sonar-server/src/main/js/common/handlebars-extensions.js
index 93dcc343076..5451f4d5d9f 100644
--- a/sonar-server/src/main/js/common/handlebars-extensions.js
+++ b/sonar-server/src/main/js/common/handlebars-extensions.js
@@ -333,4 +333,12 @@ define(['handlebars', 'moment'], function (Handlebars, moment) {
return changed ? options.fn(this) : options.inverse(this);
});
+ Handlebars.registerHelper('ifTestData', function(test, options) {
+ if ((test.status !== 'OK') || ((test.status === 'OK') && test.coveredLines)) {
+ return options.fn(this);
+ } else {
+ return options.inverse(this);
+ }
+ });
+
});