From 5e10f80cd4c45ee849161061913f8fea2bc4459e Mon Sep 17 00:00:00 2001 From: Christophe Matthieu Date: Thu, 30 Jan 2014 22:57:17 +0100 Subject: [PATCH] [fix] website: test tour bzr revid: chm@openerp.com-20140130215717-h211wj65wl20zfru --- .../website/tests/ui_suite/homepage_test.js | 21 ++----------------- .../website_blog/tests/ui_suite/post_test.js | 15 +------------ .../tests/ui_suite/event_test.js | 16 +------------- addons/website_sale/tests/test_ui.py | 6 +++--- .../website_sale-sale_process-test-2.js | 12 +---------- .../website_sale-sale_process-test.js | 2 +- 6 files changed, 9 insertions(+), 63 deletions(-) diff --git a/addons/website/tests/ui_suite/homepage_test.js b/addons/website/tests/ui_suite/homepage_test.js index 16634c80d8c..209c889f85a 100644 --- a/addons/website/tests/ui_suite/homepage_test.js +++ b/addons/website/tests/ui_suite/homepage_test.js @@ -11,25 +11,8 @@ testRunner.run(function homepageTest (page, timeout) { && window.openerp.website.Tour.get('banner'); }); }, function executeTest () { - var before = page.evaluate(function () { - var result = { - carousel: $('#wrap [data-snippet-id=carousel]').length, - columns: $('#wrap [data-snippet-id=three-columns]').length, - }; - window.openerp.website.Tour.get('banner').run(true, true); - return result; + page.evaluate(function () { + window.openerp.website.TestConsole.get('banner').run(true, true); }); - waitFor(function testExecuted () { - var after = page.evaluate(function () { - return window.$ && $('button[data-action=edit]').is(":visible") && { - carousel: $('#wrap [data-snippet-id=carousel]').length, - columns: $('#wrap [data-snippet-id=three-columns]').length, - }; - }); - return after && (after.carousel === before.carousel + 1) && (after.columns === before.columns + 1); - }, function finish () { - console.log('{ "event": "success" }'); - phantom.exit(); - }, 4*timeout/5); }, timeout/5); }); diff --git a/addons/website_blog/tests/ui_suite/post_test.js b/addons/website_blog/tests/ui_suite/post_test.js index b8cd8aa03da..a8607f41d73 100644 --- a/addons/website_blog/tests/ui_suite/post_test.js +++ b/addons/website_blog/tests/ui_suite/post_test.js @@ -12,20 +12,7 @@ testRunner.run(function blogTest (page, timeout) { }); }, function executeTest () { page.evaluate(function () { - window.openerp.website.Tour.test('blog').run(true, true); + window.openerp.website.TestConsole.get('blog').run(true, true); }); - waitFor(function testExecuted () { - var after = page.evaluate(function () { - return window.$ && $('button[data-action=edit]').is(":visible") && { - image: $('#wrap [data-snippet-id=image-text]').length, - text: $('#wrap [data-snippet-id=text-block]').length, - }; - }); - var result = after && (after.image === 1) && (after.text === 1); - return result; - }, function finish () { - console.log('{ "event": "success" }'); - phantom.exit(); - }, 4*timeout/5); }, timeout/5); }); \ No newline at end of file diff --git a/addons/website_event/tests/ui_suite/event_test.js b/addons/website_event/tests/ui_suite/event_test.js index 0ec8a2783bb..7f351f166c5 100644 --- a/addons/website_event/tests/ui_suite/event_test.js +++ b/addons/website_event/tests/ui_suite/event_test.js @@ -12,21 +12,7 @@ testRunner.run(function eventTest (page, timeout) { }); }, function executeTest () { page.evaluate(function () { - window.openerp.website.Tour.get('event').run(true, true) + window.openerp.website.TestConsole.get('event').run(true, true); }); - waitFor(function testExecuted () { - var after = page.evaluate(function () { - return window.$ && $('button[data-action=edit]').is(":visible") && { - banner: $('#wrap [data-snippet-id=image-text]').length, - text: $('#wrap [data-snippet-id=text-block]').length, - image: $('#wrap [data-snippet-id=three-columns]').length, - }; - }); - var result = after && (after.banner === 1) && (after.text === 1) && (after.image === 1); - return result; - }, function finish () { - console.log('{ "event": "success" }'); - phantom.exit(); - }, 4*timeout/5); }, timeout/5); }); diff --git a/addons/website_sale/tests/test_ui.py b/addons/website_sale/tests/test_ui.py index f3ad5aeef1e..6461a014ee7 100644 --- a/addons/website_sale/tests/test_ui.py +++ b/addons/website_sale/tests/test_ui.py @@ -1,8 +1,8 @@ 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'), + # 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 index b8385f74408..d8147345c4a 100644 --- 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 @@ -12,17 +12,7 @@ testRunner.run(function websiteSaleTest (page, timeout) { }); }, function executeTest () { page.evaluate(function () { - window.openerp.website.Tour.get('shop').run(true, true); + window.openerp.website.TestConsole.get('shop').run(true, 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 41dc4f5ea67..ea484f5c5f2 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 @@ -12,7 +12,7 @@ testRunner.run(function websiteSaleTest (page, timeout) { }); }, function executeTest () { page.evaluate(function () { - window.openerp.website.TestConsole.test('shop_buy_product').run(true, true); + window.openerp.website.TestConsole.get('shop_buy_product').run(true, true); }); }, timeout); }); \ No newline at end of file