summaryrefslogtreecommitdiff
path: root/addons/web/static/src
diff options
context:
space:
mode:
authorniv-openerp <nicolas.vanhoren@openerp.com>2013-08-01 14:58:45 +0200
committerniv-openerp <nicolas.vanhoren@openerp.com>2013-08-01 14:58:45 +0200
commit9ce24aea39793c197e88297934014e3fa5feca0c (patch)
tree76ddcc75e3ffc56080a02f3f2bf7eb3ccde259c8 /addons/web/static/src
parentdae87b45352d18f91a8e27b0b868c4fd8ef3a1b0 (diff)
parentf3d634a278411f4a4fdcc0d38da31265042e4bc0 (diff)
Merge trunk
bzr revid: nicolas.vanhoren@openerp.com-20130801125845-2aoeb7l6bicdmk59
Diffstat (limited to 'addons/web/static/src')
-rw-r--r--addons/web/static/src/js/testing.js3
1 files changed, 1 insertions, 2 deletions
diff --git a/addons/web/static/src/js/testing.js b/addons/web/static/src/js/testing.js
index 54ffe8ce408..4e310a9f4a9 100644
--- a/addons/web/static/src/js/testing.js
+++ b/addons/web/static/src/js/testing.js
@@ -198,8 +198,7 @@ openerp.testing = {};
0, module_index + 1 || undefined);
// Serialize options for this precise test case
- // WARNING: typo is from jquery, do not fix!
- var env = QUnit.config.currentModuleTestEnviroment;
+ var env = QUnit.config.currentModuleTestEnvironment;
// section setup
// case setup
// test