From: Stas Vilchik <vilchiks@gmail.com>
Date: Fri, 29 May 2015 08:43:08 +0000 (+0200)
Subject: SONAR-6416 fix display of stacktrace
X-Git-Tag: 5.2-RC1~1778
X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=bdcb8a35e544e89bacc343c16f3306aea4f931ee;p=sonarqube.git

SONAR-6416 fix display of stacktrace
---

diff --git a/server/sonar-web/src/main/js/components/source-viewer/templates/measures/_source-viewer-measures-test-cases.hbs b/server/sonar-web/src/main/js/components/source-viewer/templates/measures/_source-viewer-measures-test-cases.hbs
index 30663571ef6..26bf9818cc1 100644
--- a/server/sonar-web/src/main/js/components/source-viewer/templates/measures/_source-viewer-measures-test-cases.hbs
+++ b/server/sonar-web/src/main/js/components/source-viewer/templates/measures/_source-viewer-measures-test-cases.hbs
@@ -61,11 +61,12 @@
       {{/notEq}}
 
       {{#notEq selectedTest.status 'OK'}}
+        {{log selectedTest}}
         <div class="bubble-popup-title">{{t 'component_viewer.details'}}</div>
         {{#if selectedTest.message}}
           <pre>{{selectedTest.message}}</pre>
         {{/if}}
-        <pre>{{selectedTest.stackTrace}}</pre>
+        <pre>{{selectedTest.stacktrace}}</pre>
       {{/notEq}}
     </div>
   </div>
diff --git a/server/sonar-web/src/main/less/components/source.less b/server/sonar-web/src/main/less/components/source.less
index 6e02fe6e7ad..e21672c7a51 100644
--- a/server/sonar-web/src/main/less/components/source.less
+++ b/server/sonar-web/src/main/less/components/source.less
@@ -352,7 +352,6 @@
 
 .source-viewer-measures-component {
   float: none;
-  width: 1080px;
   margin: 0 10px 30px;
 }
 
diff --git a/server/sonar-web/src/test/js/source-viewer-spec.js b/server/sonar-web/src/test/js/source-viewer-spec.js
index 523e08cb3c4..c52f1bcb7a2 100644
--- a/server/sonar-web/src/test/js/source-viewer-spec.js
+++ b/server/sonar-web/src/test/js/source-viewer-spec.js
@@ -368,7 +368,7 @@ casper.test.begin(testName('Details'), 15, function (test) {
 });
 
 
-casper.test.begin(testName('Details', 'Tests'), 39, function (test) {
+casper.test.begin(testName('Details', 'Tests'), 41, function (test) {
   casper
       .start(lib.buildUrl('source-viewer'), function () {
         lib.setDefaultViewport();
@@ -382,6 +382,8 @@ casper.test.begin(testName('Details', 'Tests'), 39, function (test) {
         lib.mockRequestFromFile('/api/tests/list', 'tests.json', { data: { testFileUuid: 'uuid' } });
         lib.mockRequestFromFile('/api/tests/covered_files', 'covered-files.json',
             { data: { testUuid: 'test-uuid-1' } });
+        lib.mockRequestFromFile('/api/tests/covered_files', 'covered-files.json',
+            { data: { testUuid: 'test-uuid-3' } });
       })
 
       .then(function () {
@@ -475,6 +477,16 @@ casper.test.begin(testName('Details', 'Tests'), 39, function (test) {
         test.assertSelectorContains('.js-selected-test', '2');
       })
 
+      .then(function () {
+        casper.click('.js-show-test[data-id="test-uuid-3"]');
+        casper.waitForText('Failure Message');
+      })
+
+      .then(function () {
+        test.assertSelectorContains('.js-selected-test', 'Failure Message');
+        test.assertSelectorContains('.js-selected-test', 'Failure Stacktrace');
+      })
+
       .then(function () {
         lib.sendCoverage();
       })
diff --git a/server/sonar-web/src/test/json/source-viewer-spec/tests.json b/server/sonar-web/src/test/json/source-viewer-spec/tests.json
index af8f8177ac2..9e36884fc27 100644
--- a/server/sonar-web/src/test/json/source-viewer-spec/tests.json
+++ b/server/sonar-web/src/test/json/source-viewer-spec/tests.json
@@ -19,7 +19,9 @@
       "status": "FAILURE",
       "durationInMs": 14,
       "coveredLines": 1,
-      "testUuid": "test-uuid-3"
+      "testUuid": "test-uuid-3",
+      "message": "Failure Message",
+      "stacktrace": "Failure Stacktrace"
     },
     {
       "name": "test4",