odoo
/
odoo
2
0
Fork 0
Code Pull Requests Releases Activity

[IMP] Tour improvements => automated tests 

bzr revid: ddm@openerp.com-20131209112534-3ysihjgm20jj3d9k
This commit is contained in:
ddm 2013-12-09 12:25:34 +01:00
parent 3aeff80969
commit 5f0fcfb9be
6 changed files with 45 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
addons/website/static/src/js/website.snippets.editor.js
View File

@ -246,6 +246,9 @@
this.snippet_focus($snippet);
}
$("#oe_snippets").trigger('snippet-activated', $snippet);
if ($snippet) {
$snippet.trigger('snippet-activated', $snippet);
}
},
create_overlay: function ($snippet) {
if (typeof $snippet.data("snippet-editor") === 'undefined') {

7
addons/website/static/src/js/website.tour.banner.js
View File

@ -46,7 +46,7 @@
},
{
stepId: 'drag-banner',
element: '#website-top-navbar [data-snippet-id=carousel].ui-draggable',
snippet: 'carousel',
placement: 'bottom',
title: "Drag & Drop a Banner",
content: "Drag the Banner block and drop it in your page.",
@ -84,7 +84,7 @@
},
{
stepId: 'drag-three-columns',
element: '#website-top-navbar [data-snippet-id=three-columns].ui-draggable',
snippet: 'three-columns',
placement: 'bottom',
title: "Drag & Drop a Block",
content: "Drag the <em>'3 Columns'</em> block and drop it below the banner.",
@ -97,7 +97,8 @@
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]:first .text-center[data-snippet-id=colmd]',
id: 'snippet-activated',
},
},
{

42
addons/website/static/src/js/website.tour.js
View File

@ -27,6 +27,9 @@
if (!step.element) {
step.orphan = true;
}
if (step.snippet) {
step.element = '#oe_snippets div.oe_snippet[data-snippet-id="'+step.snippet+'"] .oe_snippet_thumbnail';
}
if (step.trigger) {
if (step.trigger === 'click') {
step.triggers = function (callback) {
@ -48,8 +51,9 @@
};
} else {
step.triggers = function (callback) {
var emitter = step.trigger.emitter || $(step.element);
emitter.one(step.trigger.id, function customHandler () {
var emitter = _.isString(step.trigger.emitter) ? $(step.trigger.emitter) : (step.trigger.emitter || $(step.element));
emitter.on(step.trigger.id, function customHandler () {
console.log(arguments);
(callback || self.moveToNextStep).apply(self, arguments);
});
};
@ -164,7 +168,7 @@
$('.popover.tour').remove();
function advance () {
if (_.isFunction(callback)) {
callback.call(self);
callback.apply(self);
}
}
$(document.body).one('mouseup', advance);
@ -215,7 +219,17 @@
});
var TestConsole = website.TestConsole = {
tests: []
dragAndDropSnippet: function (snippetId) {
var selector = '#oe_snippets div.oe_snippet[data-snippet-id="'+snippetId+'"] .oe_snippet_thumbnail';
var $thumbnail = $(selector).first();
var thumbnailPosition = $thumbnail.position();
$thumbnail.trigger($.Event( "mousedown", { which: 1, pageX: thumbnailPosition.left, pageY: thumbnailPosition.top }));
$thumbnail.trigger($.Event( "mousemove", { which: 1, pageX: thumbnailPosition.left+100, pageY: thumbnailPosition.top+700 }));
var $dropZone = $(".oe_drop_zone").first();
var dropPosition = $dropZone.position();
$dropZone.trigger($.Event( "mouseup", { which: 1, pageX: dropPosition.left, pageY: dropPosition.top }));
},
tests: [],
};
website.EditorBar.include({
@ -247,16 +261,22 @@
id: tour.id,
run: function runTest () {
var actionSteps = _.filter(tour.steps, function (step) {
return step.triggers;
return step.trigger;
});
var currentIndex = 0;
function executeStep (step) {
var $element = $(step.element);
step.triggers(function () {
currentIndex = currentIndex + 1;
executeStep(actionSteps[currentIndex]);
});
$element.click();
var $element = $(step.element);
step.triggers(function () {
currentIndex = currentIndex + 1;
executeStep(actionSteps[currentIndex]);
});
if (step.snippet && step.trigger === 'drag') {
setTimeout(function () {
TestConsole.dragAndDropSnippet(step.snippet);
}, 50);
} else {
$element.click();
}
}
executeStep(actionSteps[currentIndex]);
},

6
addons/website_blog/static/src/js/website.tour.blog.js
View File

@ -51,7 +51,7 @@
title: "Which Blog?",
content: "Blog posts are organized in multiple categories (news, job offers, events, etc). Select <em>News</em> and click <em>Continue</em>.",
trigger: {
emitter: $('.modal select'),
emitter: '.modal select',
id: 'change',
predicate: function ($el, value) {
return $el.find('[value='+value+']').text().toLowerCase() === 'news';
@ -89,7 +89,7 @@
},
{
stepId: 'drag-image-text',
element: '#website-top-navbar [data-snippet-id=image-text].ui-draggable',
snippet: 'image-text',
placement: 'bottom',
title: "Drag & Drop a Block",
content: "Drag the <em>'Image-Text'</em> block and drop it in your page.",
@ -105,7 +105,7 @@
},
{
stepId: 'drag-text-block',
element: '#website-top-navbar [data-snippet-id=text-block].ui-draggable',
snippet: 'text-block',
placement: 'bottom',
title: "Drag & Drop a block",
content: "Drag the <em>'Text Block'</em> block and drop it below the image block.",

6
addons/website_event/static/src/js/website.tour.event.js
View File

@ -75,7 +75,7 @@
},
{
stepId: 'drag-banner',
element: '#website-top-navbar [data-snippet-id=carousel].ui-draggable',
snippet: 'carousel',
placement: 'bottom',
title: "Drag & Drop a block",
content: "Drag the 'Banner' block and drop it in your page.",
@ -91,7 +91,7 @@
},
{
stepId: 'drag-text-block',
element: '#website-top-navbar [data-snippet-id=text-block].ui-draggable',
snipet: 'text-block',
placement: 'bottom',
title: "Drag & Drop a block",
content: "Drag the 'Text Block' block below the banner.",
@ -107,7 +107,7 @@
},
{
stepId: 'drag-three-columns',
element: '#website-top-navbar [data-snippet-id=three-columns].ui-draggable',
snippet: 'three-columns',
placement: 'bottom',
title: "Drag & Drop a block",
content: "Drag the 'Three Columns' block at the bottom.",

2
addons/website_sale/static/src/js/website.tour.shop.js
View File

@ -113,7 +113,7 @@
},
{
stepId: 'drag-big-picture',
element: '#website-top-navbar [data-snippet-id=big-picture].ui-draggable',
snippet: 'big-picture',
placement: 'bottom',
title: "Drag & Drop a block",
content: "Drag the 'Big Picture' block and drop it in your page.",