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 0f03ff4e22a..1104f40ad4f 100644 --- a/addons/website_sale/static/src/js/website.tour.shop.js +++ b/addons/website_sale/static/src/js/website.tour.shop.js @@ -215,8 +215,8 @@ website.EditorShopTest = website.Test.extend({ - id: 'shoptest', - name: "Try to by products", + id: 'shop_buy_product', + name: "Try to buy products", path: '/shop', init: function (editor) { var self = this; diff --git a/addons/website_sale/tests/__init__.py b/addons/website_sale/tests/__init__.py index fb84c7bbb6a..bf8ba6321ad 100644 --- a/addons/website_sale/tests/__init__.py +++ b/addons/website_sale/tests/__init__.py @@ -1,2 +1 @@ -#TODO : fix test runing -#import test_ui \ No newline at end of file +import test_ui diff --git a/addons/website_sale/tests/test_ui.py b/addons/website_sale/tests/test_ui.py index bda42eb1bd7..ec852bdfa3b 100644 --- a/addons/website_sale/tests/test_ui.py +++ b/addons/website_sale/tests/test_ui.py @@ -3,4 +3,6 @@ import openerp.addons.website.tests.test_ui as test_ui def load_tests(loader, base, _): base.addTest(test_ui.WebsiteUiSuite(test_ui.full_path(__file__,'website_sale-sale_process-test.js'), { 'action': 'website.action_website_homepage' }, 120.0)) + base.addTest(test_ui.WebsiteUiSuite(test_ui.full_path(__file__,'website_sale-sale_process-test-2.js'), + { 'action': 'website.action_website_homepage' }, 120.0)) return base \ No newline at end of file diff --git a/addons/website_sale/tests/ui_suite/website_sale-sale_process-test-2.js b/addons/website_sale/tests/ui_suite/website_sale-sale_process-test-2.js new file mode 100644 index 00000000000..35e1ba6edd3 --- /dev/null +++ b/addons/website_sale/tests/ui_suite/website_sale-sale_process-test-2.js @@ -0,0 +1,28 @@ +var testRunner = require('../../../website/tests/ui_suite/ui_test_runner.js'); + +var waitFor = testRunner.waitFor; + +testRunner.run(function websiteSaleTest (page, timeout) { + page.evaluate(function () { localStorage.clear(); }); + waitFor(function clientReady () { + return page.evaluate(function () { + return window.$ && window.openerp && window.openerp.website + && window.openerp.website.TestConsole + && window.openerp.website.TestConsole.test('shop'); + }); + }, function executeTest () { + page.evaluate(function () { + window.openerp.website.TestConsole.test('shop').run(true); + }); + waitFor(function testExecuted () { + var after = page.evaluate(function () { + return window.$ && $('button[data-action=edit]').is(":visible") && + $('data-snippet-id="big-picture"').length; + }); + return after; + }, function finish () { + console.log('{ "event": "success" }'); + phantom.exit(); + }, 4*timeout/5); + }, timeout/5); +}); 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 5e7c7aa436f..5e6b8279306 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 @@ -8,11 +8,11 @@ testRunner.run(function websiteSaleTest (page, timeout) { return page.evaluate(function () { return window.$ && window.openerp && window.openerp.website && window.openerp.website.TestConsole - && window.openerp.website.TestConsole.test('shoptest'); + && window.openerp.website.TestConsole.test('shop_buy_product'); }); }, function executeTest () { page.evaluate(function () { - window.openerp.website.TestConsole.test('shoptest').run(true); + window.openerp.website.TestConsole.test('shop_buy_product').run(true); }); }, timeout); }); \ No newline at end of file