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/test_website | |
| 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/test_website')
| -rw-r--r-- | addons/test_website/static/tests/tours/reset_views.js (renamed from addons/test_website/static/src/js/reset_views.test.js) | 0 | ||||
| -rw-r--r-- | addons/test_website/views/templates.xml | 6 |
2 files changed, 3 insertions, 3 deletions
diff --git a/addons/test_website/static/src/js/reset_views.test.js b/addons/test_website/static/tests/tours/reset_views.js index bc323eaec2f..bc323eaec2f 100644 --- a/addons/test_website/static/src/js/reset_views.test.js +++ b/addons/test_website/static/tests/tours/reset_views.js diff --git a/addons/test_website/views/templates.xml b/addons/test_website/views/templates.xml index 2ce171bac30..4a6389cf9c7 100644 --- a/addons/test_website/views/templates.xml +++ b/addons/test_website/views/templates.xml @@ -1,8 +1,8 @@ <?xml version="1.0" encoding="utf-8"?> <odoo> - <template id="assets_frontend" inherit_id="website.assets_frontend"> - <xpath expr="script[last()]" position="after"> - <script type="text/javascript" src="/test_website/static/src/js/reset_views.test.js"></script> + <template id="assets_tests" name="Test Website Assets Tests" inherit_id="web.assets_tests"> + <xpath expr="." position="inside"> + <script type="text/javascript" src="/test_website/static/tests/tours/reset_views.js"></script> </xpath> </template> </odoo> |