From 53d8280f1de508f228419654b631ba8286c03388 Mon Sep 17 00:00:00 2001 From: Christophe Matthieu Date: Mon, 20 Jan 2014 19:26:43 +0100 Subject: [PATCH 01/28] [IMP] website: test class with test for website_sale sale process bzr revid: chm@openerp.com-20140120182643-tw65rig4qqi3sqqf --- addons/website/static/src/js/website.tour.js | 198 ++++++++++-------- addons/website/tests/test_ui.py | 10 +- addons/website/views/website_templates.xml | 8 +- addons/website_blog/tests/test_ui.py | 9 +- addons/website_event/tests/test_ui.py | 9 +- .../static/src/js/website.tour.shop.js | 151 +++++++++++++ addons/website_sale/tests/__init__.py | 1 + addons/website_sale/tests/test_ui.py | 6 + .../website_sale-sale_process-test.js | 31 +++ addons/website_sale/views/website_sale.xml | 2 +- 10 files changed, 310 insertions(+), 115 deletions(-) create mode 100644 addons/website_sale/tests/__init__.py create mode 100644 addons/website_sale/tests/test_ui.py create mode 100644 addons/website_sale/tests/ui_suite/website_sale-sale_process-test.js diff --git a/addons/website/static/src/js/website.tour.js b/addons/website/static/src/js/website.tour.js index 77136bd4bda..6a50c0c404d 100644 --- a/addons/website/static/src/js/website.tour.js +++ b/addons/website/static/src/js/website.tour.js @@ -19,104 +19,108 @@ }); this.registerSteps(); }, - registerSteps: function () { + registerStep: function (step) { var self = this; - this.tour.addSteps(_.map(this.steps, function (step) { - step.title = openerp.qweb.render('website.tour_popover_title', { title: step.title }); - 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.title = openerp.qweb.render('website.tour_popover_title', { title: step.title }); + 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) { + $(step.element).one('click', function () { + (callback || self.moveToNextStep).apply(self); + }); + }; + } else if (step.trigger === 'reload') { + 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")) { + stack.splice(index,1); + (callback || self.moveToNextStep).apply(self); + } else { + stack.push(step.stepId); + } + localStorage.setItem("website-reloads", JSON.stringify(stack)); + }; + } else if (step.trigger.url) { + step.triggers = function (callback) { + var stack = JSON.parse(localStorage.getItem("website-geturls")) || []; + var id = step.trigger.url.toString(); + var index = stack.indexOf(id); + if (index !== -1) { + var url = new website.UrlParser(window.location.href); + var test = typeof step.trigger.url === "string" ? + step.trigger.url == url.pathname+url.search : + step.trigger.url.test(url.pathname+url.search); + if (!test) return; + stack.splice(index,1); + (callback || self.moveToNextStep).apply(self); + } else { + stack.push(id); + } + localStorage.setItem("website-geturls", JSON.stringify(stack)); + }; + } else if (step.trigger === 'drag') { + step.triggers = function (callback) { + self.onSnippetDragged(callback || self.moveToNextStep); + }; + } else if (step.trigger.id) { + if (step.trigger.emitter && step.trigger.type === 'openerp') { step.triggers = function (callback) { - $(step.element).one('click', function () { - (callback || self.moveToNextStep).apply(self); + step.trigger.emitter.on(step.trigger.id, self, function customHandler () { + step.trigger.emitter.off(step.trigger.id, customHandler); + (callback || self.moveToNextStep).apply(self, arguments); }); }; - } else if (step.trigger === 'reload') { + } else { step.triggers = function (callback) { - var stack = JSON.parse(localStorage.getItem("website-reloads")) || []; - var index = stack.indexOf(step.stepId); - if (index !== -1) { - stack.splice(index,1); - (callback || self.moveToNextStep).apply(self); - } else { - stack.push(step.stepId); - } - localStorage.setItem("website-reloads", JSON.stringify(stack)); - }; - } else if (step.trigger && step.trigger.url) { - step.triggers = function (callback) { - var stack = JSON.parse(localStorage.getItem("website-geturls")) || []; - var id = step.trigger.url.toString(); - var index = stack.indexOf(id); - if (index !== -1) { - var url = new website.UrlParser(window.location.href); - var test = typeof step.trigger.url === "string" ? - step.trigger.url == url.pathname+url.search : - step.trigger.url.test(url.pathname+url.search); - if (!test) return; - stack.splice(index,1); - (callback || self.moveToNextStep).apply(self); - } else { - stack.push(id); - } - localStorage.setItem("website-geturls", JSON.stringify(stack)); - }; - } else if (step.trigger === 'drag') { - step.triggers = function (callback) { - self.onSnippetDragged(callback || self.moveToNextStep); - }; - } else if (step.trigger && step.trigger.id) { - if (step.trigger.emitter && step.trigger.type === 'openerp') { - step.triggers = function (callback) { - step.trigger.emitter.on(step.trigger.id, self, function customHandler () { - step.trigger.emitter.off(step.trigger.id, customHandler); - (callback || self.moveToNextStep).apply(self, arguments); - }); - }; - } else { - step.triggers = function (callback) { - var emitter = _.isString(step.trigger.emitter) ? $(step.trigger.emitter) : (step.trigger.emitter || $(step.element)); - if (!emitter.size()) throw "Emitter is undefined"; - emitter.on(step.trigger.id, function () { - (callback || self.moveToNextStep).apply(self, arguments); - }); - }; - } - } else if (step.trigger.modal) { - step.triggers = function (callback) { - var $doc = $(document); - function onStop () { - if (step.trigger.modal.stopOnClose) { - self.stop(); - } - } - $doc.on('hide.bs.modal', onStop); - $doc.one('shown.bs.modal', function () { - $('.modal button.btn-primary').one('click', function () { - $doc.off('hide.bs.modal', onStop); - (callback || self.moveToNextStep).apply(self, [step.trigger.modal.afterSubmit]); - }); - (callback || self.moveToNextStep).apply(self); + var emitter = _.isString(step.trigger.emitter) ? $(step.trigger.emitter) : (step.trigger.emitter || $(step.element)); + if (!emitter.size()) throw "Emitter is undefined"; + emitter.on(step.trigger.id, function () { + (callback || self.moveToNextStep).apply(self, arguments); }); }; } - } - step.onShow = (function () { - var executed = false; - return function () { - if (!executed) { - _.isFunction(step.onStart) && step.onStart(); - _.isFunction(step.triggers) && step.triggers(); - executed = true; + } else if (step.trigger.modal) { + step.triggers = function (callback) { + var $doc = $(document); + function onStop () { + if (step.trigger.modal.stopOnClose) { + self.stop(); + } } + $doc.on('hide.bs.modal', onStop); + $doc.one('shown.bs.modal', function () { + $('.modal button.btn-primary').one('click', function () { + $doc.off('hide.bs.modal', onStop); + (callback || self.moveToNextStep).apply(self, [step.trigger.modal.afterSubmit]); + }); + (callback || self.moveToNextStep).apply(self); + }); }; - }()); - return step; + } + } + step.onShow = (function () { + var executed = false; + return function () { + if (!executed) { + _.isFunction(step.onStart) && step.onStart(); + _.isFunction(step.triggers) && step.triggers(); + executed = true; + } + }; + }()); + return step; + }, + registerSteps: function () { + var self = this; + this.tour.addSteps(_.map(this.steps, function (step) { + return self.registerStep(step); })); }, reset: function () { @@ -332,6 +336,9 @@ 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) { window.localStorage.setItem(testId, step.stepId); function next () { @@ -343,8 +350,9 @@ } } setTimeout(function () { - if (step.triggers) step.triggers(next); var $element = $(step.element); + if (step.triggers) step.triggers(next); + window.localStorage.removeItem("test-wait-reload"); if (step.snippet && step.trigger === 'drag') { website.TestConsole.dragAndDropSnippet(step.snippet); } else if (step.trigger && step.trigger.id === 'change') { @@ -353,13 +361,21 @@ $element.val(step.sampleText); $element.trigger($.Event("change", { srcElement: $element })); } else if ($element.is(":visible")) { // Click by default - $element.trigger($.Event("click", { srcElement: $element })); + if (step.trigger.id === 'mousedown') { + $element.trigger($.Event("mousedown", { srcElement: $element })); + } + var evt = document.createEvent("MouseEvents"); + evt.initMouseEvent("click", true, true, window, 0, 0, 0, 0, 0, false, false, false, false, 0, null); + $element[0].dispatchEvent(evt); + if (step.trigger.id === 'mouseup') { + $element.trigger($.Event("mouseup", { srcElement: $element })); + } } if (!step.triggers) next(); }, step.delay || defaultDelay); } var url = new website.UrlParser(window.location.href); - if (tour.path && url.pathname !== tour.path) { + if (tour.path && url.pathname !== tour.path && !window.localStorage.getItem(testId)) { window.localStorage.setItem(testId, actionSteps[0].stepId); window.location.href = tour.path; } else { diff --git a/addons/website/tests/test_ui.py b/addons/website/tests/test_ui.py index 75a98869646..cc5dbc9db4f 100644 --- a/addons/website/tests/test_ui.py +++ b/addons/website/tests/test_ui.py @@ -141,11 +141,11 @@ class WebsiteUiSuite(unittest.TestSuite): except ValueError: result.addError(self._test, 'Unexpected message: "%s"' % "\n".join(lines)) -def full_path(filename): - return os.path.join(os.path.join(os.path.dirname(__file__), 'ui_suite'), filename) +def full_path(pyfile, filename): + return os.path.join(os.path.join(os.path.dirname(pyfile), 'ui_suite'), filename) def load_tests(loader, base, _): - base.addTest(WebsiteUiSuite(full_path('dummy_test.js'), {}, 5.0)) - base.addTest(WebsiteUiSuite(full_path('simple_dom_test.js'), { 'action': 'website.action_website_homepage' }, 60.0)) - base.addTest(WebsiteUiSuite(full_path('homepage_test.js'), { 'action': 'website.action_website_homepage' }, 60.0)) + base.addTest(WebsiteUiSuite(full_path(__file__, 'dummy_test.js'), {}, 5.0)) + base.addTest(WebsiteUiSuite(full_path(__file__, 'simple_dom_test.js'), { 'action': 'website.action_website_homepage' }, 60.0)) + base.addTest(WebsiteUiSuite(full_path(__file__, 'homepage_test.js'), { 'action': 'website.action_website_homepage' }, 60.0)) return base diff --git a/addons/website/views/website_templates.xml b/addons/website/views/website_templates.xml index 44aea3c7a6b..7a1a8f92ad4 100644 --- a/addons/website/views/website_templates.xml +++ b/addons/website/views/website_templates.xml @@ -96,8 +96,8 @@ -
  • -
  • +
  • +
  • @@ -241,8 +241,8 @@ diff --git a/addons/website_sale/static/src/js/website_sale_payment.js b/addons/website_sale/static/src/js/website_sale_payment.js index 2821f6380a1..3281ee009d2 100644 --- a/addons/website_sale/static/src/js/website_sale_payment.js +++ b/addons/website_sale/static/src/js/website_sale_payment.js @@ -7,5 +7,6 @@ $(document).ready(function () { $("div.oe_sale_acquirer_button[data-id]", $payment).addClass("hidden"); $("div.oe_sale_acquirer_button[data-id='"+payment_id+"']", $payment).removeClass("hidden"); }); + $payment.find("input[name='acquirer']:checked").click(); }); From 35b8850ecc8d3cda929f77993e6a3c5bacab1276 Mon Sep 17 00:00:00 2001 From: "ddm@openerp.com" <> Date: Tue, 21 Jan 2014 13:53:25 +0100 Subject: [PATCH 12/28] [IMP] add SEO preview bzr revid: ddm@openerp.com-20140121125325-641psvqr4w96lsci --- addons/website/static/src/css/editor.css | 50 +++++++++++++++++++ addons/website/static/src/css/editor.sass | 41 +++++++++++++++ addons/website/static/src/js/website.seo.js | 27 +++++++++- addons/website/static/src/xml/website.seo.xml | 33 ++++++++++-- 4 files changed, 146 insertions(+), 5 deletions(-) diff --git a/addons/website/static/src/css/editor.css b/addons/website/static/src/css/editor.css index faf02a57fc0..d0a02ce7b0b 100644 --- a/addons/website/static/src/css/editor.css +++ b/addons/website/static/src/css/editor.css @@ -358,6 +358,56 @@ ul.oe_menu_editor .disclose { -o-border-radius: 0.4em; border-radius: 0.4em; } +.oe_seo_configuration li.oe_seo_preview_g { + line-height: 1.2; + list-style: none; + list-style-image: none; + list-style-position: outside; + list-style-type: none; + font-size: small; + font-family: arial, sans-serif; +} +.oe_seo_configuration li.oe_seo_preview_g h3 { + font-size: medium; +} +.oe_seo_configuration li.oe_seo_preview_g .r { + margin: 0; + font-size: 16px; + font-style: normal; + font-weight: normal; + overflow: hidden; + text-overflow: ellipsis; + -webkit-text-overflow: ellipsis; + white-space: nowrap; +} +.oe_seo_configuration li.oe_seo_preview_g .r a { + color: #1e0fbe; + text-decoration: underline; + text-transform: none; +} +.oe_seo_configuration li.oe_seo_preview_g .r a em { + font-style: normal !important; +} +.oe_seo_configuration li.oe_seo_preview_g .s { + color: #444444; + max-width: 42em; +} +.oe_seo_configuration li.oe_seo_preview_g .kv, .oe_seo_configuration li.oe_seo_preview_g .slp { + display: block; + margin-bottom: 1px; +} +.oe_seo_configuration li.oe_seo_preview_g .f { + color: #666666; + margin-bottom: 1px; +} +.oe_seo_configuration li.oe_seo_preview_g .f cite { + color: #006621; + font-style: normal; + font-size: 14px; +} +.oe_seo_configuration li.oe_seo_preview_g .st { + line-height: 1.24; +} /* ---- ACE EDITOR ---- {{{ */ .oe_ace_view_editor { diff --git a/addons/website/static/src/css/editor.sass b/addons/website/static/src/css/editor.sass index 27cee9a2eae..ce9e43ec1a2 100644 --- a/addons/website/static/src/css/editor.sass +++ b/addons/website/static/src/css/editor.sass @@ -313,6 +313,47 @@ $highlighted_text_color: #ffffff .oe_seo_keyword padding: .2em .4em .2em .5em +border-radius(.4em) + li.oe_seo_preview_g + line-height: 1.2 + list-style: none + list-style-image: none + list-style-position: outside + list-style-type: none + font-size: small + font-family: arial,sans-serif + h3 + font-size: medium + .r + margin: 0 + font-size: 16px + font-style: normal + font-weight: normal + overflow: hidden + text-overflow: ellipsis + -webkit-text-overflow: ellipsis + white-space: nowrap + a + color: rgb(30, 15, 190) + text-decoration: underline + text-transform: none + em + font-style: normal !important + .s + color: #444 + max-width: 42em + .kv,.slp + display: block + margin-bottom: 1px + .f + color: #666 + margin-bottom: 1px + cite + color: #006621 + font-style: normal + font-size: 14px + .st + line-height: 1.24 + // }}} diff --git a/addons/website/static/src/js/website.seo.js b/addons/website/static/src/js/website.seo.js index 563f850486e..9f1745fc1df 100644 --- a/addons/website/static/src/js/website.seo.js +++ b/addons/website/static/src/js/website.seo.js @@ -234,6 +234,16 @@ }, }); + website.seo.Preview = openerp.Widget.extend({ + template: 'website.seo_preview', + init: function (parent, options) { + this.title = options.title; + this.url = options.url; + this.description = options.description || "[ The description will be generated by google unless you specify one ]"; + this._super(parent); + }, + }); + website.seo.HtmlPage = openerp.Class.extend(openerp.PropertiesMixin, { url: function () { var url = window.location.href; @@ -327,7 +337,7 @@ canEditDescription: false, canEditKeywords: false, maxTitleSize: 65, - maxDescriptionSize: 155, + maxDescriptionSize: 160, start: function () { var self = this; var $modal = self.$el; @@ -361,6 +371,7 @@ }); self.keywordList.appendTo($modal.find('.js_seo_keywords_list')); self.disableUnsavableFields(); + self.renderPreview(); $modal.modal(); }, disableUnsavableFields: function () { @@ -484,6 +495,7 @@ setTimeout(function () { var title = self.$('input[name=seo_page_title]').val(); self.htmlPage.changeTitle(title); + self.renderPreview(); }, 0); }, descriptionChanged: function () { @@ -491,7 +503,18 @@ setTimeout(function () { var description = self.$('textarea[name=seo_page_description]').attr('value'); self.htmlPage.changeDescription(description); - }, 1); + self.renderPreview(); + }, 0); + }, + renderPreview: function () { + var preview = new website.seo.Preview(this, { + title: this.htmlPage.title(), + description: this.htmlPage.description(), + url: this.htmlPage.url(), + }); + var $preview = this.$('.js_seo_preview'); + $preview.empty(); + preview.appendTo($preview); }, destroy: function () { this.htmlPage.changeKeywords(this.keywordList.keywords()); diff --git a/addons/website/static/src/xml/website.seo.xml b/addons/website/static/src/xml/website.seo.xml index be9414ca37f..0c055487dd8 100644 --- a/addons/website/static/src/xml/website.seo.xml +++ b/addons/website/static/src/xml/website.seo.xml @@ -43,19 +43,24 @@
    -