Ticket #18857: django_staticfiles.patch

tests/regressiontests/staticfiles_tests/tests.py

@@ -349 +349 @@
     pass
 
 
+def temp_staticfiles_dirs(*files):
+    """Copy `files` from STATICFILES_DIRS to a temporary directory
+
+    Also, override settings to use that STATICFILES_DIRS"""
+
+    tmp_static_dir = tempfile.mkdtemp(dir=os.environ['DJANGO_TEST_TEMP_DIR'])
+
+    def my_decorator(testcase):
+        @override_settings(**dict(TEST_SETTINGS,
+            STATICFILES_STORAGE='django.contrib.staticfiles.storage.CachedStaticFilesStorage',
+            STATICFILES_DIRS = (tmp_static_dir,),
+            DEBUG=False))
+        def wrapped(self):
+            self._tmp_static_dir = tmp_static_dir
+            self.addCleanup(shutil.rmtree, tmp_static_dir,
+                    ignore_errors=True, onerror=rmtree_errorhandler)
+            for fn in files:
+                new_dst = os.path.join(tmp_static_dir, fn)
+                try:
+                    os.makedirs(os.path.dirname(new_dst))
+                except OSError:
+                    # it's fine if directory already exists
+                    pass
+                shutil.copy(finders.find(fn), new_dst)
+            return testcase(self)
+        return wrapped
+    return my_decorator
+
 # we set DEBUG to False here since the template tag wouldn't work otherwise
 @override_settings(**dict(TEST_SETTINGS,
     STATICFILES_STORAGE='django.contrib.staticfiles.storage.CachedStaticFilesStorage',
@@ -389 +417 @@
             self.assertNotIn(b"cached/other.css", content)
             self.assertIn(b"other.d41d8cd98f00.css", content)
 
+    def add_trailing_whitespace(self, fn):
+        filename = os.path.join(TEST_ROOT, 'project', 'documents', fn)
+        orig_contents = open(filename, 'r').read()
+        def cleanup_fun():
+            with open(filename, 'w') as f:
+                f.write(orig_contents)
+        self.addCleanup(cleanup_fun)
+        #filename = os.path.join(settings.STATICFILES_DIRS[0], fn)
+        with open(filename, 'a') as f:
+            f.write(b' ')
+
+    #@temp_staticfiles_dirs("cached/styles.css", "cached/other.css")
+    def test_both_changed(self):
+        relpath1 = self.cached_file_path("cached/styles.css")
+        self.assertEqual("cached/styles.93b1147e8552.css", relpath1)
+
+        self.add_trailing_whitespace("cached/styles.css")
+        self.add_trailing_whitespace("cached/other.css")
+
+        # if you uncomment this, test passes
+        #self.run_collectstatic()
+        self.run_collectstatic()
+
+        relpath2 = self.cached_file_path("cached/styles.css")
+        self.assertNotEqual(relpath1, relpath2)
+        with storage.staticfiles_storage.open(relpath2) as relfile:
+            content = relfile.read()
+            self.assertNotIn(b"other.css", content)
+            self.assertNotIn(b"other.d41d8cd98f00.css", content)
+            self.assertIn(b"other.7215ee9c7d9d.css", content) # md5(' ')[:12]
+
+    #@temp_staticfiles_dirs("cached/styles.css", "cached/other.css")
+    def test_content_changed(self):
+        """Change dependent file and test if ancestor changes properly.
+
+        styles.css depends on other.css, which is initially empty.
+        1. Generate styles.css
+        2. Modify other.css
+        3. Re-generate styles.css and verify link to other.css has changed
+        """
+        relpath1 = self.cached_file_path("cached/styles.css")
+        self.assertEqual(relpath1, "cached/styles.93b1147e8552.css")
+
+        self.add_trailing_whitespace("cached/other.css")
+
+        self.run_collectstatic()
+
+        relpath2 = self.cached_file_path("cached/styles.css")
+        self.assertNotEqual(relpath1, relpath2)
+        with storage.staticfiles_storage.open(relpath2) as other:
+            content = relfile.read()
+            self.assertNotIn(b"other.css", content)
+            self.assertNotIn(b"other.d41d8cd98f00.css", content)
+            self.assertIn(b"other.9dd4e461268c.css", content)
+
     def test_path_ignored_completely(self):
         relpath = self.cached_file_path("cached/css/ignored.css")
         self.assertEqual(relpath, "cached/css/ignored.6c77f2643390.css")