From 0f7e290cd6403bfb68d15cb982707677abe8f71f Mon Sep 17 00:00:00 2001
From: Christophe Matthieu <chm@openerp.com>
Date: Tue, 21 Jan 2014 21:31:02 +0100
Subject: [PATCH] [WIP] website_sale: test tour error

bzr revid: chm@openerp.com-20140121203102-btt5bvn0dxnyx9y2
---
 .../static/src/js/website.tour.shop.js           | 16 +++++++++-------
 .../ui_suite/website_sale-sale_process-test.js   |  9 ++-------
 2 files changed, 11 insertions(+), 14 deletions(-)

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 22166cadeea..acca8c1f843 100644
--- a/addons/website_sale/static/src/js/website.tour.shop.js
+++ b/addons/website_sale/static/src/js/website.tour.shop.js
@@ -165,13 +165,13 @@
             if (step.beforeTrigger || step.afterTrigger) {
                 var fn = step.triggers;
                 step.triggers = function (callback) {
-                    if (step.beforeTrigger) step.beforeTrigger();
+                    if (step.beforeTrigger) step.beforeTrigger(self);
                     if (!step.afterTrigger) {
                         fn.call(step, callback);
                     } else {
                         fn.call(step, function () {
                             (callback || self.moveToNextStep).apply(self);
-                             step.afterTrigger();
+                             step.afterTrigger(self);
                         });
                     }
                 };
@@ -234,11 +234,11 @@
                     stepId:    'number-product',
                     element:   '.oe_mycart input.js_quantity',
                     trigger:   'reload',
-                    beforeTrigger: function (tour, callback) {
+                    beforeTrigger: function (tour) {
                         if (parseInt($(".oe_mycart input.js_quantity").val(),10) !== 1)
                             $(".oe_mycart input.js_quantity").val("1").change();
                     },
-                    afterTrigger: function (tour, callback) {
+                    afterTrigger: function (tour) {
                         if ($(".oe_mycart input.js_quantity").size() !== 1)
                             throw "Can't remove suggested item from my cart";
                         if (parseInt($(".oe_mycart input.js_quantity").val(),10) !== 1)
@@ -258,7 +258,7 @@
                     trigger: {
                         url:   '/shop/confirm_order/',
                     },
-                    beforeTrigger: function (tour, callback) {
+                    beforeTrigger: function (tour) {
                         $("input[name='phone']").val("");
                     },
                 },
@@ -268,7 +268,7 @@
                     trigger: {
                         url:   '/shop/payment/',
                     },
-                    beforeTrigger: function (tour, callback) {
+                    beforeTrigger: function (tour) {
                         if ($("input[name='name']").val() === "")
                             $("input[name='name']").val("website_sale-test-shoptest");
                         if ($("input[name='email']").val() === "")
@@ -291,10 +291,12 @@
                     trigger: {
                         url:   /shop\/confirmation\//,
                     },
+                    afterTrigger: function (tour) {
+                        window.localStorage.setItem("test-success", true);
+                    },
                 },
                 {
                     stepId:    'end-test',
-                    title:     "end-test",
                     backdrop:  true,
                 },
             ];
diff --git a/addons/website_sale/tests/ui_suite/website_sale-sale_process-test.js b/addons/website_sale/tests/ui_suite/website_sale-sale_process-test.js
index ebe0afeac32..06b79100438 100644
--- a/addons/website_sale/tests/ui_suite/website_sale-sale_process-test.js
+++ b/addons/website_sale/tests/ui_suite/website_sale-sale_process-test.js
@@ -16,13 +16,8 @@ testRunner.run(function websiteSaleTest (page, timeout) {
         });
         waitFor(function testExecuted () {
             return page.evaluate(function () {
-                console.error(window.$('#wrap:contains("Order Confirmed")'));
-                console.error("-----------------------");
-                console.error(window.$('#wrap').text());
-                console.error("-----------------------");
-                console.error(window.localStorage);
-                console.error("-----------------------");
-                return window.$ && $('#wrap:contains("Order Confirmed")').length;
+                return window.localStorage && window.localStorage.getItem
+                    && window.localStorage.getItem("test-success");
             });
         }, function finish () {
             console.log('{ "event": "success" }');