[FIX] phantomjs test remove injection
It's now deprecated, assets bundles should be used instead.
This commit is contained in:
parent
4ff1c333d9
commit
25d0a3ecb1
|
@ -2,19 +2,15 @@ import os
|
||||||
|
|
||||||
import openerp.tests
|
import openerp.tests
|
||||||
|
|
||||||
inject = [
|
|
||||||
("openerp.Tour", os.path.join(os.path.dirname(__file__), '../../web/static/src/js/tour.js')),
|
|
||||||
]
|
|
||||||
|
|
||||||
@openerp.tests.common.at_install(False)
|
@openerp.tests.common.at_install(False)
|
||||||
@openerp.tests.common.post_install(True)
|
@openerp.tests.common.post_install(True)
|
||||||
class TestUi(openerp.tests.HttpCase):
|
class TestUi(openerp.tests.HttpCase):
|
||||||
def test_admin(self):
|
def test_admin(self):
|
||||||
self.phantom_js("/", "openerp.Tour.run('event_buy_tickets', 'test')", "openerp.Tour.tours.event_buy_tickets", inject=inject)
|
self.phantom_js("/", "openerp.Tour.run('event_buy_tickets', 'test')", "openerp.Tour.tours.event_buy_tickets")
|
||||||
|
|
||||||
def test_demo(self):
|
def test_demo(self):
|
||||||
self.phantom_js("/", "openerp.Tour.run('event_buy_tickets', 'test')", "openerp.Tour.tours.event_buy_tickets", login="demo", password="demo", inject=inject);
|
self.phantom_js("/", "openerp.Tour.run('event_buy_tickets', 'test')", "openerp.Tour.tours.event_buy_tickets", login="demo", password="demo");
|
||||||
|
|
||||||
def test_public(self):
|
def test_public(self):
|
||||||
self.phantom_js("/", "openerp.Tour.run('event_buy_tickets', 'test')", "openerp.Tour.tours.event_buy_tickets", login=None, inject=inject);
|
self.phantom_js("/", "openerp.Tour.run('event_buy_tickets', 'test')", "openerp.Tour.tours.event_buy_tickets", login=None);
|
||||||
|
|
||||||
|
|
|
@ -2,10 +2,6 @@ import os
|
||||||
|
|
||||||
import openerp.tests
|
import openerp.tests
|
||||||
|
|
||||||
inject = [
|
|
||||||
("openerp.Tour", os.path.join(os.path.dirname(__file__), '../../web/static/src/js/tour.js')),
|
|
||||||
]
|
|
||||||
|
|
||||||
@openerp.tests.common.at_install(False)
|
@openerp.tests.common.at_install(False)
|
||||||
@openerp.tests.common.post_install(True)
|
@openerp.tests.common.post_install(True)
|
||||||
class TestUi(openerp.tests.HttpCase):
|
class TestUi(openerp.tests.HttpCase):
|
||||||
|
@ -13,10 +9,10 @@ class TestUi(openerp.tests.HttpCase):
|
||||||
self.phantom_js("/", "openerp.Tour.run('shop', 'test')", "openerp.Tour.tours.shop", login="admin")
|
self.phantom_js("/", "openerp.Tour.run('shop', 'test')", "openerp.Tour.tours.shop", login="admin")
|
||||||
|
|
||||||
def test_02_admin_checkout(self):
|
def test_02_admin_checkout(self):
|
||||||
self.phantom_js("/", "openerp.Tour.run('shop_buy_product', 'test')", "openerp.Tour.tours.shop_buy_product", login="admin", inject=inject)
|
self.phantom_js("/", "openerp.Tour.run('shop_buy_product', 'test')", "openerp.Tour.tours.shop_buy_product", login="admin")
|
||||||
|
|
||||||
def test_03_demo_checkout(self):
|
def test_03_demo_checkout(self):
|
||||||
self.phantom_js("/", "openerp.Tour.run('shop_buy_product', 'test')", "openerp.Tour.tours.shop_buy_product", login="demo", inject=inject)
|
self.phantom_js("/", "openerp.Tour.run('shop_buy_product', 'test')", "openerp.Tour.tours.shop_buy_product", login="demo")
|
||||||
|
|
||||||
def test_04_public_checkout(self):
|
def test_04_public_checkout(self):
|
||||||
self.phantom_js("/", "openerp.Tour.run('shop_buy_product', 'test')", "openerp.Tour.tours.shop_buy_product", inject=inject)
|
self.phantom_js("/", "openerp.Tour.run('shop_buy_product', 'test')", "openerp.Tour.tours.shop_buy_product")
|
||||||
|
|
|
@ -4,21 +4,21 @@
|
||||||
|
|
||||||
<!-- Layout and common templates -->
|
<!-- Layout and common templates -->
|
||||||
|
|
||||||
<template id="assets_editor" inherit_id="website.assets_editor" name="Shop Editor" groups="base.group_sale_manager">
|
<template id="assets_frontend" inherit_id="website.assets_frontend" name="Shop">
|
||||||
<xpath expr="." position="inside">
|
<xpath expr="." position="inside">
|
||||||
<script type="text/javascript" src="/website_sale/static/src/js/website_sale.editor.js"></script>
|
<link rel='stylesheet' href='/website_sale/static/src/css/website_sale.css'/>
|
||||||
<script type="text/javascript" src="/website_sale/static/src/js/website.tour.shop.js"></script>
|
<link rel='stylesheet' href='/website_sale/static/src/css/website_mail.css'/>
|
||||||
|
<script type="text/javascript" src="/website_sale/static/src/js/website_sale.js"></script>
|
||||||
|
<script type="text/javascript" src="/website_sale/static/src/js/website_sale_payment.js"></script>
|
||||||
|
<script type="text/javascript" src="/website_sale/static/src/js/website_sale_validate.js"></script>
|
||||||
|
<script type="text/javascript" src="/website_sale/static/src/js/website_sale_tour_buy.js"></script>
|
||||||
</xpath>
|
</xpath>
|
||||||
</template>
|
</template>
|
||||||
|
|
||||||
<template id="assets_frontend" inherit_id="website.assets_frontend" name="Shop">
|
<template id="assets_editor" inherit_id="website.assets_editor" name="Shop Editor" groups="base.group_sale_manager">
|
||||||
<xpath expr="." position="inside">
|
<xpath expr="." position="inside">
|
||||||
<script type="text/javascript" src="/website_sale/static/src/js/website.tour.sale.js"></script>
|
<script type="text/javascript" src="/website_sale/static/src/js/website_sale.editor.js"></script>
|
||||||
<script type="text/javascript" src="/website_sale/static/src/js/website_sale.js"></script>
|
<script type="text/javascript" src="/website_sale/static/src/js/website_sale_tour_shop.js"></script>
|
||||||
<link rel='stylesheet' href='/website_sale/static/src/css/website_sale.css'/>
|
|
||||||
<link rel='stylesheet' href='/website_sale/static/src/css/website_mail.css'/>
|
|
||||||
<script type="text/javascript" src="/website_sale/static/src/js/website_sale_payment.js"></script>
|
|
||||||
<script type="text/javascript" src="/website_sale/static/src/js/website_sale_validate.js"></script>
|
|
||||||
</xpath>
|
</xpath>
|
||||||
</template>
|
</template>
|
||||||
|
|
||||||
|
@ -33,6 +33,7 @@
|
||||||
</li>
|
</li>
|
||||||
</xpath>
|
</xpath>
|
||||||
</template>
|
</template>
|
||||||
|
|
||||||
<template id="search" name="Search hidden fields">
|
<template id="search" name="Search hidden fields">
|
||||||
<t t-if="attrib_values">
|
<t t-if="attrib_values">
|
||||||
<t t-foreach="attrib_values" t-as="a">
|
<t t-foreach="attrib_values" t-as="a">
|
||||||
|
|
|
@ -2,12 +2,8 @@ import os
|
||||||
|
|
||||||
import openerp.tests
|
import openerp.tests
|
||||||
|
|
||||||
inject = [
|
|
||||||
("openerp.Tour", os.path.join(os.path.dirname(__file__), '../../web/static/src/js/tour.js')),
|
|
||||||
]
|
|
||||||
|
|
||||||
@openerp.tests.common.at_install(False)
|
@openerp.tests.common.at_install(False)
|
||||||
@openerp.tests.common.post_install(True)
|
@openerp.tests.common.post_install(True)
|
||||||
class TestUi(openerp.tests.HttpCase):
|
class TestUi(openerp.tests.HttpCase):
|
||||||
def test_01_admin_shop_tour(self):
|
def test_01_admin_shop_tour(self):
|
||||||
self.phantom_js("/", "openerp.Tour.run('shop_customize', 'test')", "openerp.Tour.tours.shop_customize", login="admin", inject=inject)
|
self.phantom_js("/", "openerp.Tour.run('shop_customize', 'test')", "openerp.Tour.tours.shop_customize", login="admin")
|
||||||
|
|
Loading…
Reference in New Issue