summaryrefslogtreecommitdiffstats
path: root/server
diff options
context:
space:
mode:
authorStas Vilchik <vilchiks@gmail.com>2014-12-01 13:54:06 +0100
committerStas Vilchik <vilchiks@gmail.com>2014-12-01 13:54:14 +0100
commitcfc34cfd81ac5b6103d76b432021dee91e4b03d4 (patch)
tree911bf676a770b50cd0c0f35a54f683bc1490fd95 /server
parent29d4aa57e2301cd0822465bad3b458cbecbe61c5 (diff)
downloadsonarqube-cfc34cfd81ac5b6103d76b432021dee91e4b03d4.tar.gz
sonarqube-cfc34cfd81ac5b6103d76b432021dee91e4b03d4.zip
Support port paratemer in grunt
Diffstat (limited to 'server')
-rw-r--r--server/sonar-web/Gruntfile.coffee2
-rw-r--r--server/sonar-web/src/main/js/tests/e2e/lib.js5
2 files changed, 6 insertions, 1 deletions
diff --git a/server/sonar-web/Gruntfile.coffee b/server/sonar-web/Gruntfile.coffee
index f694891b755..ffdacbcb715 100644
--- a/server/sonar-web/Gruntfile.coffee
+++ b/server/sonar-web/Gruntfile.coffee
@@ -297,6 +297,7 @@ module.exports = (grunt) ->
test:
options:
script: '<%= pkg.sources %>js/tests/e2e/server.js'
+ port: '<%= grunt.option("port") %>'
dev:
options:
background: false
@@ -309,6 +310,7 @@ module.exports = (grunt) ->
test: true
'no-colors': true
concise: true
+ port: '<%= grunt.option("port") %>'
src: ['<%= pkg.sources %>js/tests/e2e/tests/**/issues-spec.js']
single:
options:
diff --git a/server/sonar-web/src/main/js/tests/e2e/lib.js b/server/sonar-web/src/main/js/tests/e2e/lib.js
index b91e405352d..6cfaf0eca9f 100644
--- a/server/sonar-web/src/main/js/tests/e2e/lib.js
+++ b/server/sonar-web/src/main/js/tests/e2e/lib.js
@@ -1,7 +1,10 @@
var fs = require('fs');
+var getPort = function () {
+ return casper.cli.options.port;
+};
-var BASE_URL = 'http://localhost:3000/pages/',
+var BASE_URL = 'http://localhost:' + getPort() + '/pages/',
WINDOW_WIDTH = 1200,
WINDOW_HEIGHT = 800;