pengyuthon/odoo_source
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[FIX] website: double reload in tests process

Browse Source 
bzr revid: chm@openerp.com-20140121083038-63cubvi2bu59klaj
This commit is contained in:
Christophe Matthieu
2014-01-21 09:30:38 +01:00
parent 53d8280f1d
commit 3b1fec3220
2 changed files with 16 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files
addons/website/static/src/js/website.tour.js
+8 -6
View File
@@ -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') {
addons/website_sale/static/src/js/website.tour.shop.js
+8 -10
View File
@@ -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"]',