From 02e944cb8a653b54a714b9e87825eacef3b07382 Mon Sep 17 00:00:00 2001
From: ddm <ddm@openerp.com>
Date: Fri, 27 Dec 2013 11:09:39 +0100
Subject: [PATCH] [FIX] UI tests should not fail on runbot

bzr revid: ddm@openerp.com-20131227100939-dadzuyexl0anrese
---
 .../static/src/js/website.tour.banner.js      | 19 ----------------
 .../tests/ui_suite/banner_tour_test.js        | 22 +++++++++++++------
 .../website/tests/ui_suite/ui_test_runner.js  |  2 +-
 3 files changed, 16 insertions(+), 27 deletions(-)

diff --git a/addons/website/static/src/js/website.tour.banner.js b/addons/website/static/src/js/website.tour.banner.js
index 029753d91a7..7b034bf54cb 100644
--- a/addons/website/static/src/js/website.tour.banner.js
+++ b/addons/website/static/src/js/website.tour.banner.js
@@ -84,25 +84,6 @@
                     content:   "Drag the <em>'3 Columns'</em> block and drop it below the banner.",
                     trigger:   'drag',
                 },
-                {
-                    stepId:    'activate-text-block-title',
-                    element:   '#wrap [data-snippet-id=three-columns] .text-center[data-snippet-id=colmd]',
-                    placement: 'top',
-                    title:     "Edit an Area",
-                    content:   "Select any area of the page to modify it. Click on this subtitle.",
-                    trigger: {
-                        id:      'snippet-activated',
-                        emitter: '#wrap [data-snippet-id=three-columns] .text-center[data-snippet-id=colmd]',
-                    },
-                },
-                {
-                    stepId:    'remove-text-block-title',
-                    element:   '.oe_active .oe_snippet_remove',
-                    placement: 'top',
-                    title:     "Delete the Title",
-                    content:   "From this toolbar you can move, duplicate or delete the selected zone. Click on the trash can to delete the title.",
-                    trigger:   'click',
-                },
                 {
                     stepId:    'save-changes',
                     element:   'button[data-action=save]',
diff --git a/addons/website/tests/ui_suite/banner_tour_test.js b/addons/website/tests/ui_suite/banner_tour_test.js
index 27688695a14..9bade783afc 100644
--- a/addons/website/tests/ui_suite/banner_tour_test.js
+++ b/addons/website/tests/ui_suite/banner_tour_test.js
@@ -11,17 +11,25 @@ testRunner.run(function testBannerTour (page) {
                 && window.openerp.website.TestConsole.test('banner');
         });
     }, function () {
-        page.evaluate(function () {
+        var before = page.evaluate(function () {
+            var result = {
+                carousel: $('#wrap [data-snippet-id=carousel]').length,
+                columns: $('#wrap [data-snippet-id=three-columns]').length,
+            };
             window.openerp.website.TestConsole.test('banner').run(true);
+            return result;
         });
         waitFor(function () {
-            return page.evaluate(function () {
-                var $edit = $('button[data-action=edit]');
-                var $carousel = $('#wrap [data-snippet-id=carousel]');
-                var $columns = $('#wrap [data-snippet-id=three-columns]');
-                return $carousel.length === 1 && $columns.length === 1
-                    && $('button[data-action=edit]').is(":visible");
+            var after = page.evaluate(function () {
+                if ($('button[data-action=edit]').is(":visible")) {
+                    console.error("why?");
+                    return {
+                        carousel: $('#wrap [data-snippet-id=carousel]').length,
+                        columns: $('#wrap [data-snippet-id=three-columns]').length,
+                    };
+                }
             });
+            return after && after.carousel === before.carousel + 1 && after.columns === before.columns + 1;
         }, function () {
             console.log('{ "event": "success" }');
             phantom.exit();
diff --git a/addons/website/tests/ui_suite/ui_test_runner.js b/addons/website/tests/ui_suite/ui_test_runner.js
index 74c022fdbed..0117421dec2 100644
--- a/addons/website/tests/ui_suite/ui_test_runner.js
+++ b/addons/website/tests/ui_suite/ui_test_runner.js
@@ -1,5 +1,5 @@
 function waitFor(ready, callback, timeout) {
-    var timeoutMillis = timeout ? Math.round(timeout*1000) : 30000;
+    var timeoutMillis = timeout ? Math.round(timeout*1000) : 10000;
     var start = new Date().getTime();
     var condition = ready();
     var interval = setInterval(function() {