pengyuthon/odoo_source
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[FIX] More test params

Browse Source 
bzr revid: ddm@openerp.com-20131230131322-5atbn0wyfjlctgyw
This commit is contained in:
ddm
2013-12-30 14:13:22 +01:00
parent 12b5b73312
commit b3cf02d123
2 changed files with 6 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
addons/website/tests/test_ui.py
+2 -1
View File
@@ -81,7 +81,8 @@ class WebsiteUiSuite(unittest.TestSuite):
self._options['db'] = tools.config.get('db_name', '')
# TODO Use correct key
self._options['user'] = 'admin'
self._options['password'] = tools.config.get('admin_passwd', 'admin')
self._options['admin_password'] = tools.config.get('admin_passwd', 'admin')
self._options['db_password'] = tools.config.get('db_password', 'admin')
phantom = subprocess.Popen([
'phantomjs',
addons/website/tests/ui_suite/ui_test_runner.js
+4 -3
View File
@@ -25,11 +25,12 @@ 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 = [];
var params = [ 'mod=*' ];
if (options.action) params.push('action='+options.action);
//if (options.db) params.push('source='+options.db);
if (options.db) params.push('source='+options.db);
if (options.user) params.push('login='+options.user);
if (options.password) params.push('password='+options.password);
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 page = require('webpage').create();
page.viewportSize = { width: 1920, height: 1080 };