[MERGE] trunk

bzr revid: openerp-sle@openerp-sle.home-20140217095017-st100iyy9vkuzyhc

addons/account_followup/i18n/fi.po

@@ -8,14 +8,14 @@ msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2012-12-21 17:05+0000\n"
-"PO-Revision-Date: 2011-11-11 15:21+0000\n"
+"PO-Revision-Date: 2014-02-16 20:38+0000\n"
-"Last-Translator: Fabien (Open ERP) <fp@tinyerp.com>\n"
+"Last-Translator: Harri Luuppala <Unknown>\n"
 "Language-Team: Finnish <fi@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2014-01-28 05:51+0000\n"
+"X-Launchpad-Export-Date: 2014-02-17 05:38+0000\n"
-"X-Generator: Launchpad (build 16914)\n"
+"X-Generator: Launchpad (build 16916)\n"
 
 #. module: account_followup
 #: model:email.template,subject:account_followup.email_template_account_followup_default
@@ -55,12 +55,12 @@ msgstr ""
 #: view:account_followup.followup.line:0
 #: field:account_followup.followup.line,manual_action:0
 msgid "Manual Action"
-msgstr ""
+msgstr "Manuaalinen toimenpide"
 
 #. module: account_followup
 #: field:account_followup.sending.results,needprinting:0
 msgid "Needs Printing"
-msgstr ""
+msgstr "Odottaa tulostusta"
 
 #. module: account_followup
 #: view:res.partner:0

addons/website/__init__.py

@@ -1,3 +1,3 @@
 import controllers
-
 import models
+import tests

addons/website/controllers/main.py

@@ -411,3 +411,5 @@ class Website(openerp.addons.web.controllers.main.Home):
         if res:
             return res
         return request.redirect('/')
+
+# vim:et:

addons/website/static/src/js/website.tour.js

@@ -340,9 +340,9 @@ website.Tour = openerp.Class.extend({
     },
     endTour: function () {
         if (parseInt(this.localStorage.getItem("tour-"+this.id+"-test"),10) >= this.steps.length-1) {
-            console.log('{ "event": "success" }');
+            console.log('ok');
         } else {
-            console.log('{ "event": "canceled" }');
+            console.log('error');
         }
         this.reset();
     },

addons/website/tests/__init__.py

@@ -1,5 +1,5 @@
 # -*- coding: utf-8 -*-
 import test_converter
 #import test_requests
-#import test_ui
+import test_ui
 import test_views

addons/website/tests/test_ui.py

@@ -1,14 +1,24 @@
+import os
 import openerp
 
-class TestUi(openerp.tests.HttpCase):
+inject = [
-    def test_admin(self):
+    ("openerp.website.Tour", os.path.join(os.path.dirname(__file__), '../static/src/js/website.tour.js')),
-        self.phantom_js("/", "console.log('ok')", "window.openerp.website")
+    ("openerp.website.Tour.LoginEdit", os.path.join(os.path.dirname(__file__), "../static/src/js/website.tour.test.admin.js")),
-        self.phantom_js("/", "openerp.website.Tour.run_test('banner')", "openerp.website.Tour")
+]
 
-    def test_public(self):
+class TestUi(openerp.tests.HttpCase):
-        inject = [
+    def test_01_pubic_homepage(self):
-            "./../../../website/static/src/js/website.tour.test.js",
+        self.phantom_js("/", "console.log('ok')", "openerp.website.snippet");
-            "./../../../website/static/src/js/website.tour.test.admin.js",
+
-        ]
+    def test_02_public_login_logout(self):
+        # Page injection works but i suspect multiple files doesnt
+        return
         self.phantom_js("/", "openerp.website.Tour.run_test('login_edit')", "openerp.website.Tour", inject=inject);
 
+    def test_03_admin_homepage(self):
+        self.phantom_js("/", "console.log('ok')", "openerp.website.editor", login='admin');
+
+    def test_04_admin_tour_banner(self):
+        self.phantom_js("/", "openerp.website.Tour.run_test('banner')", "openerp.website.Tour", login='admin')
+
+# vim:et:

addons/website_sale/tests/__init__.py

@@ -1 +1 @@
-#import test_ui
+import test_ui

addons/website_sale/tests/test_ui.py

@@ -1,18 +1,28 @@
+import os
+
 import openerp
 
 inject = [
-    "./../../../website/static/src/js/website.tour.test.js",
+    ("openerp.website.Tour", os.path.join(os.path.dirname(__file__), '../../website/static/src/js/website.tour.js')),
-    "./../../../website/static/src/js/website.tour.test.admin.js",
+    ("openerp.website.Tour.ShopTest", os.path.join(os.path.dirname(__file__), "../static/src/js/website.tour.sale.js")),
 ]
 
 class TestUi(openerp.tests.HttpCase):
-    def test_admin(self):
+    def test_01_admin_shop_tour(self):
-        self.phantom_js("/", "openerp.website.Tour.run_test('shop')", "openerp.website.Tour")
+        # Works locally probably due to a race condition on openerp.website.Tour.Shop
-        self.phantom_js("/", "openerp.website.Tour.run_test('shop_buy_product')", "openerp.website.Tour")
+        # object should only be define once ready
+        return
+        self.phantom_js("/", "openerp.website.Tour.run_test('shop')", "openerp.website.Tour.Shop", login="admin")
 
-    def test_demo(self):
+    def test_02_admin_checkout(self):
-        self.phantom_js("/", "openerp.website.Tour.run_test('shop_buy_product')", "openerp.website.Tour", login="demo", password="demo", inject=inject)
+        return
+        self.phantom_js("/", "openerp.website.Tour.run_test('shop_buy_product')", "openerp.website.Tour", login="admin")
 
-    def test_public(self):
+    def test_03_demo_checkout(self):
-        self.phantom_js("/", "openerp.website.Tour.run_test('shop_buy_product')", "openerp.website.Tour", login=None, inject=inject)
+        return
+        self.phantom_js("/", "openerp.website.Tour.run_test('shop_buy_product')", "openerp.website.Tour.ShopTest", login="demo", inject=inject)
+
+    def test_04_public_checkout(self):
+        return
+        self.phantom_js("/", "openerp.website.Tour.run_test('shop_buy_product')", "openerp.website.Tour.ShopTest", inject=inject)