[MERGE]Trunk.

bzr revid: vme@tinyerp.com-20140505043233-2t2e2vb1yv86hyxp

7 files changed, 46 insertions, 3 deletions

diff --git a/addons/web_tests/__init__.py b/addons/web_tests/__init__.py
index 40a96afc6ff..8757cd322f3 100644
--- a/addons/web_tests/__init__.py
+++ b/addons/web_tests/__init__.py
@@ -1 +1,2 @@
 # -*- coding: utf-8 -*-
+import tests
diff --git a/addons/web_tests/__openerp__.py b/addons/web_tests/__openerp__.py
index b34f96f78b2..894ddcdeb8c 100644
--- a/addons/web_tests/__openerp__.py
+++ b/addons/web_tests/__openerp__.py
@@ -7,8 +7,9 @@ OpenERP Web test suite.
 
 """,
     'version': '2.0',
-    'depends': [],
-    'js': ['static/src/js/*.js'],
-    'css': ['static/src/css/*.css'],
+    'depends': ['web', 'web_kanban'],
+    'data' : [
+        'views/web_tests.xml',
+    ],
     'auto_install': True,
 }
diff --git a/addons/web_tests/tests/__init__.py b/addons/web_tests/tests/__init__.py
new file mode 100644
index 00000000000..7879fd661db
--- /dev/null
+++ b/addons/web_tests/tests/__init__.py
@@ -0,0 +1,2 @@
+# -*- coding: utf-8 -*-
+import test_ui
diff --git a/addons/web_tests/tests/test_ui.py b/addons/web_tests/tests/test_ui.py
new file mode 100644
index 00000000000..fd644341092
--- /dev/null
+++ b/addons/web_tests/tests/test_ui.py
@@ -0,0 +1,16 @@
+# -*- coding: utf-8 -*-
+import os
+
+import openerp.tests
+
+class TestUi(openerp.tests.HttpCase):
+    def test_01_jsfile_ui_hello(self):
+        self.phantom_jsfile(os.path.join(os.path.dirname(__file__), 'test_ui_hello.js'))
+    def test_02_jsfile_ui_load(self):
+        self.phantom_jsfile(os.path.join(os.path.dirname(__file__), 'test_ui_load.js'))
+    def test_03_js_public(self):
+        self.phantom_js('/',"console.log('ok')","console")
+    def test_04_js_admin(self):
+        self.phantom_js('/web',"console.log('ok')","openerp.client.action_manager.inner_widget.views.form", login='admin')
+
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/web_tests/tests/test_ui_hello.js b/addons/web_tests/tests/test_ui_hello.js
new file mode 100644
index 00000000000..6a453e947aa
--- /dev/null
+++ b/addons/web_tests/tests/test_ui_hello.js
@@ -0,0 +1,5 @@
+console.log("hello from test_phantom_hello.js");
+console.log("ok");
+// For a failure use:
+//console.log("error");
+phantom.exit();
diff --git a/addons/web_tests/tests/test_ui_load.js b/addons/web_tests/tests/test_ui_load.js
new file mode 100644
index 00000000000..9d76250d239
--- /dev/null
+++ b/addons/web_tests/tests/test_ui_load.js
@@ -0,0 +1,4 @@
+// Load helper
+phantom.injectJs(phantom.args[0]);
+pt = new PhantomTest();
+pt.run("/", "console.log('ok')", "console");
diff --git a/addons/web_tests/views/web_tests.xml b/addons/web_tests/views/web_tests.xml
new file mode 100644
index 00000000000..a2be583242c
--- /dev/null
+++ b/addons/web_tests/views/web_tests.xml
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- vim:fdn=3:
+-->
+<openerp>
+    <data>
+        <template id="assets_backend" name="web_tests assets" inherit_id="web.assets_backend">
+            <xpath expr="." position="inside">
+                <link rel="stylesheet" href="/web_tests/static/src/css/web_tests.css"/>
+
+                <script type="text/javascript" src="/web_tests/static/src/js/web_tests.js"></script>
+            </xpath>
+        </template>
+    </data>
+</openerp>