From 0135ea6f8629714b46ef5a29a40e7dddf1f1b697 Mon Sep 17 00:00:00 2001 From: ddm Date: Mon, 30 Dec 2013 14:46:59 +0100 Subject: [PATCH] [FIX] Better OE url for UI tests bzr revid: ddm@openerp.com-20131230134659-2ky4zyw0q2i96g6y --- .../website/tests/ui_suite/ui_test_runner.js | 19 ++++++++++++------- 1 file changed, 12 insertions(+), 7 deletions(-) diff --git a/addons/website/tests/ui_suite/ui_test_runner.js b/addons/website/tests/ui_suite/ui_test_runner.js index 3391899e83f..a4a710fc81e 100644 --- a/addons/website/tests/ui_suite/ui_test_runner.js +++ b/addons/website/tests/ui_suite/ui_test_runner.js @@ -25,13 +25,18 @@ function run (test) { var host = options.host ? options.host : 'localhost'; var port = options.port ? ':'+options.port : ''; var path = options.path ? options.path : '/web'; - var params = [ 'mod=*' ]; - if (options.action) params.push('action='+options.action); - if (options.db) params.push('source='+options.db); - if (options.user) params.push('login='+options.user); - if (options.admin_password) params.push('password='+options.admin_password); - if (options.db_password) params.push('supadmin='+options.db_password); - var url = scheme+host+port+path+'#'+params.join('&'); + + var queryParams = []; + if (options.db) queryParams.push('db='+options.db); + var query = queryParams.length > 0 ? '?'+queryParams.join('&') : ''; + + var hashParams = []; + if (options.user) hashParams.push('login='+options.user); + if (options.admin_password) hashParams.push('password='+options.admin_password); + if (options.action) hashParams.push('action='+options.action); + var hash = hashParams.length > 0 ? '#'+hashParams.join('&') : ''; + + var url = scheme+host+port+path+query+hash; var page = require('webpage').create(); page.viewportSize = { width: 1920, height: 1080 }; page.onError = function(message, trace) {