summaryrefslogtreecommitdiff
path: root/addons/website_links
diff options
context:
space:
mode:
authorRomain Derie <rde@odoo.com>2019-06-03 14:26:05 +0000
committerJeremy Kersten <jke@odoo.com>2019-06-05 05:56:33 +0000
commitfdbf11643fd04059bfbc2210427c428979fed73d (patch)
tree56801140d47920d0582068323dd874c2ead687d5 /addons/website_links
parentd7cd97a9be63ae0a8643400b56d6f9a03285fba6 (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_links')
-rw-r--r--addons/website_links/static/tests/tours/website_links.js (renamed from addons/website_links/static/src/js/test_ui_flow.js)0
-rw-r--r--addons/website_links/views/website_links_template.xml7
2 files changed, 6 insertions, 1 deletions
diff --git a/addons/website_links/static/src/js/test_ui_flow.js b/addons/website_links/static/tests/tours/website_links.js
index b3885a513ce..b3885a513ce 100644
--- a/addons/website_links/static/src/js/test_ui_flow.js
+++ b/addons/website_links/static/tests/tours/website_links.js
diff --git a/addons/website_links/views/website_links_template.xml b/addons/website_links/views/website_links_template.xml
index 626ec232e53..63d5606092c 100644
--- a/addons/website_links/views/website_links_template.xml
+++ b/addons/website_links/views/website_links_template.xml
@@ -6,11 +6,16 @@
<script type="text/javascript" src="/website_links/static/src/js/website_links.js"/>
<script type="text/javascript" src="/website_links/static/src/js/website_links_code_editor.js"/>
<script type="text/javascript" src="/website_links/static/src/js/website_links_charts.js"/>
- <script type="text/javascript" src="/website_links/static/src/js/test_ui_flow.js"/>
<link rel="stylesheet" type="text/css" href="/website_links/static/src/css/website_links.css"/>
</xpath>
</template>
+ <template id="assets_tests" name="Website Links Assets Tests" inherit_id="web.assets_tests">
+ <xpath expr="." position="inside">
+ <script type="text/javascript" src="/website_links/static/tests/tours/website_links.js"></script>
+ </xpath>
+ </template>
+
<template id="share_page_menu" inherit_id="website.user_navbar">
<xpath expr="//a[@data-action='promote-current-page']" position="after">
<a href="/r" id="o_website_links_share_page" class="dropdown-item">