diff options
| author | Stas Vilchik <vilchiks@gmail.com> | 2014-07-23 14:03:42 +0200 |
|---|---|---|
| committer | Stas Vilchik <vilchiks@gmail.com> | 2014-07-23 14:03:42 +0200 |
| commit | 2a2294d055cc7f7cebb6f3f2138cd0637a646576 (patch) | |
| tree | 10bf56ee0abfd8a2e6c90235c81fe488da5f5f9e /sonar-server/src/test | |
| parent | 3017f1dd753af8baa461cc9901f9d5a737a28946 (diff) | |
| parent | 4d828a37de90b1664855ab601836fbc931370102 (diff) | |
| download | sonarqube-2a2294d055cc7f7cebb6f3f2138cd0637a646576.tar.gz sonarqube-2a2294d055cc7f7cebb6f3f2138cd0637a646576.zip | |
Merge remote-tracking branch 'origin/branch-4.4'
Conflicts:
sonar-server/src/main/coffee/component-viewer/header/scm-header.coffee
sonar-server/src/main/coffee/component-viewer/main.coffee
Diffstat (limited to 'sonar-server/src/test')
| -rw-r--r-- | sonar-server/src/test/resources/org/sonar/server/test/ws/TestsShowActionTest/show_from_test_data_with_a_time_in_float.json | 9 |
1 files changed, 9 insertions, 0 deletions
diff --git a/sonar-server/src/test/resources/org/sonar/server/test/ws/TestsShowActionTest/show_from_test_data_with_a_time_in_float.json b/sonar-server/src/test/resources/org/sonar/server/test/ws/TestsShowActionTest/show_from_test_data_with_a_time_in_float.json new file mode 100644 index 00000000000..3f45bdbbe10 --- /dev/null +++ b/sonar-server/src/test/resources/org/sonar/server/test/ws/TestsShowActionTest/show_from_test_data_with_a_time_in_float.json @@ -0,0 +1,9 @@ +{ + "tests": [ + { + "name": "test1", + "status": "OK", + "durationInMs": 12 + } + ] +} |