From 00bae18aff37febfcc10a0fe574037c06c6061df Mon Sep 17 00:00:00 2001 From: Stas Vilchik Date: Tue, 23 Dec 2014 16:10:11 +0100 Subject: [PATCH] SONAR-5820 Complete rule details with sqale metadata --- .../rule/coding-rules-rule-meta.hbs | 34 +++++++++++++++++-- .../coding-rules-page-should-show-details.js | 5 ++- .../sonar-web/src/main/less/coding-rules.less | 4 +++ 3 files changed, 39 insertions(+), 4 deletions(-) diff --git a/server/sonar-web/src/main/hbs/coding-rules/rule/coding-rules-rule-meta.hbs b/server/sonar-web/src/main/hbs/coding-rules/rule/coding-rules-rule-meta.hbs index 829003f8ed4..44cd94a7adf 100644 --- a/server/sonar-web/src/main/hbs/coding-rules/rule/coding-rules-rule-meta.hbs +++ b/server/sonar-web/src/main/hbs/coding-rules/rule/coding-rules-rule-meta.hbs @@ -32,9 +32,7 @@ {{/if}} - {{#if subCharacteristic}} -
  • {{subCharacteristic}}
  • - {{/if}} +
  • {{t 'coding_rules.available_since'}} {{d createdAt}}
  • @@ -52,3 +50,33 @@ {{/if}} + +{{#if subCharacteristic}} + +{{/if}} diff --git a/server/sonar-web/src/main/js/tests/e2e/tests/coding-rules-page-should-show-details.js b/server/sonar-web/src/main/js/tests/e2e/tests/coding-rules-page-should-show-details.js index 0598f9019fd..1dfd0d48d28 100644 --- a/server/sonar-web/src/main/js/tests/e2e/tests/coding-rules-page-should-show-details.js +++ b/server/sonar-web/src/main/js/tests/e2e/tests/coding-rules-page-should-show-details.js @@ -6,7 +6,7 @@ lib.initMessages(); lib.changeWorkingDirectory('coding-rules-page-should-show-details'); -casper.test.begin('coding-rules-page-should-show-details', 17, function (test) { +casper.test.begin('coding-rules-page-should-show-details', 20, function (test) { casper .start(lib.buildUrl('coding-rules'), function () { lib.setDefaultViewport(); @@ -36,6 +36,9 @@ casper.test.begin('coding-rules-page-should-show-details', 17, function (test) { test.assertSelectorContains('.coding-rules-detail-properties', 'error-handling'); test.assertSelectorContains('.coding-rules-detail-properties', '2013'); test.assertSelectorContains('.coding-rules-detail-properties', 'SonarQube (Java)'); + test.assertSelectorContains('.coding-rules-detail-properties', 'Reliability > Exception handling'); + test.assertSelectorContains('.coding-rules-detail-properties', 'LINEAR'); + test.assertSelectorContains('.coding-rules-detail-properties', '20min'); test.assertSelectorContains('.coding-rules-detail-description', 'is the superclass of all errors and'); test.assertSelectorContains('.coding-rules-detail-description', 'its subclasses should be caught.'); diff --git a/server/sonar-web/src/main/less/coding-rules.less b/server/sonar-web/src/main/less/coding-rules.less index 86badc92f7a..295a1854e56 100644 --- a/server/sonar-web/src/main/less/coding-rules.less +++ b/server/sonar-web/src/main/less/coding-rules.less @@ -173,6 +173,10 @@ font-size: 0; } +.coding-rules-detail-properties + .coding-rules-detail-properties { + margin-top: -@navigatorPadding; +} + .coding-rules-detail-property { display: inline-block; vertical-align: middle; -- 2.39.5