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

[FIX] UI tests config for runbot

Browse Source 
bzr revid: ddm@openerp.com-20131227112554-4q839w4xrrnmth0e
This commit is contained in:
ddm
2013-12-27 12:25:54 +01:00
parent 02e944cb8a
commit 23958c233b
2 changed files with 15 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
addons/website/tests/test_ui.py
+6 -2
View File
@@ -77,7 +77,11 @@ class WebsiteUiSuite(unittest.TestSuite):
last_check_time = time.time()
self._options['timeout'] = self._timeout
self._options['port'] = tools.config['xmlrpc_port']
self._options['port'] = tools.config.get('xmlrpc_port', 80)
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')
phantom = subprocess.Popen([
'phantomjs',
@@ -139,5 +143,5 @@ class WebsiteUiSuite(unittest.TestSuite):
def load_tests(loader, base, _):
base.addTest(WebsiteUiSuite('dummy_test.js', {}))
base.addTest(WebsiteUiSuite('banner_tour_test.js', { 'path': '/web#action=website.action_website_homepage&login=admin&password=admin' }))
base.addTest(WebsiteUiSuite('banner_tour_test.js', { 'action': 'website.action_website_homepage' }))
return base
addons/website/tests/ui_suite/ui_test_runner.js
+9 -2
View File
@@ -19,9 +19,16 @@ function waitFor(ready, callback, timeout) {
function run (test) {
var options = JSON.parse(phantom.args);
var scheme = options.scheme ? options.scheme+'://' : 'http://';
var host = options.host ? options.host : 'localhost';
var port = options.port ? ':'+options.port : '';
var path = options.path ? options.path : '';
var url = 'http://localhost'+port+path;
var path = options.path ? options.path : '/web';
var params = [];
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.password) params.push('password='+options.password);
var url = scheme+host+port+path+'#'+params.join('&');
var page = require('webpage').create();
page.viewportSize = { width: 1920, height: 1080 };
page.onError = function(message, trace) {