summaryrefslogtreecommitdiff
path: root/addons/web/static/src/js/testing.js
diff options
context:
space:
mode:
authorChristophe Simonis <chs@openerp.com>2012-12-10 15:08:47 +0100
committerChristophe Simonis <chs@openerp.com>2012-12-10 15:08:47 +0100
commit8b4f341c949b6eac6a9e2ce80340eadbb10dd89f (patch)
tree449ab939d5be2e46476148db4ee0d05698271d0d /addons/web/static/src/js/testing.js
parentda574605c72b0830c0855c78308723b88fc0d948 (diff)
parent5d2d4dea2cae780f1b42718170b3aedeb2f0df73 (diff)
merge upstream
bzr revid: chs@openerp.com-20121205150654-c7ps8cygsx1zk1ua bzr revid: chs@openerp.com-20121207104954-xz35sdqgya18pgus bzr revid: chs@openerp.com-20121210140847-yoobt0twf9kg9yau
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()