From 1ad33ceca51ff8ab54809465d5b14cf0faaed46d Mon Sep 17 00:00:00 2001 From: Stas Vilchik Date: Fri, 25 Jul 2014 15:14:38 +0200 Subject: [PATCH] Add MTs of duplications in deleted files --- .../main/hbs/component-viewer/cw-source.hbs | 2 +- .../tests/e2e/tests/component-viewer-spec.js | 28 +++++++++++++++++++ .../duplications-in-deleted-files.json | 24 ++++++++++++++++ 3 files changed, 53 insertions(+), 1 deletion(-) create mode 100644 server/sonar-web/src/main/js/tests/e2e/tests/component-viewer-spec/duplications-in-deleted-files.json diff --git a/server/sonar-web/src/main/hbs/component-viewer/cw-source.hbs b/server/sonar-web/src/main/hbs/component-viewer/cw-source.hbs index 79c44c4460f..e8f68051bf9 100644 --- a/server/sonar-web/src/main/hbs/component-viewer/cw-source.hbs +++ b/server/sonar-web/src/main/hbs/component-viewer/cw-source.hbs @@ -5,7 +5,7 @@ {{else}} {{#if state.duplicationsInDeletedFiles}} -

{{t 'duplications.dups_found_on_deleted_resource'}}

+

{{t 'duplications.dups_found_on_deleted_resource'}}

{{/if}} {{#if issuesLimitReached}} diff --git a/server/sonar-web/src/main/js/tests/e2e/tests/component-viewer-spec.js b/server/sonar-web/src/main/js/tests/e2e/tests/component-viewer-spec.js index a04562aa1e3..d01f7992644 100644 --- a/server/sonar-web/src/main/js/tests/e2e/tests/component-viewer-spec.js +++ b/server/sonar-web/src/main/js/tests/e2e/tests/component-viewer-spec.js @@ -503,3 +503,31 @@ casper.test.begin(testName('Cross-Project Duplications'), function (test) { test.done(); }); }); + + +casper.test.begin(testName('Duplications in Deleted Files'), function (test) { + casper + .start(lib.buildUrl('component-viewer#component=component'), function () { + lib.setDefaultViewport(); + lib.mockRequest('/api/l10n/index', '{}'); + lib.mockRequestFromFile('/api/components/app', 'app.json'); + lib.mockRequestFromFile('/api/sources/show', 'source.json'); + lib.mockRequestFromFile('/api/resources', 'resources.json'); + lib.mockRequestFromFile('/api/duplications/show', 'duplications-in-deleted-files.json'); + }) + + .then(function () { + casper.waitForSelector('.component-viewer-source .row'); + }) + + .then(function () { + casper.click('.js-toggle-duplications'); + casper.waitForSelector('.duplication-exists', function () { + test.assertExists('.js-duplications-in-deleted-files'); + }); + }) + + .run(function () { + test.done(); + }); +}); diff --git a/server/sonar-web/src/main/js/tests/e2e/tests/component-viewer-spec/duplications-in-deleted-files.json b/server/sonar-web/src/main/js/tests/e2e/tests/component-viewer-spec/duplications-in-deleted-files.json new file mode 100644 index 00000000000..9de23d1ce7d --- /dev/null +++ b/server/sonar-web/src/main/js/tests/e2e/tests/component-viewer-spec/duplications-in-deleted-files.json @@ -0,0 +1,24 @@ +{"duplications": [ + { + "blocks": [ + { + "from": 404, + "size": 15, + "_ref": "1" + }, + { + "from": 455, + "size": 15 + } + ] + } +], "files": { + "1": { + "key": "org.codehaus.sonar:sonar-batch:src/main/java/org/sonar/batch/index/Cache.java", + "name": "src/main/java/org/sonar/batch/index/Cache.java", + "project": "org.codehaus.sonar:sonar", + "projectName": "SonarQube", + "subProject": "org.codehaus.sonar:sonar-batch", + "subProjectName": "SonarQube :: Batch" + } +}} -- 2.39.5