From 5a07191a9de3e2a76e2168efdaa4a5bc6225512d Mon Sep 17 00:00:00 2001
From: "ddm@openerp.com" <>
Date: Fri, 31 Jan 2014 18:16:19 +0100
Subject: [PATCH] [FIX] Re-enable UI tests

bzr revid: ddm@openerp.com-20140131171619-ctiww3na8wm53rzf
---
 addons/website/tests/test_ui.py                 |  1 -
 addons/website/tests/ui_suite/ui_test_runner.js | 10 ++++++++++
 addons/website_sale/tests/test_ui.py            |  4 ++--
 3 files changed, 12 insertions(+), 3 deletions(-)

diff --git a/addons/website/tests/test_ui.py b/addons/website/tests/test_ui.py
index 96484882577..15973a55016 100644
--- a/addons/website/tests/test_ui.py
+++ b/addons/website/tests/test_ui.py
@@ -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']))
diff --git a/addons/website/tests/ui_suite/ui_test_runner.js b/addons/website/tests/ui_suite/ui_test_runner.js
index 507a8ca1e72..9a36d372f10 100644
--- a/addons/website/tests/ui_suite/ui_test_runner.js
+++ b/addons/website/tests/ui_suite/ui_test_runner.js
@@ -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) {
diff --git a/addons/website_sale/tests/test_ui.py b/addons/website_sale/tests/test_ui.py
index 72b948830b1..2953a5a2166 100644
--- a/addons/website_sale/tests/test_ui.py
+++ b/addons/website_sale/tests/test_ui.py
@@ -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
\ No newline at end of file