SONAR-5619 Change pattern of repository facet values when duplicate names

diff --git a/server/sonar-web/src/main/coffee/coding-rules/app.coffee b/server/sonar-web/src/main/coffee/coding-rules/app.coffee
index aab13d216d4c44279e3375cf84e1edfde52c2064..14ab0d938c55d8495fd5f94e994d566a61318b85 100644 (file)
--- a/server/sonar-web/src/main/coffee/coding-rules/app.coffee
+++ b/server/sonar-web/src/main/coffee/coding-rules/app.coffee
@@ -509,7 +509,7 @@ requirejs [
         repo = _.findWhere(App.repositories, key: value)
         other_repo_with_same_name = _.find(App.repositories, (repos) -> repos.name == repo.name && repos.key != repo.key)
         if other_repo_with_same_name
-          repo.name + ' - ' + App.languages[repo.language]
+          App.languages[repo.language] + ' ' + repo.name
         else
           repo.name
 

diff --git a/server/sonar-web/src/main/js/tests/e2e/tests/coding-rules-spec.js b/server/sonar-web/src/main/js/tests/e2e/tests/coding-rules-spec.js
index 4b4349c7a235d500578e9d2e81976963221ebcaa..b6cabf1d88ae40bdb969313f722f537d5a75af24 100644 (file)
--- a/server/sonar-web/src/main/js/tests/e2e/tests/coding-rules-spec.js
+++ b/server/sonar-web/src/main/js/tests/e2e/tests/coding-rules-spec.js
@@ -60,6 +60,15 @@ casper.test.begin(testName('Readonly Tests'), function suite(test) {
     });
 
 
+    casper.waitForSelector('div.navigator-facets-list-item:nth-child(2)', function checkFacets() {
+      test.assertSelectorHasText('div.navigator-facets-list-item:nth-child(2) a:nth-child(1)', 'Java SonarQube');
+      test.assertSelectorHasText('div.navigator-facets-list-item:nth-child(2) a:nth-child(2)', 'Java Common SonarQube');
+      test.assertSelectorHasText('div.navigator-facets-list-item:nth-child(2) a:nth-child(3)', 'CoffeeScript SonarQube');
+      test.assertSelectorHasText('div.navigator-facets-list-item:nth-child(2) a:nth-child(4)', 'CoffeeScript Common SonarQube');
+      test.assertSelectorHasText('div.navigator-facets-list-item:nth-child(2) a:nth-child(5)', 'Xoo SonarQube');
+    });
+
+
     casper.waitForSelector('li.active', function checkResultsList() {
       test.assertElementCount('ol.navigator-results-list li', 10);
       test.assertElementCount('li.active', 1);