[MERGE] with trunk-survey2-rim addons branch

bzr revid: dizzy.zala@gmail.com-20140225053204-mra08nfvumkxyixa

4 files changed, 6 insertions, 57 deletions

diff --git a/addons/website_event/tests/__init__.py b/addons/website_event/tests/__init__.py
index 5e7b52ddf04..3dcbf31d714 100644
--- a/addons/website_event/tests/__init__.py
+++ b/addons/website_event/tests/__init__.py
@@ -19,12 +19,6 @@
 #
 ##############################################################################
 
-import test_controllers
-
-import test_ui
-
-checks = [
-    test_controllers,
-]
+#import test_ui
 
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/website_event/tests/test_controllers.py b/addons/website_event/tests/test_controllers.py
deleted file mode 100644
index 33b37aede9d..00000000000
--- a/addons/website_event/tests/test_controllers.py
+++ /dev/null
@@ -1,29 +0,0 @@
-# -*- coding: utf-8 -*-
-##############################################################################
-#
-#    OpenERP, Open Source Management Solution
-#    Copyright (C) 2013-Today OpenERP SA (<http://www.openerp.com>).
-#
-#    This program is free software: you can redistribute it and/or modify
-#    it under the terms of the GNU Affero General Public License as
-#    published by the Free Software Foundation, either version 3 of the
-#    License, or (at your option) any later version.
-#
-#    This program is distributed in the hope that it will be useful,
-#    but WITHOUT ANY WARRANTY; without even the implied warranty of
-#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-#    GNU Affero General Public License for more details.
-#
-#    You should have received a copy of the GNU Affero General Public License
-#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
-#
-##############################################################################
-
-from openerp.addons.mail.tests.common import TestMail
-from openerp.tools import mute_logger, email_split
-
-
-class TestControllers(TestMail):
-
-    def test_00(self):
-        cr, uid = self.cr, self.uid
diff --git a/addons/website_event/tests/test_ui.py b/addons/website_event/tests/test_ui.py
index 176bc77ecc5..fb6825b9a56 100644
--- a/addons/website_event/tests/test_ui.py
+++ b/addons/website_event/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('event')", "openerp.website.Tour")
 
-def load_tests(loader, base, _):
-    base.addTest(test_ui.WebsiteUiSuite(test_ui.full_path(__file__,'event_test.js'), {'redirect': '/page/website.homepage'}, 60.0))
-    return base
diff --git a/addons/website_event/tests/ui_suite/event_test.js b/addons/website_event/tests/ui_suite/event_test.js
deleted file mode 100644
index 06d6dc12b5f..00000000000
--- a/addons/website_event/tests/ui_suite/event_test.js
+++ /dev/null
@@ -1,17 +0,0 @@
-var testRunner = require('../../../website/tests/ui_suite/ui_test_runner.js');
-
-var waitFor = testRunner.waitFor;
-
-testRunner.run(function eventTest (page, timeout) {
-    page.evaluate(function () { localStorage.clear(); });
-    waitFor(function clientReady () {
-        return page.evaluate(function () {
-            return window.$ && window.openerp && window.openerp.website
-                && window.openerp.website.Tour;
-        });
-    }, function executeTest () {
-        page.evaluate(function () {
-            window.openerp.website.Tour.get('event').run(true);
-        });
-    }, timeout);
-});