odoo
/
odoo
2
0
Fork 0
Code Pull Requests Releases Activity

[FIX] Re-enable UI tests 

bzr revid: ddm@openerp.com-20140131171619-ctiww3na8wm53rzf
This commit is contained in:
ddm@openerp.com 2014-01-31 18:16:19 +01:00
parent 9428c563d5
commit 5a07191a9d
3 changed files with 12 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
addons/website/tests/test_ui.py
View File

@ -58,7 +58,6 @@ class WebsiteUiSuite(unittest.TestSuite):
return iter([self])
def run(self, result):
return
# clean slate
if sql_db._Pool is not None:
sql_db._Pool.close_all(sql_db.dsn(tools.config['db_name']))

10
addons/website/tests/ui_suite/ui_test_runner.js
View File

@ -56,6 +56,16 @@ function run (test) {
};
page.onConsoleMessage = function(message) {
console.log(message);
try {
var result = JSON.parse(message);
if (result.event === 'success') {
phantom.exit(0);
} else {
phantom.exit(1);
}
} catch (exception) {
phantom.exit(1);
}
};
page.onCallback = function(data) {

4
addons/website_sale/tests/test_ui.py
View File

@ -2,7 +2,7 @@ import openerp.addons.website.tests.test_ui as test_ui
def load_tests(loader, base, _):
base.addTest(test_ui.WebsiteUiSuite(test_ui.full_path(__file__,'website_sale-sale_process-test.js'),
{ 'action': 'website.action_website_homepage' }))
{'redirect': '/page/website.homepage'}))
base.addTest(test_ui.WebsiteUiSuite(test_ui.full_path(__file__,'website_sale-sale_process-test-2.js'),
{ 'action': 'website.action_website_homepage' }))
{'redirect': '/page/website.homepage'}))
return base