From 67b334fbaf7cfb0936666ea788d406a55a09754c Mon Sep 17 00:00:00 2001 From: Richard Campen Date: Mon, 27 Apr 2020 08:19:22 +1200 Subject: Fixed #31517 -- Fixed HashedFilesMixin.hashed_name() if hash of the file is None. --- tests/staticfiles_tests/storage.py | 5 +++++ tests/staticfiles_tests/test_storage.py | 9 +++++++++ 2 files changed, 14 insertions(+) (limited to 'tests') diff --git a/tests/staticfiles_tests/storage.py b/tests/staticfiles_tests/storage.py index b9cac3cd05..05fdec8db2 100644 --- a/tests/staticfiles_tests/storage.py +++ b/tests/staticfiles_tests/storage.py @@ -88,3 +88,8 @@ class ExtraPatternsStorage(ManifestStaticFilesStorage): ), ), ) + + +class NoneHashStorage(ManifestStaticFilesStorage): + def file_hash(self, name, content=None): + return None diff --git a/tests/staticfiles_tests/test_storage.py b/tests/staticfiles_tests/test_storage.py index c6f6e4fb4e..02704fcbe8 100644 --- a/tests/staticfiles_tests/test_storage.py +++ b/tests/staticfiles_tests/test_storage.py @@ -386,6 +386,15 @@ class TestCollectionManifestStorage(TestHashedFiles, CollectionTestCase): ) +@override_settings(STATICFILES_STORAGE='staticfiles_tests.storage.NoneHashStorage') +class TestCollectionNoneHashStorage(CollectionTestCase): + hashed_file_path = hashed_file_path + + def test_hashed_name(self): + relpath = self.hashed_file_path('cached/styles.css') + self.assertEqual(relpath, 'cached/styles.css') + + @override_settings(STATICFILES_STORAGE='staticfiles_tests.storage.SimpleStorage') class TestCollectionSimpleStorage(CollectionTestCase): hashed_file_path = hashed_file_path -- cgit v1.3