From e55ef9726a7b9e12df854a86b561054df4a42825 Mon Sep 17 00:00:00 2001
From: Piero Toffanin <pt@masseranolabs.com>
Date: Thu, 27 Apr 2023 15:22:08 -0400
Subject: [PATCH] Fix tests

---
 app/tests/test_theme.py | 36 ++++--------------------------------
 webodm/settings.py      |  1 +
 2 files changed, 5 insertions(+), 32 deletions(-)

diff --git a/app/tests/test_theme.py b/app/tests/test_theme.py
index f5186d8e..fe9aca53 100644
--- a/app/tests/test_theme.py
+++ b/app/tests/test_theme.py
@@ -26,33 +26,19 @@ class TestSettings(BootTestCase):
         # There shouldn't be a footer by default
         self.assertFalse("<footer>" in body)
 
-        # Find the theme.scss file
-        matches = re.search(r'/static/(CACHE/css/theme\.[\w\d]+\.css)', body)
-        self.assertTrue(matches is not None, "Found theme.css")
-
-        # We can find it in the file system
-        css_file = finders.find(matches.group(1))
-        self.assertTrue(os.path.exists(css_file), "theme.css exists in file system")
-
-        css_content = ""
-        with open(css_file, "r") as f:
-            css_content = f.read()
-
         # A strong purple color is not part of the default theme
         purple = "8400ff"
-        self.assertFalse(purple in css_content)
+        self.assertFalse(purple in body)
 
         # But colors from the theme are
         theme = load_settings()["SETTINGS"].theme
-        self.assertTrue(theme.primary in css_content)
+        self.assertTrue(theme.primary in body)
 
         # Let's change the theme
         theme.primary = purple # add color
         theme.html_footer = "<p>hello</p>"
         theme.save()
 
-        # A new cache file should have been created for the CSS
-
         # Get a page
         res = c.get('/dashboard/', follow=True)
         body = res.content.decode("utf-8")
@@ -60,22 +46,8 @@ class TestSettings(BootTestCase):
         # We now have a footer
         self.assertTrue("<footer><p>hello</p></footer>" in body)
 
-        # Find the theme.scss file
-        matches = re.search(r'/static/(CACHE/css/theme\.[\w\d]+\.css)', body)
-        self.assertTrue(matches is not None, "Found theme.css")
-
-        new_css_file = finders.find(matches.group(1))
-        self.assertTrue(os.path.exists(new_css_file), "new theme.css exists in file system")
-
-        # It's not the same file
-        self.assertTrue(new_css_file != css_file, "It's a new file")
-
-        # Purple color is in there
-        css_content = ""
-        with open(new_css_file, "r") as f:
-            css_content = f.read()
-
-        self.assertTrue(purple in css_content)
+        # Purple is in body also
+        self.assertTrue(purple in body)
 
 
 
diff --git a/webodm/settings.py b/webodm/settings.py
index 278b0b49..aff1e75d 100644
--- a/webodm/settings.py
+++ b/webodm/settings.py
@@ -335,6 +335,7 @@ COMPRESS_PRECOMPILERS = (
     ('text/x-scss', 'django_libsass.SassCompiler'),
 )
 COMPRESS_ENABLED = True
+COMPRESS_MTIME_DELAY = 0
 
 # Sass
 def theme(color):