diff options
| author | qsm-odoo <qsm@odoo.com> | 2018-03-13 14:54:34 +0100 |
|---|---|---|
| committer | qsm-odoo <qsm@odoo.com> | 2018-04-18 15:59:02 +0200 |
| commit | 2d63d2d75a65cd90b1488efa0cca0c60608016eb (patch) | |
| tree | f5f5d58f6f5e73919cdeb6e82e6736ac969378d4 | |
| parent | c71be32c89e455b34d2555b9f54ff88e770f0a55 (diff) | |
[REF] test_assetsbundle: adapt bundle tests
| -rw-r--r-- | odoo/addons/test_assetsbundle/static/src/scss/test_file1.scss (renamed from odoo/addons/test_assetsbundle/static/src/less/test_lessfile1.less) | 0 | ||||
| -rw-r--r-- | odoo/addons/test_assetsbundle/tests/test_assetsbundle.py | 10 | ||||
| -rw-r--r-- | odoo/addons/test_assetsbundle/views/views.xml | 2 |
3 files changed, 6 insertions, 6 deletions
diff --git a/odoo/addons/test_assetsbundle/static/src/less/test_lessfile1.less b/odoo/addons/test_assetsbundle/static/src/scss/test_file1.scss index 7202b8b6ab1..7202b8b6ab1 100644 --- a/odoo/addons/test_assetsbundle/static/src/less/test_lessfile1.less +++ b/odoo/addons/test_assetsbundle/static/src/scss/test_file1.scss diff --git a/odoo/addons/test_assetsbundle/tests/test_assetsbundle.py b/odoo/addons/test_assetsbundle/tests/test_assetsbundle.py index 3d372a6dcd2..fef390b6356 100644 --- a/odoo/addons/test_assetsbundle/tests/test_assetsbundle.py +++ b/odoo/addons/test_assetsbundle/tests/test_assetsbundle.py @@ -358,7 +358,7 @@ class TestAssetsBundleInBrowser(HttpCase): class TestAssetsBundleWithIRAMock(TransactionCase): def setUp(self): super(TestAssetsBundleWithIRAMock, self).setUp() - self.lessbundle_xmlid = 'test_assetsbundle.bundle3' + self.stylebundle_xmlid = 'test_assetsbundle.bundle3' self.counter = counter = Counter() # patch methods 'create' and 'unlink' of model 'ir.attachment' @@ -379,8 +379,8 @@ class TestAssetsBundleWithIRAMock(TransactionCase): self.addCleanup(self.env['ir.attachment']._revert_method, 'unlink') def _get_asset(self): - files, remains = self.env['ir.qweb']._get_asset_content(self.lessbundle_xmlid, {}) - return AssetsBundle(self.lessbundle_xmlid, files, remains, env=self.env) + files, remains = self.env['ir.qweb']._get_asset_content(self.stylebundle_xmlid, {}) + return AssetsBundle(self.stylebundle_xmlid, files, remains, env=self.env) def _bundle(self, asset, should_create, should_unlink): self.counter.clear() @@ -389,7 +389,7 @@ class TestAssetsBundleWithIRAMock(TransactionCase): self.assertEquals(self.counter['unlink'], int(should_unlink)) def test_01_debug_mode_assets(self): - """ Checks that the ir.attachments records created for compiled less assets in debug mode + """ Checks that the ir.attachments records created for compiled assets in debug mode are correctly invalidated. """ # Compile for the first time @@ -399,7 +399,7 @@ class TestAssetsBundleWithIRAMock(TransactionCase): self._bundle(self._get_asset(), False, False) # Touch the file and compile a third time - path = get_resource_path('test_assetsbundle', 'static', 'src', 'less', 'test_lessfile1.less') + path = get_resource_path('test_assetsbundle', 'static', 'src', 'scss', 'test_file1.scss') t = time.time() + 5 asset = self._get_asset() _touch(path, asset, t=t) diff --git a/odoo/addons/test_assetsbundle/views/views.xml b/odoo/addons/test_assetsbundle/views/views.xml index d953f930ce1..f98652a5b38 100644 --- a/odoo/addons/test_assetsbundle/views/views.xml +++ b/odoo/addons/test_assetsbundle/views/views.xml @@ -21,6 +21,6 @@ </template> <template id="test_assetsbundle.bundle3"> - <link rel="stylesheet" href="/test_assetsbundle/static/src/less/test_lessfile1.less"/> + <link rel="stylesheet" type="text/scss" href="/test_assetsbundle/static/src/scss/test_file1.scss"/> </template> </odoo> |