aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorStas Vilchik <vilchiks@gmail.com>2015-03-12 09:38:23 +0100
committerStas Vilchik <vilchiks@gmail.com>2015-03-12 09:38:23 +0100
commit0fb67328cd1cbf7fec2541089d7a89fff20c953d (patch)
treea68c3190ceeb48b84cd2394532400ac0096560dc
parentc32bc18cd69d37ee3714a4011938d7729c386ecc (diff)
downloadsonarqube-0fb67328cd1cbf7fec2541089d7a89fff20c953d.tar.gz
sonarqube-0fb67328cd1cbf7fec2541089d7a89fff20c953d.zip
enable parallel execution for tests with coverage, stabilize coverage reporting
-rw-r--r--server/sonar-web/Gruntfile.coffee1
-rw-r--r--server/sonar-web/src/test/lib.js4
2 files changed, 4 insertions, 1 deletions
diff --git a/server/sonar-web/Gruntfile.coffee b/server/sonar-web/Gruntfile.coffee
index 521c2140d90..2d86badbb5b 100644
--- a/server/sonar-web/Gruntfile.coffee
+++ b/server/sonar-web/Gruntfile.coffee
@@ -358,6 +358,7 @@ module.exports = (grunt) ->
'no-colors': true
'fail-fast': true
concise: true
+ parallel: true
port: expressPort
src: ['src/test/js/**/*.js']
testCoverageLight:
diff --git a/server/sonar-web/src/test/lib.js b/server/sonar-web/src/test/lib.js
index 82204cdacfe..c3f63b688ab 100644
--- a/server/sonar-web/src/test/lib.js
+++ b/server/sonar-web/src/test/lib.js
@@ -173,7 +173,9 @@ exports.sendCoverage = function () {
url: '/coverage/client',
data: JSON.stringify(window.__coverage__),
processData: false,
- contentType: 'application/json; charset=UTF-8'
+ contentType: 'application/json; charset=UTF-8',
+ async: false
});
});
+ casper.wait(500);
};