From c32bc18cd69d37ee3714a4011938d7729c386ecc Mon Sep 17 00:00:00 2001 From: Stas Vilchik Date: Wed, 11 Mar 2015 16:41:35 +0100 Subject: [PATCH] clean up tests --- ...coding-rules-page-active-severity-facet.js | 6 +++ .../js/coding-rules-page-available-since.js | 6 +++ .../js/coding-rules-page-inheritance-facet.js | 6 +++ ...ge-no-available-profiles-for-activation.js | 6 +++ ...coding-rules-page-quality-profile-facet.js | 6 +++ .../test/js/coding-rules-page-query-facet.js | 6 +++ ...g-rules-page-rule-should-have-permalink.js | 6 +++ ...ding-rules-page-should-activate-profile.js | 6 +++ ...g-rules-page-should-create-custom-rules.js | 6 +++ ...g-rules-page-should-create-manual-rules.js | 6 +++ ...g-rules-page-should-delete-custom-rules.js | 6 +++ ...g-rules-page-should-delete-manual-rules.js | 6 +++ ...ing-rules-page-should-show-custom-rules.js | 6 +++ ...rules-page-should-show-deprecated-label.js | 6 +++ .../coding-rules-page-should-show-details.js | 6 +++ ...oding-rules-page-should-show-empty-list.js | 6 +++ .../coding-rules-page-should-show-facets.js | 6 +++ ...ding-rules-page-should-show-rule-issues.js | 6 +++ .../js/coding-rules-page-should-show-rule.js | 6 +++ .../js/coding-rules-page-should-show-rules.js | 6 +++ server/sonar-web/src/test/js/design-spec.js | 12 ++++++ ...issues-page-should-open-issue-permalink.js | 6 +++ .../sonar-web/src/test/js/issues-page-spec.js | 42 +++++++++++++++++++ .../src/test/js/quality-gates-spec.js | 6 +++ .../src/test/js/source-viewer-coverage.js | 6 +++ .../js/source-viewer-create-manual-issue.js | 6 +++ .../src/test/js/source-viewer-duplications.js | 6 +++ .../test/js/source-viewer-favorite-spec.js | 12 ++++++ .../src/test/js/source-viewer-scm.js | 6 +++ ...should-not-show-source-if-no-permission.js | 7 +++- .../src/test/js/source-viewer-spec.js | 18 ++++++++ .../src/test/views/coding-rules.jade | 5 --- server/sonar-web/src/test/views/design.jade | 5 --- .../src/test/views/issue-filter-widget.jade | 5 --- server/sonar-web/src/test/views/issues.jade | 5 --- .../src/test/views/layouts/main.jade | 9 ++-- .../src/test/views/quality-gates.jade | 5 --- .../src/test/views/source-viewer.jade | 5 --- 38 files changed, 251 insertions(+), 35 deletions(-) diff --git a/server/sonar-web/src/test/js/coding-rules-page-active-severity-facet.js b/server/sonar-web/src/test/js/coding-rules-page-active-severity-facet.js index dedfcfb425d..ab4eef067b0 100644 --- a/server/sonar-web/src/test/js/coding-rules-page-active-severity-facet.js +++ b/server/sonar-web/src/test/js/coding-rules-page-active-severity-facet.js @@ -39,6 +39,12 @@ casper.test.begin('coding-rules-page-active-severity-facet', 7, function (test) lib.mockRequestFromFile('/api/rules/search', 'search.json'); }) + .then(function () { + casper.evaluate(function () { + require(['/js/coding-rules/app.js']); + }); + }) + .then(function () { casper.waitForSelector('.coding-rule'); }) diff --git a/server/sonar-web/src/test/js/coding-rules-page-available-since.js b/server/sonar-web/src/test/js/coding-rules-page-available-since.js index 1937b61efc1..9457b01a4d8 100644 --- a/server/sonar-web/src/test/js/coding-rules-page-available-since.js +++ b/server/sonar-web/src/test/js/coding-rules-page-available-since.js @@ -38,6 +38,12 @@ casper.test.begin('coding-rules-page-available-since', 2, function (test) { lib.mockRequestFromFile('/api/rules/search', 'search.json'); }) + .then(function () { + casper.evaluate(function () { + require(['/js/coding-rules/app.js']); + }); + }) + .then(function () { casper.waitForSelector('.coding-rule'); }) diff --git a/server/sonar-web/src/test/js/coding-rules-page-inheritance-facet.js b/server/sonar-web/src/test/js/coding-rules-page-inheritance-facet.js index 3b0375a7cf8..c8c03e2d001 100644 --- a/server/sonar-web/src/test/js/coding-rules-page-inheritance-facet.js +++ b/server/sonar-web/src/test/js/coding-rules-page-inheritance-facet.js @@ -43,6 +43,12 @@ casper.test.begin('coding-rules-page-inheritance-facet', 11, function (test) { lib.mockRequestFromFile('/api/rules/search', 'search.json'); }) + .then(function () { + casper.evaluate(function () { + require(['/js/coding-rules/app.js']); + }); + }) + .then(function () { casper.waitForSelector('.coding-rule'); }) diff --git a/server/sonar-web/src/test/js/coding-rules-page-no-available-profiles-for-activation.js b/server/sonar-web/src/test/js/coding-rules-page-no-available-profiles-for-activation.js index 2a7b84ab6bd..9dce234cda6 100644 --- a/server/sonar-web/src/test/js/coding-rules-page-no-available-profiles-for-activation.js +++ b/server/sonar-web/src/test/js/coding-rules-page-no-available-profiles-for-activation.js @@ -38,6 +38,12 @@ casper.test.begin('coding-rules-page-no-available-profiles-for-activation', 2, f lib.mockRequest('/api/issues/search', '{}'); }) + .then(function () { + casper.evaluate(function () { + require(['/js/coding-rules/app.js']); + }); + }) + .then(function () { casper.waitForSelector('.coding-rule.selected', function () { casper.click('.coding-rule.selected .js-rule'); diff --git a/server/sonar-web/src/test/js/coding-rules-page-quality-profile-facet.js b/server/sonar-web/src/test/js/coding-rules-page-quality-profile-facet.js index f3cb4c893da..1abe773522f 100644 --- a/server/sonar-web/src/test/js/coding-rules-page-quality-profile-facet.js +++ b/server/sonar-web/src/test/js/coding-rules-page-quality-profile-facet.js @@ -40,6 +40,12 @@ casper.test.begin('coding-rules-page-quality-profile-facet', 6, function (test) lib.mockRequestFromFile('/api/rules/search', 'search.json'); }) + .then(function () { + casper.evaluate(function () { + require(['/js/coding-rules/app.js']); + }); + }) + .then(function () { casper.waitForSelector('.coding-rule'); }) diff --git a/server/sonar-web/src/test/js/coding-rules-page-query-facet.js b/server/sonar-web/src/test/js/coding-rules-page-query-facet.js index ac99d92b38b..de0f78b9b31 100644 --- a/server/sonar-web/src/test/js/coding-rules-page-query-facet.js +++ b/server/sonar-web/src/test/js/coding-rules-page-query-facet.js @@ -37,6 +37,12 @@ casper.test.begin('coding-rules-page-query-facet', 3, function (test) { lib.mockRequestFromFile('/api/rules/search', 'search.json'); }) + .then(function () { + casper.evaluate(function () { + require(['/js/coding-rules/app.js']); + }); + }) + .then(function () { casper.waitForSelector('.coding-rule'); }) diff --git a/server/sonar-web/src/test/js/coding-rules-page-rule-should-have-permalink.js b/server/sonar-web/src/test/js/coding-rules-page-rule-should-have-permalink.js index 053050f5414..5f09d634260 100644 --- a/server/sonar-web/src/test/js/coding-rules-page-rule-should-have-permalink.js +++ b/server/sonar-web/src/test/js/coding-rules-page-rule-should-have-permalink.js @@ -38,6 +38,12 @@ casper.test.begin('coding-rules-page-rule-permalink', 1, function (test) { lib.mockRequest('/api/issues/search', '{}'); }) + .then(function () { + casper.evaluate(function () { + require(['/js/coding-rules/app.js']); + }); + }) + .then(function () { casper.waitForSelector('.coding-rule.selected'); }) diff --git a/server/sonar-web/src/test/js/coding-rules-page-should-activate-profile.js b/server/sonar-web/src/test/js/coding-rules-page-should-activate-profile.js index 7366ff7353b..05883c4974b 100644 --- a/server/sonar-web/src/test/js/coding-rules-page-should-activate-profile.js +++ b/server/sonar-web/src/test/js/coding-rules-page-should-activate-profile.js @@ -39,6 +39,12 @@ casper.test.begin('coding-rules-page-should-activate-profile', 5, function (test lib.mockRequest('/api/issues/search', '{}'); }) + .then(function () { + casper.evaluate(function () { + require(['/js/coding-rules/app.js']); + }); + }) + .then(function () { casper.waitForSelector('.coding-rule.selected', function () { casper.click('.coding-rule.selected .js-rule'); diff --git a/server/sonar-web/src/test/js/coding-rules-page-should-create-custom-rules.js b/server/sonar-web/src/test/js/coding-rules-page-should-create-custom-rules.js index 7bd701ed79d..57ace3f2892 100644 --- a/server/sonar-web/src/test/js/coding-rules-page-should-create-custom-rules.js +++ b/server/sonar-web/src/test/js/coding-rules-page-should-create-custom-rules.js @@ -41,6 +41,12 @@ casper.test.begin('coding-rules-page-should-delete-create-rules', 2, function (t lib.mockRequest('/api/issues/search', '{}'); }) + .then(function () { + casper.evaluate(function () { + require(['/js/coding-rules/app.js']); + }); + }) + .then(function () { casper.waitForSelector('.coding-rule.selected', function () { casper.click('.coding-rule.selected .js-rule'); diff --git a/server/sonar-web/src/test/js/coding-rules-page-should-create-manual-rules.js b/server/sonar-web/src/test/js/coding-rules-page-should-create-manual-rules.js index 59ccd2ea739..eb7c7e97fe7 100644 --- a/server/sonar-web/src/test/js/coding-rules-page-should-create-manual-rules.js +++ b/server/sonar-web/src/test/js/coding-rules-page-should-create-manual-rules.js @@ -39,6 +39,12 @@ casper.test.begin('coding-rules-page-should-delete-manual-rules', 3, function (t lib.mockRequest('/api/issues/search', '{}'); }) + .then(function () { + casper.evaluate(function () { + require(['/js/coding-rules/app.js']); + }); + }) + .then(function () { casper.waitForSelector('.js-create-manual-rule', function () { casper.click('.js-create-manual-rule'); diff --git a/server/sonar-web/src/test/js/coding-rules-page-should-delete-custom-rules.js b/server/sonar-web/src/test/js/coding-rules-page-should-delete-custom-rules.js index af6e27d8c3f..0b2e3c94f7a 100644 --- a/server/sonar-web/src/test/js/coding-rules-page-should-delete-custom-rules.js +++ b/server/sonar-web/src/test/js/coding-rules-page-should-delete-custom-rules.js @@ -41,6 +41,12 @@ casper.test.begin('coding-rules-page-should-delete-custom-rules', 2, function (t lib.mockRequest('/api/issues/search', '{}'); }) + .then(function () { + casper.evaluate(function () { + require(['/js/coding-rules/app.js']); + }); + }) + .then(function () { casper.waitForSelector('.coding-rule.selected', function () { casper.click('.coding-rule.selected .js-rule'); diff --git a/server/sonar-web/src/test/js/coding-rules-page-should-delete-manual-rules.js b/server/sonar-web/src/test/js/coding-rules-page-should-delete-manual-rules.js index 0202f2336c5..6bff769883d 100644 --- a/server/sonar-web/src/test/js/coding-rules-page-should-delete-manual-rules.js +++ b/server/sonar-web/src/test/js/coding-rules-page-should-delete-manual-rules.js @@ -39,6 +39,12 @@ casper.test.begin('coding-rules-page-should-delete-manual-rules', 1, function (t lib.mockRequest('/api/issues/search', '{}'); }) + .then(function () { + casper.evaluate(function () { + require(['/js/coding-rules/app.js']); + }); + }) + .then(function () { casper.waitForSelector('.coding-rule.selected', function () { casper.click('.coding-rule.selected .js-rule'); diff --git a/server/sonar-web/src/test/js/coding-rules-page-should-show-custom-rules.js b/server/sonar-web/src/test/js/coding-rules-page-should-show-custom-rules.js index b27a269582c..6e5648a4749 100644 --- a/server/sonar-web/src/test/js/coding-rules-page-should-show-custom-rules.js +++ b/server/sonar-web/src/test/js/coding-rules-page-should-show-custom-rules.js @@ -40,6 +40,12 @@ casper.test.begin('coding-rules-page-should-show-custom-rules', 3, function (tes lib.mockRequest('/api/issues/search', '{}'); }) + .then(function () { + casper.evaluate(function () { + require(['/js/coding-rules/app.js']); + }); + }) + .then(function () { casper.waitForSelector('.coding-rule.selected', function () { casper.click('.coding-rule.selected .js-rule'); diff --git a/server/sonar-web/src/test/js/coding-rules-page-should-show-deprecated-label.js b/server/sonar-web/src/test/js/coding-rules-page-should-show-deprecated-label.js index 8bc7238a938..7fa5d1ad3aa 100644 --- a/server/sonar-web/src/test/js/coding-rules-page-should-show-deprecated-label.js +++ b/server/sonar-web/src/test/js/coding-rules-page-should-show-deprecated-label.js @@ -36,6 +36,12 @@ casper.test.begin('coding-rules-page-should-show-deprecated-label', 1, function lib.mockRequestFromFile('/api/rules/search', 'search.json'); }) + .then(function () { + casper.evaluate(function () { + require(['/js/coding-rules/app.js']); + }); + }) + .then(function () { casper.waitForSelector('.coding-rule.selected'); }) diff --git a/server/sonar-web/src/test/js/coding-rules-page-should-show-details.js b/server/sonar-web/src/test/js/coding-rules-page-should-show-details.js index 482f230d07d..7d6b1044400 100644 --- a/server/sonar-web/src/test/js/coding-rules-page-should-show-details.js +++ b/server/sonar-web/src/test/js/coding-rules-page-should-show-details.js @@ -38,6 +38,12 @@ casper.test.begin('coding-rules-page-should-show-details', 20, function (test) { lib.mockRequest('/api/issues/search', '{}'); }) + .then(function () { + casper.evaluate(function () { + require(['/js/coding-rules/app.js']); + }); + }) + .then(function () { casper.waitForSelector('.coding-rule.selected', function () { casper.click('.coding-rule.selected .js-rule'); diff --git a/server/sonar-web/src/test/js/coding-rules-page-should-show-empty-list.js b/server/sonar-web/src/test/js/coding-rules-page-should-show-empty-list.js index 1ce3e5bcce2..aee19e7d61e 100644 --- a/server/sonar-web/src/test/js/coding-rules-page-should-show-empty-list.js +++ b/server/sonar-web/src/test/js/coding-rules-page-should-show-empty-list.js @@ -36,6 +36,12 @@ casper.test.begin('coding-rules-page-should-show-empty-list', 3, function (test) lib.mockRequestFromFile('/api/rules/search', 'search.json'); }) + .then(function () { + casper.evaluate(function () { + require(['/js/coding-rules/app.js']); + }); + }) + .then(function () { casper.waitForSelector('.search-navigator-facet-box'); }) diff --git a/server/sonar-web/src/test/js/coding-rules-page-should-show-facets.js b/server/sonar-web/src/test/js/coding-rules-page-should-show-facets.js index 9d6107e7256..105ae4edeec 100644 --- a/server/sonar-web/src/test/js/coding-rules-page-should-show-facets.js +++ b/server/sonar-web/src/test/js/coding-rules-page-should-show-facets.js @@ -36,6 +36,12 @@ casper.test.begin('coding-rules-page-should-show-facets', 1, function (test) { lib.mockRequestFromFile('/api/rules/search', 'search.json'); }) + .then(function () { + casper.evaluate(function () { + require(['/js/coding-rules/app.js']); + }); + }) + .then(function () { casper.waitForSelector('.search-navigator-facet-box'); }) diff --git a/server/sonar-web/src/test/js/coding-rules-page-should-show-rule-issues.js b/server/sonar-web/src/test/js/coding-rules-page-should-show-rule-issues.js index ade1fda3193..cb370329372 100644 --- a/server/sonar-web/src/test/js/coding-rules-page-should-show-rule-issues.js +++ b/server/sonar-web/src/test/js/coding-rules-page-should-show-rule-issues.js @@ -38,6 +38,12 @@ casper.test.begin('coding-rules-page-should-show-rule-issues', 5, function (test lib.mockRequestFromFile('/api/issues/search', 'issues-search.json'); }) + .then(function () { + casper.evaluate(function () { + require(['/js/coding-rules/app.js']); + }); + }) + .then(function () { casper.waitForSelector('.coding-rule.selected', function () { casper.click('.coding-rule.selected .js-rule'); diff --git a/server/sonar-web/src/test/js/coding-rules-page-should-show-rule.js b/server/sonar-web/src/test/js/coding-rules-page-should-show-rule.js index 651f5fb8249..9a2f36edc33 100644 --- a/server/sonar-web/src/test/js/coding-rules-page-should-show-rule.js +++ b/server/sonar-web/src/test/js/coding-rules-page-should-show-rule.js @@ -36,6 +36,12 @@ casper.test.begin('coding-rules-page-should-show-rule', 7, function (test) { lib.mockRequestFromFile('/api/rules/search', 'search.json'); }) + .then(function () { + casper.evaluate(function () { + require(['/js/coding-rules/app.js']); + }); + }) + .then(function () { casper.waitForSelector('.coding-rule.selected'); }) diff --git a/server/sonar-web/src/test/js/coding-rules-page-should-show-rules.js b/server/sonar-web/src/test/js/coding-rules-page-should-show-rules.js index 29ff240cd47..b4935930133 100644 --- a/server/sonar-web/src/test/js/coding-rules-page-should-show-rules.js +++ b/server/sonar-web/src/test/js/coding-rules-page-should-show-rules.js @@ -36,6 +36,12 @@ casper.test.begin('coding-rules-page-should-show-rules', 4, function (test) { lib.mockRequestFromFile('/api/rules/search', 'search.json'); }) + .then(function () { + casper.evaluate(function () { + require(['/js/coding-rules/app.js']); + }); + }) + .then(function () { casper.waitForSelector('.coding-rule'); }) diff --git a/server/sonar-web/src/test/js/design-spec.js b/server/sonar-web/src/test/js/design-spec.js index 2b5ac8a33f7..4d9e183062d 100644 --- a/server/sonar-web/src/test/js/design-spec.js +++ b/server/sonar-web/src/test/js/design-spec.js @@ -35,6 +35,12 @@ casper.test.begin(testName('Base'), 9, function (test) { lib.mockRequestFromFile('/api/dependencies', 'dependencies.json'); }) + .then(function () { + casper.evaluate(function () { + require(['/js/design/app.js']); + }); + }) + .then(function () { casper.waitWhileSelector('.spinner'); }) @@ -80,6 +86,12 @@ casper.test.begin(testName('Highlight'), 13, function (test) { lib.mockRequestFromFile('/api/dependencies', 'dependencies.json'); }) + .then(function () { + casper.evaluate(function () { + require(['/js/design/app.js']); + }); + }) + .then(function () { casper.waitWhileSelector('.spinner'); }) diff --git a/server/sonar-web/src/test/js/issues-page-should-open-issue-permalink.js b/server/sonar-web/src/test/js/issues-page-should-open-issue-permalink.js index c7441f27507..b8983274ffc 100644 --- a/server/sonar-web/src/test/js/issues-page-should-open-issue-permalink.js +++ b/server/sonar-web/src/test/js/issues-page-should-open-issue-permalink.js @@ -43,6 +43,12 @@ casper.test.begin('issues-page-should-open-issue-permalink', 3, function (test) lib.mockRequestFromFile('/api/sources/lines', 'lines.json'); }) + .then(function () { + casper.evaluate(function () { + require(['/js/issues/app-new.js']); + }); + }) + .then(function () { casper.waitForSelector('.source-line', function () { test.assertSelectorContains('.source-viewer', 'public void executeOn(Project project, SensorContext context'); diff --git a/server/sonar-web/src/test/js/issues-page-spec.js b/server/sonar-web/src/test/js/issues-page-spec.js index 4336855542c..5aca02d5ad5 100644 --- a/server/sonar-web/src/test/js/issues-page-spec.js +++ b/server/sonar-web/src/test/js/issues-page-spec.js @@ -38,6 +38,12 @@ casper.test.begin(testName('Base'), function (test) { lib.mockRequestFromFile('/api/issues/search', 'search.json'); }) + .then(function () { + casper.evaluate(function () { + require(['/js/issues/app-new.js']); + }); + }) + .then(function () { casper.waitForSelector('.facet[data-value=BLOCKER]', function () { // Facets @@ -96,6 +102,12 @@ casper.test.begin(testName('Issue Box', 'Check Elements'), function (test) { lib.mockRequestFromFile('/api/issues/search', 'search.json'); }) + .then(function () { + casper.evaluate(function () { + require(['/js/issues/app-new.js']); + }); + }) + .then(function () { casper.waitForSelector('.issue.selected'); }) @@ -140,6 +152,12 @@ casper.test.begin(testName('Issue Box', 'Tags'), function (test) { lib.mockRequestFromFile('/api/issues/set_tags', 'tags-modified.json'); }) + .then(function () { + casper.evaluate(function () { + require(['/js/issues/app-new.js']); + }); + }) + .then(function () { casper.waitForSelector('.issue.selected .js-issue-tags'); }) @@ -185,6 +203,12 @@ casper.test.begin(testName('Issue Box', 'Transitions'), function (test) { lib.mockRequest('/api/issues/do_transition', '{}'); }) + .then(function () { + casper.evaluate(function () { + require(['/js/issues/app-new.js']); + }); + }) + .then(function () { casper.waitForSelector('.issue.selected .js-issue-transition'); }) @@ -225,6 +249,12 @@ casper.test.begin(testName('File-Level Issues'), function (test) { lib.mockRequestFromFile('/api/sources/lines', 'file-level/lines.json'); }) + .then(function () { + casper.evaluate(function () { + require(['/js/issues/app-new.js']); + }); + }) + .then(function () { casper.waitForSelector(issueSelector, function () { casper.click(issueSelector + ' .js-issue-navigate'); @@ -258,6 +288,12 @@ casper.test.begin(testName('Severity Facet'), function (test) { lib.mockRequestFromFile('/api/issues/search', 'search.json'); }) + .then(function () { + casper.evaluate(function () { + require(['/js/issues/app-new.js']); + }); + }) + .then(function () { casper.waitForSelector('.facet[data-value=BLOCKER]', function () { casper.click('.facet[data-value=BLOCKER]'); @@ -292,6 +328,12 @@ casper.test.begin(testName('Bulk Change'), function (test) { '
bulk change form
', { contentType: 'text/plain' }); }) + .then(function () { + casper.evaluate(function () { + require(['/js/issues/app-new.js']); + }); + }) + .then(function () { casper.waitForSelector('.issue', function () { casper.waitForSelector('#issues-bulk-change'); diff --git a/server/sonar-web/src/test/js/quality-gates-spec.js b/server/sonar-web/src/test/js/quality-gates-spec.js index a16eaaec80f..dc3c644d008 100644 --- a/server/sonar-web/src/test/js/quality-gates-spec.js +++ b/server/sonar-web/src/test/js/quality-gates-spec.js @@ -37,6 +37,12 @@ casper.test.begin('Quality Gates', function suite (test) { lib.mockRequestFromFile('/api/qualitygates/show?id=1', 'show.json'); }) + .then(function () { + casper.evaluate(function () { + require(['/js/quality-gate/app.js']); + }); + }) + .then(function () { casper.waitForSelector('.active', function () { test.assertElementCount('.active', 1); diff --git a/server/sonar-web/src/test/js/source-viewer-coverage.js b/server/sonar-web/src/test/js/source-viewer-coverage.js index 3e5ad079989..521ecdccdad 100644 --- a/server/sonar-web/src/test/js/source-viewer-coverage.js +++ b/server/sonar-web/src/test/js/source-viewer-coverage.js @@ -40,6 +40,12 @@ casper.test.begin(testName('Coverage'), 4, function (test) { lib.mockRequestFromFile('/api/tests/test_cases', 'test-cases.json'); }) + .then(function () { + casper.evaluate(function () { + require(['/js/source-viewer/app.js']); + }); + }) + .then(function () { casper.waitForSelector('.source-line'); }) diff --git a/server/sonar-web/src/test/js/source-viewer-create-manual-issue.js b/server/sonar-web/src/test/js/source-viewer-create-manual-issue.js index 985c2c18ba3..554af8b9268 100644 --- a/server/sonar-web/src/test/js/source-viewer-create-manual-issue.js +++ b/server/sonar-web/src/test/js/source-viewer-create-manual-issue.js @@ -41,6 +41,12 @@ casper.test.begin(testName('source-viewer-create-manual-issue'), function (test) lib.mockRequestFromFile('/api/rules/search*', 'api-rules-search.json'); }) + .then(function () { + casper.evaluate(function () { + require(['/js/source-viewer/app.js']); + }); + }) + .then(function () { casper.waitForSelector('.source-line-number[data-line-number="3"]'); }) diff --git a/server/sonar-web/src/test/js/source-viewer-duplications.js b/server/sonar-web/src/test/js/source-viewer-duplications.js index 5acf7e5ab7c..c0046e3bc40 100644 --- a/server/sonar-web/src/test/js/source-viewer-duplications.js +++ b/server/sonar-web/src/test/js/source-viewer-duplications.js @@ -40,6 +40,12 @@ casper.test.begin(testName('Duplications'), 4, function (test) { lib.mockRequestFromFile('/api/duplications/show', 'duplications.json'); }) + .then(function () { + casper.evaluate(function () { + require(['/js/source-viewer/app.js']); + }); + }) + .then(function () { casper.waitForSelector('.source-line'); }) diff --git a/server/sonar-web/src/test/js/source-viewer-favorite-spec.js b/server/sonar-web/src/test/js/source-viewer-favorite-spec.js index c215986ee80..50f1cb8f9db 100644 --- a/server/sonar-web/src/test/js/source-viewer-favorite-spec.js +++ b/server/sonar-web/src/test/js/source-viewer-favorite-spec.js @@ -39,6 +39,12 @@ casper.test.begin(testName('Mark as Favorite'), function (test) { lib.mockRequestFromFile('/api/issues/search', 'issues.json'); }) + .then(function () { + casper.evaluate(function () { + require(['/js/source-viewer/app.js']); + }); + }) + .then(function () { casper.waitForSelector('.source-line'); }) @@ -76,6 +82,12 @@ casper.test.begin(testName('Don\'t Show Favorite If Not Logged In'), function (t lib.mockRequestFromFile('/api/issues/search', 'issues.json'); }) + .then(function () { + casper.evaluate(function () { + require(['/js/source-viewer/app.js']); + }); + }) + .then(function () { casper.waitForSelector('.source-line'); }) diff --git a/server/sonar-web/src/test/js/source-viewer-scm.js b/server/sonar-web/src/test/js/source-viewer-scm.js index 1bfd21d8ea5..0351687707a 100644 --- a/server/sonar-web/src/test/js/source-viewer-scm.js +++ b/server/sonar-web/src/test/js/source-viewer-scm.js @@ -39,6 +39,12 @@ casper.test.begin(testName('SCM'), 4, function (test) { lib.mockRequestFromFile('/api/issues/search', 'issues.json'); }) + .then(function () { + casper.evaluate(function () { + require(['/js/source-viewer/app.js']); + }); + }) + .then(function () { casper.waitForSelector('.source-line'); }) diff --git a/server/sonar-web/src/test/js/source-viewer-should-not-show-source-if-no-permission.js b/server/sonar-web/src/test/js/source-viewer-should-not-show-source-if-no-permission.js index d9969be5b86..5cbec7ccd41 100644 --- a/server/sonar-web/src/test/js/source-viewer-should-not-show-source-if-no-permission.js +++ b/server/sonar-web/src/test/js/source-viewer-should-not-show-source-if-no-permission.js @@ -39,7 +39,12 @@ casper.test.begin(testName('source-viewer-should-not-show-source-if-no-permissio }) .then(function () { - lib.capture(); + casper.evaluate(function () { + require(['/js/source-viewer/app.js']); + }); + }) + + .then(function () { casper.waitForSelector('.alert', function () { test.assertDoesntExist('.source-line'); }); 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 813df75f2a5..b7aa2ac70ee 100644 --- a/server/sonar-web/src/test/js/source-viewer-spec.js +++ b/server/sonar-web/src/test/js/source-viewer-spec.js @@ -39,6 +39,12 @@ casper.test.begin(testName('Base'), function (test) { lib.mockRequestFromFile('/api/issues/search', 'issues.json'); }) + .then(function () { + casper.evaluate(function () { + require(['/js/source-viewer/app.js']); + }); + }) + .then(function () { casper.waitForSelector('.source-line', function () { // Check header elements @@ -86,6 +92,12 @@ casper.test.begin(testName('Decoration'), function (test) { lib.mockRequestFromFile('/api/issues/search', 'issues.json'); }) + .then(function () { + casper.evaluate(function () { + require(['/js/source-viewer/app.js']); + }); + }) + .then(function () { casper.waitForSelector('.source-line'); }) @@ -135,6 +147,12 @@ casper.test.begin(testName('Test File'), function (test) { lib.mockRequestFromFile('/api/issues/search', 'issues.json'); }) + .then(function () { + casper.evaluate(function () { + require(['/js/source-viewer/app.js']); + }); + }) + .then(function () { casper.waitForSelector('.source-line'); }) diff --git a/server/sonar-web/src/test/views/coding-rules.jade b/server/sonar-web/src/test/views/coding-rules.jade index 02062bfc100..75455be2861 100644 --- a/server/sonar-web/src/test/views/coding-rules.jade +++ b/server/sonar-web/src/test/views/coding-rules.jade @@ -1,10 +1,5 @@ extends layouts/main -block header - script(src='/js/require.js') - script. - window.waitForMocks('/js/coding-rules/app.js'); - block body #content .coding-rules.search-navigator diff --git a/server/sonar-web/src/test/views/design.jade b/server/sonar-web/src/test/views/design.jade index 13c7c45efa0..76cd2a95f22 100644 --- a/server/sonar-web/src/test/views/design.jade +++ b/server/sonar-web/src/test/views/design.jade @@ -1,10 +1,5 @@ extends layouts/main -block header - script(src='/js/require.js') - script. - window.waitForMocks('/js/design/app.js'); - block body #container #project-design: i.spinner diff --git a/server/sonar-web/src/test/views/issue-filter-widget.jade b/server/sonar-web/src/test/views/issue-filter-widget.jade index 0d0764f0916..d0097d07a9d 100644 --- a/server/sonar-web/src/test/views/issue-filter-widget.jade +++ b/server/sonar-web/src/test/views/issue-filter-widget.jade @@ -1,9 +1,4 @@ extends layouts/main -block header - script(src='/js/require.js') - script. - requirejs.config({ baseUrl: '/js' }); - block body #issue-filter-widget diff --git a/server/sonar-web/src/test/views/issues.jade b/server/sonar-web/src/test/views/issues.jade index 8eff10f583b..12868009181 100644 --- a/server/sonar-web/src/test/views/issues.jade +++ b/server/sonar-web/src/test/views/issues.jade @@ -1,10 +1,5 @@ extends layouts/main -block header - script(src='/js/require.js') - script. - window.waitForMocks('/js/issues/app-new.js'); - block body #content .issues.search-navigator diff --git a/server/sonar-web/src/test/views/layouts/main.jade b/server/sonar-web/src/test/views/layouts/main.jade index 18625078a99..414392be48f 100644 --- a/server/sonar-web/src/test/views/layouts/main.jade +++ b/server/sonar-web/src/test/views/layouts/main.jade @@ -45,6 +45,10 @@ html script(src='/js/dashboard.js') script(src='/js/recent-history.js') + script(src='/js/require.js') + script. + requirejs.config({ baseUrl: '/js' }); + script(src='/js/third-party/jquery.mockjax.js') script. var baseUrl = ''; @@ -52,10 +56,7 @@ html window.suppressTranslationWarnings = true; jQuery.mockjaxSettings.contentType = 'text/json'; jQuery.mockjaxSettings.responseTime = 50; - $j(document).ready(function () { $j('.open-modal').modal(); }); - window.waitForMocks = function (app) { - require([app]); - }; + jQuery(document).ready(function () { $j('.open-modal').modal(); }); block header body #body diff --git a/server/sonar-web/src/test/views/quality-gates.jade b/server/sonar-web/src/test/views/quality-gates.jade index 7d09851240c..c7cbf2c021a 100644 --- a/server/sonar-web/src/test/views/quality-gates.jade +++ b/server/sonar-web/src/test/views/quality-gates.jade @@ -1,10 +1,5 @@ extends layouts/main -block header - script(src='/js/require.js') - script. - window.waitForMocks('/js/quality-gate/app.js'); - block body #content .search-navigator#quality-gates diff --git a/server/sonar-web/src/test/views/source-viewer.jade b/server/sonar-web/src/test/views/source-viewer.jade index 6882c48c816..5680a36a32b 100644 --- a/server/sonar-web/src/test/views/source-viewer.jade +++ b/server/sonar-web/src/test/views/source-viewer.jade @@ -1,10 +1,5 @@ extends layouts/main -block header - script(src='/js/require.js') - script. - window.waitForMocks('/js/source-viewer/app.js'); - block body #source-viewer -- 2.39.5