diff options
| author | Stas Vilchik <vilchiks@gmail.com> | 2015-02-02 17:02:26 +0100 |
|---|---|---|
| committer | Stas Vilchik <vilchiks@gmail.com> | 2015-02-02 17:49:00 +0100 |
| commit | 26cab840b2776b84a5ac32895e0708b282503fe6 (patch) | |
| tree | b16f90bc4335a6e9303598b28cc8ef7e15d25231 /server | |
| parent | c2c47393a42f5d3244e998b7f99288edac0ca499 (diff) | |
| download | sonarqube-26cab840b2776b84a5ac32895e0708b282503fe6.tar.gz sonarqube-26cab840b2776b84a5ac32895e0708b282503fe6.zip | |
SONAR-6149 Re-organize facet widgets in the Issues page
Diffstat (limited to 'server')
| -rw-r--r-- | server/sonar-web/src/main/coffee/issues/models/state.coffee | 7 | ||||
| -rw-r--r-- | server/sonar-web/src/main/js/tests/e2e/tests/issues-page-spec.js | 12 |
2 files changed, 9 insertions, 10 deletions
diff --git a/server/sonar-web/src/main/coffee/issues/models/state.coffee b/server/sonar-web/src/main/coffee/issues/models/state.coffee index a685a95b43f..b4ec7549e19 100644 --- a/server/sonar-web/src/main/coffee/issues/models/state.coffee +++ b/server/sonar-web/src/main/coffee/issues/models/state.coffee @@ -7,12 +7,11 @@ define [ page: 1 maxResultsReached: false query: {} - facets: ['severities', 'statuses', 'resolutions'] + facets: ['severities', 'resolutions', 'rules', 'tags', 'projectUuids'] isContext: false - allFacets: ['issues', 'severities', 'statuses', 'resolutions', 'projectUuids', 'moduleUuids', 'directories', - 'fileUuids', 'assignees', 'reporters', 'rules', 'tags', 'languages', 'actionPlans', - 'creationDate'], + allFacets: ['issues', 'severities', 'resolutions', 'rules', 'tags', 'statuses', 'projectUuids', 'moduleUuids', + 'directories', 'fileUuids', 'assignees', 'reporters', 'languages', 'actionPlans', 'creationDate'], facetsFromServer: ['severities', 'statuses', 'resolutions', 'actionPlans', 'projectUuids', 'directories', 'rules', 'moduleUuids', 'tags', 'assignees', 'reporters', 'fileUuids', 'languages'], transform: { diff --git a/server/sonar-web/src/main/js/tests/e2e/tests/issues-page-spec.js b/server/sonar-web/src/main/js/tests/e2e/tests/issues-page-spec.js index 1fc62c032d6..7451e020a32 100644 --- a/server/sonar-web/src/main/js/tests/e2e/tests/issues-page-spec.js +++ b/server/sonar-web/src/main/js/tests/e2e/tests/issues-page-spec.js @@ -208,26 +208,26 @@ casper.test.begin(testName('File-Level Issues'), function (test) { }); -casper.test.begin(testName('Status Facet'), function (test) { +casper.test.begin(testName('Severity Facet'), function (test) { casper .start(lib.buildUrl('issues'), function () { lib.setDefaultViewport(); lib.mockRequest('/api/l10n/index', '{}'); lib.mockRequestFromFile('/api/issue_filters/app', 'app.json'); - lib.mockRequestFromFile('/api/issues/search', 'search-reopened.json', { data: { statuses: 'REOPENED' } }); + lib.mockRequestFromFile('/api/issues/search', 'search-reopened.json', { data: { severities: 'BLOCKER' } }); lib.mockRequestFromFile('/api/issues/search', 'search.json'); }) .then(function () { - casper.waitForSelector('.facet[data-value=REOPENED]', function () { - casper.click('.facet[data-value=REOPENED]'); + casper.waitForSelector('.facet[data-value=BLOCKER]', function () { + casper.click('.facet[data-value=BLOCKER]'); }); }) .then(function () { - lib.waitForElementCount('.issue', 4, function () { - test.assertElementCount('.issue .icon-status-reopened', 4); + casper.waitForSelectorTextChange('#issues-total', function () { + test.assertElementCount('.issue', 4); }); }) |