summaryrefslogtreecommitdiff
path: root/tests/staticfiles_tests
diff options
context:
space:
mode:
authorMariusz Felisiak <felisiak.mariusz@gmail.com>2021-11-05 12:11:18 +0100
committerGitHub <noreply@github.com>2021-11-05 12:11:18 +0100
commitba9ced3e9a643a05bc521f0a2e6d02e3569de374 (patch)
treedaf7b91d0ac846078de40afba761b8e981a42f56 /tests/staticfiles_tests
parentc6c6cd3c5ad9c36795bb120e521590424f034ae4 (diff)
downloaddjango-ba9ced3e9a643a05bc521f0a2e6d02e3569de374.tar.gz
Fixed #33253 -- Reverted "Fixed #32319 -- Added ES module support to ManifestStaticFilesStorage."
This reverts commit 91e21836f667c784a8a63ab1f18d81f553e679cb. `export` and `import` directives have several syntax variants and not all of them were properly covered. Thanks Hervé Le Roy for the report.
Diffstat (limited to 'tests/staticfiles_tests')
-rw-r--r--tests/staticfiles_tests/project/documents/absolute_root.js2
-rw-r--r--tests/staticfiles_tests/project/documents/cached/module.js22
-rw-r--r--tests/staticfiles_tests/project/documents/cached/module_test.js5
-rw-r--r--tests/staticfiles_tests/project/documents/nested/js/nested.js1
-rw-r--r--tests/staticfiles_tests/test_storage.py46
5 files changed, 0 insertions, 76 deletions
diff --git a/tests/staticfiles_tests/project/documents/absolute_root.js b/tests/staticfiles_tests/project/documents/absolute_root.js
deleted file mode 100644
index 4561b0389b..0000000000
--- a/tests/staticfiles_tests/project/documents/absolute_root.js
+++ /dev/null
@@ -1,2 +0,0 @@
-const rootConst = "root";
-export default rootConst;
diff --git a/tests/staticfiles_tests/project/documents/cached/module.js b/tests/staticfiles_tests/project/documents/cached/module.js
deleted file mode 100644
index 7380ad7856..0000000000
--- a/tests/staticfiles_tests/project/documents/cached/module.js
+++ /dev/null
@@ -1,22 +0,0 @@
-// Static imports.
-import rootConst from "/static/absolute_root.js";
-import testConst from "./module_test.js";
-import * as NewModule from "./module_test.js";
-import { testConst as alias } from "./module_test.js";
-import { firstConst, secondConst } from "./module_test.js";
-import {
- firstVar as firstVarAlias,
- secondVar as secondVarAlias
-} from "./module_test.js";
-import relativeModule from "../nested/js/nested.js";
-
-// Dynamic imports.
-const dynamicModule = import("./module_test.js");
-
-// Modules exports to aggregate modules.
-export * from "./module_test.js";
-export { testConst } from "./module_test.js";
-export {
- firstVar as firstVarAlias,
- secondVar as secondVarAlias
-} from "./module_test.js";
diff --git a/tests/staticfiles_tests/project/documents/cached/module_test.js b/tests/staticfiles_tests/project/documents/cached/module_test.js
deleted file mode 100644
index b832b4e8a7..0000000000
--- a/tests/staticfiles_tests/project/documents/cached/module_test.js
+++ /dev/null
@@ -1,5 +0,0 @@
-export const testConst = "test";
-export const firstConst = "first";
-export const secondConst = "second";
-export var firstVar = "test_1";
-export var SecondVar = "test_2";
diff --git a/tests/staticfiles_tests/project/documents/nested/js/nested.js b/tests/staticfiles_tests/project/documents/nested/js/nested.js
deleted file mode 100644
index 7646bbd17d..0000000000
--- a/tests/staticfiles_tests/project/documents/nested/js/nested.js
+++ /dev/null
@@ -1 +0,0 @@
-export default null;
diff --git a/tests/staticfiles_tests/test_storage.py b/tests/staticfiles_tests/test_storage.py
index 93335480be..41d98d4332 100644
--- a/tests/staticfiles_tests/test_storage.py
+++ b/tests/staticfiles_tests/test_storage.py
@@ -160,52 +160,6 @@ class TestHashedFiles:
self.assertIn(b"https://", relfile.read())
self.assertPostCondition()
- def test_module_import(self):
- relpath = self.hashed_file_path('cached/module.js')
- self.assertEqual(relpath, 'cached/module.91b9cf9935da.js')
- tests = [
- # Relative imports.
- b'import testConst from "./module_test.d489af3cf882.js";',
- b'import relativeModule from "../nested/js/nested.866475c46bb4.js";',
- b'import { firstConst, secondConst } from "./module_test.d489af3cf882.js";',
- # Absolute import.
- b'import rootConst from "/static/absolute_root.5586327fe78c.js";',
- # Dynamic import.
- b'const dynamicModule = import("./module_test.d489af3cf882.js");',
- # Creating a module object.
- b'import * as NewModule from "./module_test.d489af3cf882.js";',
- # Aliases.
- b'import { testConst as alias } from "./module_test.d489af3cf882.js";',
- b'import {\n'
- b' firstVar as firstVarAlias,\n'
- b' secondVar as secondVarAlias\n'
- b'} from "./module_test.d489af3cf882.js";',
- ]
- with storage.staticfiles_storage.open(relpath) as relfile:
- content = relfile.read()
- for module_import in tests:
- with self.subTest(module_import=module_import):
- self.assertIn(module_import, content)
- self.assertPostCondition()
-
- def test_aggregating_modules(self):
- relpath = self.hashed_file_path('cached/module.js')
- self.assertEqual(relpath, 'cached/module.91b9cf9935da.js')
- tests = [
- b'export * from "./module_test.d489af3cf882.js";',
- b'export { testConst } from "./module_test.d489af3cf882.js";',
- b'export {\n'
- b' firstVar as firstVarAlias,\n'
- b' secondVar as secondVarAlias\n'
- b'} from "./module_test.d489af3cf882.js";',
- ]
- with storage.staticfiles_storage.open(relpath) as relfile:
- content = relfile.read()
- for module_import in tests:
- with self.subTest(module_import=module_import):
- self.assertIn(module_import, content)
- self.assertPostCondition()
-
@override_settings(
STATICFILES_DIRS=[os.path.join(TEST_ROOT, 'project', 'loop')],
STATICFILES_FINDERS=['django.contrib.staticfiles.finders.FileSystemFinder'],