summaryrefslogtreecommitdiff
path: root/addons/web/static/src/js/testing.js
diff options
context:
space:
mode:
authorThibault Delavallée <tde@openerp.com>2012-12-10 13:54:23 +0100
committerThibault Delavallée <tde@openerp.com>2012-12-10 13:54:23 +0100
commit1ca5e68b1f3ddb440b104c6c47ea35e8d26a1eed (patch)
tree4070b56d1253290fa69f4fbc43ad4862c883080e /addons/web/static/src/js/testing.js
parenta5ca416f055871fb2765567c2cf2f06445c1d2ca (diff)
parent70f8f99b35c93a880cf15a1f21b7f88aef5a8d36 (diff)
[MERGE] Sync with trunk.
bzr revid: tde@openerp.com-20121130093732-i8y10ayjqiaq5t7p bzr revid: tde@openerp.com-20121204142854-pauouyapnw7z8zwj bzr revid: tde@openerp.com-20121205101544-k4ui6thr0ibzw0vx bzr revid: tde@openerp.com-20121210125423-81wbh4af9sxdqjki
Diffstat (limited to 'addons/web/static/src/js/testing.js')
-rw-r--r--addons/web/static/src/js/testing.js4
1 files changed, 2 insertions, 2 deletions
diff --git a/addons/web/static/src/js/testing.js b/addons/web/static/src/js/testing.js
index 5aeeeb4de78..e7aad43ffc7 100644
--- a/addons/web/static/src/js/testing.js
+++ b/addons/web/static/src/js/testing.js
@@ -10,7 +10,7 @@ openerp.testing = {};
formats: ['coresetup', 'dates'],
chrome: ['corelib', 'coresetup'],
views: ['corelib', 'coresetup', 'data', 'chrome'],
- search: ['data', 'coresetup', 'formats'],
+ search: ['views', 'formats'],
list: ['views', 'data'],
form: ['data', 'views', 'list', 'formats'],
list_editable: ['list', 'form', 'data'],
@@ -263,7 +263,7 @@ openerp.testing = {};
++di;
}
- instance = openerp.init("fuck your shit, don't load anything you cunt");
+ instance = openerp.init(null);
_(d).chain()
.reverse()
.uniq()