From 3b1fec32208879a4655a37180e2ea4296728e6ed Mon Sep 17 00:00:00 2001
From: Christophe Matthieu <chm@openerp.com>
Date: Tue, 21 Jan 2014 09:30:38 +0100
Subject: [PATCH] [FIX] website: double reload in tests process

bzr revid: chm@openerp.com-20140121083038-63cubvi2bu59klaj
---
 addons/website/static/src/js/website.tour.js   | 14 ++++++++------
 .../static/src/js/website.tour.shop.js         | 18 ++++++++----------
 2 files changed, 16 insertions(+), 16 deletions(-)

diff --git a/addons/website/static/src/js/website.tour.js b/addons/website/static/src/js/website.tour.js
index 6a50c0c404d..7bb8b971344 100644
--- a/addons/website/static/src/js/website.tour.js
+++ b/addons/website/static/src/js/website.tour.js
@@ -39,7 +39,7 @@
                     step.triggers = function (callback) {
                         var stack = JSON.parse(localStorage.getItem("website-reloads")) || [];
                         var index = stack.indexOf(step.stepId);
-                        if (index !== -1 || window.localStorage.getItem("test-wait-reload")) {
+                        if (index !== -1) {
                             stack.splice(index,1);
                             (callback || self.moveToNextStep).apply(self);
                         } else {
@@ -336,15 +336,16 @@
                     var actionSteps = _.filter(tour.steps, function (step) {
                        return step.trigger || step.sampleText;
                     });
-                    window.onbeforeunload = function () {
-                        window.localStorage.setItem("test-wait-reload", true);
-                    };
                     function executeStep (step) {
+                        var _next = false;
                         window.localStorage.setItem(testId, step.stepId);
                         function next () {
+                            _next = true;
                             var nextStep = actionSteps.shift();
                             if (nextStep) {
-                                executeStep(nextStep);
+                                setTimeout(function () {
+                                    executeStep(nextStep);
+                                },0);
                             } else {
                                 window.localStorage.removeItem(testId);
                             }
@@ -352,7 +353,8 @@
                         setTimeout(function () {
                             var $element = $(step.element);
                             if (step.triggers) step.triggers(next);
-                            window.localStorage.removeItem("test-wait-reload");
+                            if ((step.trigger === 'reload' || step.trigger.url) && _next) return;
+                            
                             if (step.snippet && step.trigger === 'drag') {
                                 website.TestConsole.dragAndDropSnippet(step.snippet);
                             } else if (step.trigger && step.trigger.id === 'change') {
diff --git a/addons/website_sale/static/src/js/website.tour.shop.js b/addons/website_sale/static/src/js/website.tour.shop.js
index db17097f231..193d0d5c138 100644
--- a/addons/website_sale/static/src/js/website.tour.shop.js
+++ b/addons/website_sale/static/src/js/website.tour.shop.js
@@ -197,11 +197,9 @@
                 {
                     stepId:    'display-ipod',
                     element:   '.oe_product_cart a:contains("iPod")',
-                    trigger:   'click',
-                },
-                {
-                    stepId:    'display-wait-ipod',
-                    trigger:   'reload',
+                    trigger: {
+                        url:   /shop\/product\/.*/,
+                    },
                 },
                 {
                     stepId:    'choose-ipod',
@@ -278,11 +276,11 @@
                         $("select[name='country_id']").val("21");
                     },
                 },
-                {
-                    stepId:    'delivery-checkout-product',
-                    element:   'input[name="delivery_type"]:eq(1)',
-                    trigger:   'reload',
-                },
+                // {
+                //     stepId:    'delivery-checkout-product',
+                //     element:   'input[name="delivery_type"]:eq(1)',
+                //     trigger:   'reload',
+                // },
                 {
                     stepId:    'acquirer-checkout-product',
                     element:   'input[name="acquirer"]',