From dbe5c06d95bc5922a282e39d6469a898460838ef Mon Sep 17 00:00:00 2001
From: ddm <ddm@openerp.com>
Date: Mon, 23 Dec 2013 15:41:00 +0100
Subject: [PATCH] [IMP] PhantomJS UI tests code cleanup

bzr revid: ddm@openerp.com-20131223144100-h8eui7szdj40e2mo
---
 addons/website/static/src/js/website.tour.js |  3 ---
 addons/website/tests/test_ui.py              |  2 +-
 addons/website/tests/ui_suite/dom_test.js    | 10 +++++-----
 3 files changed, 6 insertions(+), 9 deletions(-)

diff --git a/addons/website/static/src/js/website.tour.js b/addons/website/static/src/js/website.tour.js
index 3e05f8f3832..ea3c7bcf5b5 100644
--- a/addons/website/static/src/js/website.tour.js
+++ b/addons/website/static/src/js/website.tour.js
@@ -287,9 +287,6 @@
                     tour.start();
                 }
             });
-            if (document.dispatchEvent) {
-                document.dispatchEvent(new Event('ui-tests:ready', { bubbles: true, cancelable: false }));
-            }
             return this._super();
         },
         registerTour: function (tour) {
diff --git a/addons/website/tests/test_ui.py b/addons/website/tests/test_ui.py
index 6c1380032e0..bb7e1e0f9a5 100644
--- a/addons/website/tests/test_ui.py
+++ b/addons/website/tests/test_ui.py
@@ -43,7 +43,7 @@ class WebsiteUiTest(unittest.TestCase):
 
 class WebsiteUiSuite(unittest.TestSuite):
     # timeout is in seconds
-    def __init__(self, testfile, timeout=20):
+    def __init__(self, testfile, timeout=10):
         self.testfile = testfile
         self.timeout = timeout
         self._test = None
diff --git a/addons/website/tests/ui_suite/dom_test.js b/addons/website/tests/ui_suite/dom_test.js
index 73e2bb739b0..ee60d827ce0 100644
--- a/addons/website/tests/ui_suite/dom_test.js
+++ b/addons/website/tests/ui_suite/dom_test.js
@@ -8,16 +8,15 @@ page.onError = function(message, trace) {
 };
 
 function waitFor(ready, timeout) {
-    var maxtimeOutMillis = timeout ? timeout*1000 : 10000;
+    var timeOutMillis = timeout ? timeout*1000 : 10000;
     var start = new Date().getTime();
     var condition = ready();
     var interval = setInterval(function() {
-        if ((new Date().getTime() - start < maxtimeOutMillis) && !condition ) {
-            alert("TOTO")
+        if ((new Date().getTime() - start < timeOutMillis) && !condition ) {
             condition = ready();
         } else {
             if(!condition) {
-                console.log('{ "event": "error", "message": "Timeout after'+maxtimeOutMillis+' ms" }');
+                console.log('{ "event": "error", "message": "Timeout after'+timeOutMillis+' ms" }');
                 phantom.exit(1);
             } else {
                 clearInterval(interval);
@@ -27,6 +26,7 @@ function waitFor(ready, timeout) {
     }, 100);
 };
 
+page.viewportSize = { width: 1920, height: 1080 };
 page.open(url, function (status) {
     if (status !== 'success') {
         console.log('{ "event": "failure", "message": "'+url+' failed to load"}');
@@ -34,7 +34,7 @@ page.open(url, function (status) {
     } else {
         waitFor(function () {
             return page.evaluate(function () {
-                return window.openerp && window.openerp.website && window.openerp.website.editor;
+                return window.openerp && window.openerp.website && window.openerp.website.TestConsole;
             });
         }, options.timeout);
     }