diff options
| author | Xavier Morel <xmo@openerp.com> | 2012-07-12 13:55:52 +0200 |
|---|---|---|
| committer | Xavier Morel <xmo@openerp.com> | 2012-07-12 13:55:52 +0200 |
| commit | 0bccd9be59b3cf258a9a2eea08c01a00992a0564 (patch) | |
| tree | 6565fc2612b3ae97bd1d6f2b697b15a20df22762 | |
| parent | 35b5732bba91544b99c63a2ef57c769758cd4f0c (diff) | |
[FIX] tests: update jquery link, fix broken searchview test following merge
bzr revid: xmo@openerp.com-20120712115552-7adsu941o3wjtrmr
| -rw-r--r-- | addons/web/static/src/js/search.js | 1 | ||||
| -rw-r--r-- | addons/web/static/test/search.js | 12 | ||||
| -rw-r--r-- | addons/web/static/test/test.html | 2 |
3 files changed, 5 insertions, 10 deletions
diff --git a/addons/web/static/src/js/search.js b/addons/web/static/src/js/search.js index c8b6f797dba..504510ef133 100644 --- a/addons/web/static/src/js/search.js +++ b/addons/web/static/src/js/search.js @@ -1669,6 +1669,7 @@ instance.web.search.AddToDashboard = instance.web.Widget.extend({ return $.when(this.load_data(),this.data_loaded).pipe(this.proxy("render_data")); }, load_data:function(){ + if (!instance.webclient) { return $.Deferred().reject(); } var self = this,dashboard_menu = instance.webclient.menu.data.data.children; var ir_model_data = new instance.web.Model('ir.model.data',{},[['name','=','menu_reporting_dashboard']]).query(['res_id']); var map_data = function(result){ diff --git a/addons/web/static/test/search.js b/addons/web/static/test/search.js index 0b1ef7fa2b6..548eef612b5 100644 --- a/addons/web/static/test/search.js +++ b/addons/web/static/test/search.js @@ -1061,17 +1061,11 @@ $(document).ready(function () { module('saved_filters', { setup: function () { - instance = window.openerp.init([]); - window.openerp.web.corelib(instance); - window.openerp.web.coresetup(instance); - window.openerp.web.chrome(instance); - window.openerp.web.data(instance); - window.openerp.web.formats(instance); - window.openerp.web.search(instance); + instance = openerp.testing.instanceFor('search'); - instance.web.qweb.add_template(doc); + openerp.testing.loadTemplate(instance); - mockifyRPC(instance.connection); + openerp.testing.mockifyRPC(instance); } }); asyncTest('checkboxing', 6, function () { diff --git a/addons/web/static/test/test.html b/addons/web/static/test/test.html index 520a7106b5b..cab1586f240 100644 --- a/addons/web/static/test/test.html +++ b/addons/web/static/test/test.html @@ -13,7 +13,7 @@ <script src="/web/static/lib/backbone/backbone.js" type="text/javascript"></script> <!-- jquery --> - <script src="/web/static/lib/jquery/jquery-1.7.2b1.js"></script> + <script src="/web/static/lib/jquery/jquery-1.7.2.js"></script> <script src="/web/static/lib/jquery.ui/js/jquery-ui-1.8.17.custom.min.js"></script> <script src="/web/static/lib/jquery.ba-bbq/jquery.ba-bbq.js"></script> |