diff options
| author | Romain Derie <rde@odoo.com> | 2019-06-03 14:26:05 +0000 |
|---|---|---|
| committer | Jeremy Kersten <jke@odoo.com> | 2019-06-05 05:56:33 +0000 |
| commit | fdbf11643fd04059bfbc2210427c428979fed73d (patch) | |
| tree | 56801140d47920d0582068323dd874c2ead687d5 /addons/website_forum | |
| parent | d7cd97a9be63ae0a8643400b56d6f9a03285fba6 (diff) | |
[IMP] *: move test and tour files to new folder hierarchy and asset
As we now have a new debug mode 'tests' which load a new asset bundle
containing tour-test files, we moved those files to a new folder hierarchy.
That will clean the .js files trees.
Also, those files should be included in the new asset.
Basically, the .js tour files (not test) should be inside /static/src/js/tours
while .js tour test files (test=true) should be inside /static/tests/tours next
to QUnit tests, inside a tours folder.
+ test_new_api: don't run the test in debug assets
task-1934445
Comes with https://github.com/odoo/enterprise/pull/4281
Closes #33213
Diffstat (limited to 'addons/website_forum')
| -rw-r--r-- | addons/website_forum/static/src/js/tours/website_forum.js (renamed from addons/website_forum/static/src/js/website_tour_forum.js) | 0 | ||||
| -rw-r--r-- | addons/website_forum/static/tests/tours/website_forum_question.js (renamed from addons/website_forum/static/src/js/website_tour_forum_question.js) | 0 | ||||
| -rw-r--r-- | addons/website_forum/views/website_forum.xml | 9 |
3 files changed, 7 insertions, 2 deletions
diff --git a/addons/website_forum/static/src/js/website_tour_forum.js b/addons/website_forum/static/src/js/tours/website_forum.js index f93bfa48631..f93bfa48631 100644 --- a/addons/website_forum/static/src/js/website_tour_forum.js +++ b/addons/website_forum/static/src/js/tours/website_forum.js diff --git a/addons/website_forum/static/src/js/website_tour_forum_question.js b/addons/website_forum/static/tests/tours/website_forum_question.js index 93f22a05e1f..93f22a05e1f 100644 --- a/addons/website_forum/static/src/js/website_tour_forum_question.js +++ b/addons/website_forum/static/tests/tours/website_forum_question.js diff --git a/addons/website_forum/views/website_forum.xml b/addons/website_forum/views/website_forum.xml index 269e766e912..24fdc26feb3 100644 --- a/addons/website_forum/views/website_forum.xml +++ b/addons/website_forum/views/website_forum.xml @@ -5,11 +5,17 @@ <!-- Editor custom --> <template id="assets_editor" inherit_id="website.assets_editor" name="Forum Editor Assets"> <xpath expr="." position="inside"> - <script type="text/javascript" src="/website_forum/static/src/js/website_tour_forum.js"/> + <script type="text/javascript" src="/website_forum/static/src/js/tours/website_forum.js"/> <script type="text/javascript" src="/website_forum/static/src/js/website_forum.editor.js"/> </xpath> </template> +<template id="assets_tests" name="Website Forum Assets Tests" inherit_id="web.assets_tests"> + <xpath expr="." position="inside"> + <script type="text/javascript" src="/website_forum/static/tests/tours/website_forum_question.js"></script> + </xpath> +</template> + <template id="assets_frontend" inherit_id="website.assets_frontend"> <xpath expr="link[last()]" position="after"> <link rel="stylesheet" type="text/scss" href="/website_forum/static/src/scss/website_forum.scss"/> @@ -17,7 +23,6 @@ <xpath expr="script[last()]" position="after"> <script type="text/javascript" src="/website_forum/static/src/js/website_forum.js"/> <script type="text/javascript" src="/website_forum/static/src/js/website_forum.share.js"/> - <script type="text/javascript" src="/website_forum/static/src/js/website_tour_forum_question.js"/> </xpath> </template> |