From 33e0acb2acc41ada3351522ba7dfdd149d354d11 Mon Sep 17 00:00:00 2001
From: Romain Derie <rde@odoo.com>
Date: Fri, 7 Jun 2019 09:41:07 +0000
Subject: [PATCH] [IMP] base, http, web: do not start tests in debug mode
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

It seems to be a better solution to keep starting tests without being in debug
mode to avoid having new fields and menus appearing.

This commit simply drop the debug mode in test mode and retrieve the test
assets by checking if test mode is enabled directly.

closes odoo/odoo#34012

Signed-off-by: Jérémy Kersten (jke) <jke@openerp.com>
---
 addons/stock/static/tests/tours/route.js              | 2 +-
 addons/web/views/webclient_templates.xml              | 2 +-
 odoo/addons/base/models/ir_ui_view.py                 | 1 +
 odoo/addons/test_new_api/static/tests/tours/x2many.js | 2 +-
 odoo/http.py                                          | 4 +---
 5 files changed, 5 insertions(+), 6 deletions(-)

diff --git a/addons/stock/static/tests/tours/route.js b/addons/stock/static/tests/tours/route.js
index 4647f41a36f..9c29d3f6ada 100644
--- a/addons/stock/static/tests/tours/route.js
+++ b/addons/stock/static/tests/tours/route.js
@@ -5,7 +5,7 @@ var tour = require('web_tour.tour');
 
 tour.register('stock', {
     test: true,
-    url: '/web#action=stock.action_stock_config_settings',
+    url: '/web?debug=1#action=stock.action_stock_config_settings',
     },
      [
         {
diff --git a/addons/web/views/webclient_templates.xml b/addons/web/views/webclient_templates.xml
index 5bc34aad93f..aa3f67af07d 100644
--- a/addons/web/views/webclient_templates.xml
+++ b/addons/web/views/webclient_templates.xml
@@ -394,7 +394,7 @@
     </template>
 
     <template id="conditional_assets_tests" name="Tests Assets Bundle">
-        <t t-call-assets="web.assets_tests" t-if="'tests' in debug" defer_load="True" />
+        <t t-call-assets="web.assets_tests" t-if="'tests' in debug or test_mode_enabled" defer_load="True" />
     </template>
 
     <template id="web.layout" name="Web layout">&lt;!DOCTYPE html&gt;
diff --git a/odoo/addons/base/models/ir_ui_view.py b/odoo/addons/base/models/ir_ui_view.py
index 30600ee6bf7..5ee3d98b8aa 100644
--- a/odoo/addons/base/models/ir_ui_view.py
+++ b/odoo/addons/base/models/ir_ui_view.py
@@ -1357,6 +1357,7 @@ actual arch.
             keep_query=keep_query,
             request=request,  # might be unbound if we're not in an httprequest context
             debug=request.session.debug if request else '',
+            test_mode_enabled=bool(config['test_enable'] or config['test_file']),
             json=json,
             quote_plus=werkzeug.url_quote_plus,
             time=time,
diff --git a/odoo/addons/test_new_api/static/tests/tours/x2many.js b/odoo/addons/test_new_api/static/tests/tours/x2many.js
index ae4c0e3c8d3..f1683d09c69 100644
--- a/odoo/addons/test_new_api/static/tests/tours/x2many.js
+++ b/odoo/addons/test_new_api/static/tests/tours/x2many.js
@@ -5,7 +5,7 @@ odoo.define('web.test.x2many', function (require) {
     var inc;
 
     tour.register('widget_x2many', {
-        url: '/web#action=test_new_api.action_discussions',
+        url: '/web?debug=1#action=test_new_api.action_discussions',
         test: true,
     }, [
     /////////////////////////////////////////////////////////////////////////////////////////////
diff --git a/odoo/http.py b/odoo/http.py
index d4b1aef8a1a..34af5c78c53 100644
--- a/odoo/http.py
+++ b/odoo/http.py
@@ -1051,9 +1051,7 @@ class OpenERPSession(werkzeug.contrib.sessions.Session):
         self.setdefault("login", None)
         self.setdefault("session_token", None)
         self.setdefault("context", {})
-        # Force tests debug mode when test mode enabled to load 'assets_tests'
-        test_mode = odoo.tools.config['test_enable'] or odoo.tools.config['test_file']
-        self.setdefault("debug", 'tests' if test_mode else '')
+        self.setdefault("debug", '')
 
     def get_context(self):
         """