Support port paratemer in grunt

diff --git a/server/sonar-web/Gruntfile.coffee b/server/sonar-web/Gruntfile.coffee
index f694891b755c71607a344a8a3e918474650c03f8..ffdacbcb7157f333f9b70700762dbe621fb7e8f5 100644 (file)
--- 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 b91e405352d26cb9b56154d1b56a967cd8f20520..6cfaf0eca9fe26f197294db798d8521ed1fe2b0c 100644 (file)
--- 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;