diff options
| author | Jean-Baptiste Lievremont <jean-baptiste.lievremont@sonarsource.com> | 2014-10-01 16:30:18 +0200 |
|---|---|---|
| committer | Jean-Baptiste Lievremont <jean-baptiste.lievremont@sonarsource.com> | 2014-10-02 15:17:26 +0200 |
| commit | 0f95789c44f8b6bbe14a311b5c9510051e74f2f0 (patch) | |
| tree | 7d8d8a4b172f3e4c8023aa6639b0399b3ee0db58 /server | |
| parent | 715e3718a4c3eb163041a5ce8487d3b2d4a50181 (diff) | |
| download | sonarqube-0f95789c44f8b6bbe14a311b5c9510051e74f2f0.tar.gz sonarqube-0f95789c44f8b6bbe14a311b5c9510051e74f2f0.zip | |
SONAR-5619 Change pattern of repository facet values when duplicate names
Diffstat (limited to 'server')
| -rw-r--r-- | server/sonar-web/src/main/coffee/coding-rules/app.coffee | 2 | ||||
| -rw-r--r-- | server/sonar-web/src/main/js/tests/e2e/tests/coding-rules-spec.js | 9 |
2 files changed, 10 insertions, 1 deletions
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 aab13d216d4..14ab0d938c5 100644 --- 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 4b4349c7a23..b6cabf1d88a 100644 --- 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); |