Merge lp:~openerp-dev/openerp-web/trunk-test-ui-al into lp:openerp-web

[Christophe Matthieu (OpenERP)]

[lp:~openerp-dev/openerp-web/trunk-test-ui-al]

4003. By Christophe Matthieu (OpenERP) on 2014-05-06

[MERGE] from trunk

Unmerged revisions

4003. By Christophe Matthieu (OpenERP) on 2014-05-06

[MERGE] from trunk

4002. By Antony Lesuisse (OpenERP) on 2014-05-01

[IMP] web_tests click_all_menu_items disable act_urls

4001. By Antony Lesuisse (OpenERP) on 2014-05-01

[MERGE] trunk

4000. By Antony Lesuisse (OpenERP) on 2014-05-01

[IMP] web_tests test ui click all menu items

=== modified file 'addons/web/static/src/js/chrome.js'
--- addons/web/static/src/js/chrome.js	2014-04-23 12:37:35 +0000
+++ addons/web/static/src/js/chrome.js	2014-05-06 09:32:41 +0000
@@ -269,6 +269,12 @@
         buttons[_t("Ok")] = function() {
             this.parents('.modal').modal('hide');
         };
+        if (typeof window.callPhantom === 'function') {
+            console.log(error.type + " " + error.message);
+            console.log(error.data.debug);
+            console.log(window.location);
+            console.log("error");
+        }
         new instance.web.Dialog(this, {
             title: "OpenERP " + _.str.capitalize(error.type),
             buttons: buttons
@@ -605,7 +611,6 @@
 };
 instance.web.client_actions.add("logout", "instance.web.logout");
 
-
 /**
  * Redirect to url by replacing window.location
  * If wait is true, sleep 1s and wait for the server i.e. after a restart.
@@ -722,12 +727,13 @@
 
 instance.web.Menu =  instance.web.Widget.extend({
     template: 'Menu',
-    init: function() {
+    init: function(parent) {
         var self = this;
         this._super.apply(this, arguments);
+        this.client = parent;
         this.has_been_loaded = $.Deferred();
         this.maximum_visible_links = 'auto'; // # of menu to show. 0 = do not crop, 'auto' = algo
-        this.data = {data:{children:[]}};
+        this.data = {children:[]};
         this.on("menu_loaded", this, function (menu_data) {
             self.reflow();
             // launch the fetch of needaction counters, asynchronous
@@ -755,7 +761,7 @@
     },
     menu_loaded: function(data) {
         var self = this;
-        this.data = {data: data};
+        this.data = data;
         this.renderElement();
         this.$secondary_menus.html(QWeb.render("Menu.secondary", { widget : this }));
         this.$el.on('click', 'a[data-menu]', this.on_top_menu_click);
@@ -907,6 +913,7 @@
             }, $item);
         }
         this.open_menu(id);
+        return action_id;
     },
     do_reload_needaction: function () {
         var self = this;
@@ -925,7 +932,7 @@
         var self = this;
         var id = $(ev.currentTarget).data('menu');
         var menu_ids = [id];
-        var menu = _.filter(this.data.data.children, function (menu) {return menu.id == id;})[0];
+        var menu = _.filter(this.data.children, function (menu) {return menu.id == id;})[0];
         function add_menu_ids (menu) {
             if (menu.children) {
                 _.each(menu.children, function (menu) {
@@ -945,6 +952,27 @@
         var needaction = $(ev.target).is('div#menu_counter');
         this.menu_click($(ev.currentTarget).data('menu'), needaction);
     },
+    /**
+     * open all action and wait result for each menu
+     * log if action failed or is resolved
+     */
+    click_all_menu_items: function(index) {
+        var self = this;
+        index = index || 0;
+        // disable act_url
+        self.client.action_manager.ir_actions_act_url = function() { return $.when()};
+        if(index < self.data.all_menu_ids.length) {
+            var item = self.data.all_menu_ids[index];
+            self.menu_click(item, null);
+            self.client.menu_action_def.done(function() {
+                self.click_all_menu_items(index + 1);
+            }).fail(function () {
+                console.log("error menu item: " + item);
+            });
+        } else {
+            console.log("ok");
+        }
+    }
 });
 
 instance.web.UserMenu =  instance.web.Widget.extend({
@@ -1140,6 +1168,7 @@
         }
         this._current_state = null;
         this.menu_dm = new instance.web.DropMisordered();
+        this.menu_action_def = $.when();
         this.action_mutex = new $.Mutex();
         this.set('title_part', {"zopenerp": "OpenERP"});
     },
@@ -1358,6 +1387,7 @@
     },
     on_menu_action: function(options) {
         var self = this;
+        this.menu_action_def = $.Deferred();
         return this.menu_dm.add(this.rpc("/web/action/load", { action_id: options.action_id }))
             .then(function (result) {
                 return self.action_mutex.exec(function() {
@@ -1373,6 +1403,9 @@
                         action_menu_id: self.menu.current_menu,
                     })).fail(function() {
                         self.menu.open_menu(options.previous_menu_id);
+                        self.menu_action_def.reject();
+                    }).done(function() {
+                        self.menu_action_def.resolve();
                     }).always(function() {
                         completed.resolve();
                     });

=== modified file 'addons/web/static/src/xml/base.xml'
--- addons/web/static/src/xml/base.xml	2014-05-02 12:33:55 +0000
+++ addons/web/static/src/xml/base.xml	2014-05-06 09:32:41 +0000
@@ -343,7 +343,7 @@
 
 <t t-name="Menu">
     <ul class="nav navbar-nav navbar-left" t-if="widget.data">
-        <li t-foreach="widget.data.data.children" t-as="menu">
+        <li t-foreach="widget.data.children" t-as="menu">
             <t t-call="Menu.link"/>
         </li>
         <li id="menu_more_container" class="dropdown" style="display: none;">
@@ -353,7 +353,7 @@
     </ul>
 </t>
 <t t-name="Menu.secondary">
-    <div t-foreach="widget.data.data.children" t-as="menu" style="display: none" class="oe_secondary_menu" t-att-data-menu-parent="menu.id">
+    <div t-foreach="widget.data.children" t-as="menu" style="display: none" class="oe_secondary_menu" t-att-data-menu-parent="menu.id">
         <t t-foreach="menu.children" t-as="menu">
             <div class="oe_secondary_menu_section">
                 <t t-esc="menu.name"/>

=== modified file 'addons/web_tests/tests/test_ui.py'
--- addons/web_tests/tests/test_ui.py	2014-04-30 07:15:41 +0000
+++ addons/web_tests/tests/test_ui.py	2014-05-06 09:32:41 +0000
@@ -13,4 +13,10 @@
     def test_04_js_admin(self):
         self.phantom_js('/web',"console.log('ok')","openerp.client.action_manager.inner_widget.views.form", login='admin')
 
[e-mail]_install(False)
[e-mail]_install(True)
+class TestMenuItems(openerp.tests.HttpCase):
+    def test_01_menuitems(self):
+        self.phantom_js('/web?debug',"openerp.client.menu.click_all_menu_items()","openerp.client.action_manager.inner_widget", login='admin')
+
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4: