import os

import openerp.tests

inject = [
    ("openerp.Tour", os.path.join(os.path.dirname(__file__), '../../web/static/src/js/tour.js')),
    ("openerp.Tour.ShopTest", os.path.join(os.path.dirname(__file__), "../static/src/js/website.tour.sale.js")),
]

@openerp.tests.common.at_install(False)
@openerp.tests.common.post_install(True)
class TestUi(openerp.tests.HttpCase):
    def test_01_admin_shop_tour(self):
<<<<<<< HEAD
        self.phantom_js("/", "openerp.website.Tour.run('shop', 'test')", "openerp.website.Tour.tours.shop", login="admin")
        self.phantom_js("/", "openerp.website.Tour.run('shop_customize', 'test')", "openerp.website.Tour.tours.shop_customize", login="admin", inject=inject)

    def test_02_admin_checkout(self):
        self.phantom_js("/", "openerp.website.Tour.run('shop_buy_product', 'test')", "openerp.website.Tour.tours.shop_buy_product", login="admin", inject=inject)
=======
        self.phantom_js("/", "openerp.Tour.run('shop', 'test')", "openerp.Tour.tours.shop", login="admin")

    def test_02_admin_checkout(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_buy_product', 'test')", "openerp.Tour.tours.shop_buy_product", login="admin", inject=inject)
>>>>>>> remotes/odoo/master

    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)

    def test_04_public_checkout(self):
        self.phantom_js("/", "openerp.Tour.run('shop_buy_product', 'test')", "openerp.Tour.tours.shop_buy_product", inject=inject)

@@ -413,21 +413,8 @@
 f):%0A
-%3C%3C%3C%3C%3C%3C%3C HEAD%0A
     
@@ -443,32 +443,24 @@
 %22, %22openerp.
-website.
 Tour.run('sh
@@ -479,32 +479,24 @@
 %22, %22openerp.
-website.
 Tour.tours.s
@@ -550,32 +550,24 @@
 %22, %22openerp.
-website.
 Tour.run('sh
@@ -596,32 +596,24 @@
 %22, %22openerp.
-website.
 Tour.tours.s
@@ -731,32 +731,24 @@
 %22, %22openerp.
-website.
 Tour.run('sh
@@ -783,24 +783,16 @@
 openerp.
-website.
 Tour.tou
@@ -846,478 +846,8 @@
 ect)
-%0A=======%0A        self.phantom_js(%22/%22, %22openerp.Tour.run('shop', 'test')%22, %22openerp.Tour.tours.shop%22, login=%22admin%22)%0A%0A    def test_02_admin_checkout(self):%0A        self.phantom_js(%22/%22, %22openerp.Tour.run('shop_customize', 'test')%22, %22openerp.Tour.tours.shop_customize%22, login=%22admin%22, inject=inject)%0A        self.phantom_js(%22/%22, %22openerp.Tour.run('shop_buy_product', 'test')%22, %22openerp.Tour.tours.shop_buy_product%22, login=%22admin%22, inject=inject)%0A%3E%3E%3E%3E%3E%3E%3E remotes/odoo/master
 %0A%0A  

merge error