diff --git a/addons/website/tests/test_ui.py b/addons/website/tests/test_ui.py index e4852692518..89b8d6eb877 100644 --- a/addons/website/tests/test_ui.py +++ b/addons/website/tests/test_ui.py @@ -1,18 +1,14 @@ -import os -import glob - import openerp -fname, _ = os.path.splitext(__file__) - -class TestUiAdmin(openerp.tests.HttpCase): - def test(self): - for i in glob.glob('%s_admin_*.js' % fname): - self.phantomjs(i) - -class TestUiPublic(openerp.tests.HttpCase): - def test(self): - for i in glob.glob('%s_public_*.js' % fname): - self.phantomjs(i) +class TestUi(openerp.tests.HttpCase): + def test_admin(self): + self.phantom_js("/", "console.log('ok')", "window.openerp.website") + self.phantom_js("/", "openerp.website.Tour.run_test('banner')", "openerp.website.Tour") + def test_public(self): + inject = [ + "./../../../website/static/src/js/website.tour.test.js", + "./../../../website/static/src/js/website.tour.test.admin.js"i + ] + self.phantom_js("/", "openerp.website.Tour.run_test('login_edit')", "openerp.website.Tour", inject=inject); diff --git a/addons/website/tests/test_ui_admin_dom.js b/addons/website/tests/test_ui_admin_dom.js deleted file mode 100644 index 6d1aa8d4a78..00000000000 --- a/addons/website/tests/test_ui_admin_dom.js +++ /dev/null @@ -1,6 +0,0 @@ -// Load helper -phantom.injectJs(phantom.args[0]); - -pt = new PhantomTest(); -pt.run_admin("/", "console.log('ok')", "window.openerp.website"); - diff --git a/addons/website/tests/test_ui_admin_homepage.js b/addons/website/tests/test_ui_admin_homepage.js deleted file mode 100644 index 616b020e753..00000000000 --- a/addons/website/tests/test_ui_admin_homepage.js +++ /dev/null @@ -1,6 +0,0 @@ -// Load helper -phantom.injectJs(phantom.args[0]); - -pt = new PhantomTest(); -pt.run_admin("/", "openerp.website.Tour.run_test('banner')", "openerp.website.Tour"); - diff --git a/addons/website/tests/test_ui_public_login.js b/addons/website/tests/test_ui_public_login.js deleted file mode 100644 index e42b3a2ccd8..00000000000 --- a/addons/website/tests/test_ui_public_login.js +++ /dev/null @@ -1,10 +0,0 @@ -// Load helper -phantom.injectJs(phantom.args[0]); - -pt = new PhantomTest(); -pt.inject = [ - "./../../../website/static/src/js/website.tour.test.js", - "./../../../website/static/src/js/website.tour.test.admin.js"] -]; -pt.run("/", "openerp.website.Tour.run_test('login_edit')", "openerp.website.Tour"); - diff --git a/addons/website_blog/tests/test_ui.py b/addons/website_blog/tests/test_ui.py index 36f464e4998..8a99cf78782 100644 --- a/addons/website_blog/tests/test_ui.py +++ b/addons/website_blog/tests/test_ui.py @@ -1,5 +1,6 @@ -import openerp.addons.website.tests.test_ui as test_ui +import openerp + +class TestUi(openerp.tests.HttpCase): + def test_admin(self): + self.phantom_js("/", "openerp.website.Tour.run_test('blog')", "openerp.website.Tour") -def load_tests(loader, base, _): - base.addTest(test_ui.WebsiteUiSuite(test_ui.full_path(__file__,'post_test.js'), {'redirect': '/page/website.homepage'}, 60.0)) - return base diff --git a/addons/website_blog/tests/test_ui_post.js b/addons/website_blog/tests/test_ui_post.js deleted file mode 100644 index 1152ab1da55..00000000000 --- a/addons/website_blog/tests/test_ui_post.js +++ /dev/null @@ -1,3 +0,0 @@ -var testRunner = require('../../../website/tests/ui_suite/ui_test_runner.js'); - -testRunner.run_test('blog'); \ No newline at end of file diff --git a/addons/website_event_sale/tests/test_ui.py b/addons/website_event_sale/tests/test_ui.py index 1e5d727de92..f9a8ff8d4b3 100644 --- a/addons/website_event_sale/tests/test_ui.py +++ b/addons/website_event_sale/tests/test_ui.py @@ -1,10 +1,17 @@ -import openerp.addons.website.tests.test_ui as test_ui +import openerp + +inject = [ + "./../../../website/static/src/js/website.tour.test.js", + "./../../../website_event_sale/static/src/js/website.tour.event_sale.js", +] + +class TestUi(openerp.tests.HttpCase): + def test_admin(self): + self.phantom_js("/", "openerp.website.Tour.run_test('banner')", "openerp.website.Tour") + + def test_demo(self): + self.phantom_js("/", "openerp.website.Tour.run_test('login_edit')", "openerp.website.Tour", login="demo", password="demo", inject=inject); + + def test_public(self): + self.phantom_js("/", "openerp.website.Tour.run_test('login_edit')", "openerp.website.Tour", login=None, inject=inject); -def load_tests(loader, base, _): - base.addTest(test_ui.WebsiteUiSuite(test_ui.full_path(__file__,'website_event_sale_test.js'), - {'redirect': '/page/website.homepage'})) - base.addTest(test_ui.WebsiteUiSuite(test_ui.full_path(__file__,'website_event_sale_test.js'), - {'redirect': '/page/website.homepage', 'user': 'demo', 'password': 'demo'})) - base.addTest(test_ui.WebsiteUiSuite(test_ui.full_path(__file__,'website_event_sale_test.js'), - {'path': '/', 'user': None})) - return base \ No newline at end of file diff --git a/addons/website_event_sale/tests/test_ui_event_sale.js b/addons/website_event_sale/tests/test_ui_event_sale.js deleted file mode 100644 index 6662c6a2a55..00000000000 --- a/addons/website_event_sale/tests/test_ui_event_sale.js +++ /dev/null @@ -1,7 +0,0 @@ -var testRunner = require('../../../website/tests/ui_suite/ui_test_runner.js'); - -testRunner.run_test('event_buy_tickets', { - "inject": [ - "./../../../website/static/src/js/website.tour.test.js", - "./../../../website_event_sale/static/src/js/website.tour.event_sale.js"] - }); \ No newline at end of file diff --git a/addons/website_sale/tests/test_ui.py b/addons/website_sale/tests/test_ui.py index 394a9ca8e4f..800c8a56e2e 100644 --- a/addons/website_sale/tests/test_ui.py +++ b/addons/website_sale/tests/test_ui.py @@ -1,12 +1,18 @@ -import openerp.addons.website.tests.test_ui as test_ui +import openerp + +inject = [ + "./../../../website/static/src/js/website.tour.test.js", + "./../../../website/static/src/js/website.tour.test.admin.js", +] + +class TestUi(openerp.tests.HttpCase): + def test_admin(self): + self.phantom_js("/", "openerp.website.Tour.run_test('shop')", "openerp.website.Tour") + self.phantom_js("/", "openerp.website.Tour.run_test('shop_buy_product')", "openerp.website.Tour") + + def test_demo(self): + self.phantom_js("/", "openerp.website.Tour.run_test('shop_buy_product')", "openerp.website.Tour", login="demo", password="demo", inject=inject) + + def test_public(self): + self.phantom_js("/", "openerp.website.Tour.run_test('shop_buy_product')", "openerp.website.Tour", login=None, inject=inject) -def load_tests(loader, base, _): - base.addTest(test_ui.WebsiteUiSuite(test_ui.full_path(__file__,'website_sale-add_product-test.js'), - {'redirect': '/page/website.homepage'})) - base.addTest(test_ui.WebsiteUiSuite(test_ui.full_path(__file__,'website_sale-sale_process-test.js'), - {'redirect': '/page/website.homepage'})) - base.addTest(test_ui.WebsiteUiSuite(test_ui.full_path(__file__,'website_sale-sale_process-test.js'), - {'redirect': '/page/website.homepage', 'user': 'demo', 'password': 'demo'})) - base.addTest(test_ui.WebsiteUiSuite(test_ui.full_path(__file__,'website_sale-sale_process-test.js'), - {'path': '/', 'user': None})) - return base \ No newline at end of file diff --git a/addons/website_sale/tests/test_ui_add_product.js b/addons/website_sale/tests/test_ui_add_product.js deleted file mode 100644 index 24befb7f15d..00000000000 --- a/addons/website_sale/tests/test_ui_add_product.js +++ /dev/null @@ -1,3 +0,0 @@ -var testRunner = require('../../../website/tests/ui_suite/ui_test_runner.js'); - -testRunner.run_test('shop'); \ No newline at end of file diff --git a/addons/website_sale/tests/test_ui_checkout.js b/addons/website_sale/tests/test_ui_checkout.js deleted file mode 100644 index ca3943d5e85..00000000000 --- a/addons/website_sale/tests/test_ui_checkout.js +++ /dev/null @@ -1,7 +0,0 @@ -var testRunner = require('../../../website/tests/ui_suite/ui_test_runner.js'); - -testRunner.run_test('shop_buy_product', { - "inject": [ - "./../../../website/static/src/js/website.tour.test.js", - "./../../../website_sale/static/src/js/website.tour.sale.js"] - });