diff options
author | Stas Vilchik <vilchiks@gmail.com> | 2015-05-07 14:36:11 +0200 |
---|---|---|
committer | Stas Vilchik <vilchiks@gmail.com> | 2015-05-07 14:37:19 +0200 |
commit | f5919d8f7cc67d9a6163b4c78813b0951519dc9d (patch) | |
tree | 83c0b72410a762920abe00e78e60e3809d9682e2 /server/sonar-web/src/test | |
parent | 53d98ef624ba29f8437b44c6dd6e7e048f23c2cd (diff) | |
download | sonarqube-f5919d8f7cc67d9a6163b4c78813b0951519dc9d.tar.gz sonarqube-f5919d8f7cc67d9a6163b4c78813b0951519dc9d.zip |
SONAR-6416 migrate web to new tests WS
Diffstat (limited to 'server/sonar-web/src/test')
-rw-r--r-- | server/sonar-web/src/test/js/source-viewer-spec.js | 11 | ||||
-rw-r--r-- | server/sonar-web/src/test/json/source-viewer-spec/tests.json | 15 |
2 files changed, 14 insertions, 12 deletions
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 6b3afb95a92..17a361e915c 100644 --- a/server/sonar-web/src/test/js/source-viewer-spec.js +++ b/server/sonar-web/src/test/js/source-viewer-spec.js @@ -379,12 +379,9 @@ casper.test.begin(testName('Details', 'Tests'), 39, function (test) { lib.mockRequestFromFile('/api/metrics', 'metrics.json'); lib.mockRequestFromFile('/api/resources', 'measures-test.json', { data: { resource: 'org.codehaus.sonar:sonar-batch:src/main/java/org/sonar/batch/index/Cache.java' } }); - lib.mockRequestFromFile('/api/tests/show', 'tests.json', - { data: { key: 'org.codehaus.sonar:sonar-batch:src/main/java/org/sonar/batch/index/Cache.java' } }); - lib.mockRequestFromFile('/api/tests/covered_files', 'covered-files.json', { data: { - key: 'org.codehaus.sonar:sonar-batch:src/main/java/org/sonar/batch/index/Cache.java', - test: 'test1' - } }); + lib.mockRequestFromFile('/api/tests/list', 'tests.json', { data: { testFileUuid: 'uuid' } }); + lib.mockRequestFromFile('/api/tests/covered_files', 'covered-files.json', + { data: { testUuid: 'test-uuid-1' } }); }) .then(function () { @@ -469,7 +466,7 @@ casper.test.begin(testName('Details', 'Tests'), 39, function (test) { }) .then(function () { - casper.click('.js-show-test[data-name="test1"]'); + casper.click('.js-show-test[data-id="test-uuid-1"]'); casper.waitForText('src/main/java/com/sonar/CoveredFile1.java'); }) diff --git a/server/sonar-web/src/test/json/source-viewer-spec/tests.json b/server/sonar-web/src/test/json/source-viewer-spec/tests.json index 70720d645e3..af8f8177ac2 100644 --- a/server/sonar-web/src/test/json/source-viewer-spec/tests.json +++ b/server/sonar-web/src/test/json/source-viewer-spec/tests.json @@ -4,29 +4,34 @@ "name": "test1", "status": "OK", "durationInMs": 15, - "coveredLines": 2 + "coveredLines": 2, + "testUuid": "test-uuid-1" }, { "name": "test2", "status": "OK", "durationInMs": 13, - "coveredLines": 3 + "coveredLines": 3, + "testUuid": "test-uuid-2" }, { "name": "test3", "status": "FAILURE", "durationInMs": 14, - "coveredLines": 1 + "coveredLines": 1, + "testUuid": "test-uuid-3" }, { "name": "test4", "status": "ERROR", "durationInMs": 0, - "coveredLines": 0 + "coveredLines": 0, + "testUuid": "test-uuid-4" }, { "name": "test5", - "status": "SKIPPED" + "status": "SKIPPED", + "testUuid": "test-uuid-5" } ] } |