Rename and group toghether modules for docker static files handling

moccu · Oct 27, 2016 · e581799 · e581799
1 parent 29bff98
commit e581799
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 7 deletions.
diff --git a/barbeque/static_files/__init__.py b/barbeque/static_files/__init__.py
diff --git a/barbeque/static.py → barbeque/static_files/middleware.py b/barbeque/static.py → barbeque/static_files/middleware.py
diff --git a/barbeque/storage.py → barbeque/static_files/storage.py b/barbeque/storage.py → barbeque/static_files/storage.py
diff --git a/barbeque/tests/test_static.py → barbeque/tests/test_static_files.py b/barbeque/tests/test_static.py → barbeque/tests/test_static_files.py
@@ -7,7 +7,7 @@
 from django.shortcuts import redirect
 from django.conf.urls import url
 
-from barbeque.static import ServeStaticFileMiddleware
+from barbeque.static_files.middleware import ServeStaticFileMiddleware
 
 
 def foo_view(request):
@@ -34,7 +34,7 @@ def setup(self, settings):
         # settings.STATICFILES_STORAGE = (
         #     'django.contrib.staticfiles.storage.ManifestStaticFilesStorage')
         settings.STATICFILES_STORAGE = (
-            'barbeque.storage.CompactManifestStaticFilesStorage')
+            'barbeque.static_files.storage.CompactManifestStaticFilesStorage')
 
     @pytest.fixture
     def patch_settings(self, settings):
@@ -47,10 +47,10 @@ def patch_settings(self, settings):
             'compressor.finders.CompressorFinder',
         )
         settings.MIDDLEWARE_CLASSES = [
-            'barbeque.static.ServeStaticFileMiddleware',
+            'barbeque.static_files.middleware.ServeStaticFileMiddleware',
         ]
         settings.INSTALLED_APPS = settings.INSTALLED_APPS + ('django.contrib.staticfiles',)
-        settings.ROOT_URLCONF = 'barbeque.tests.test_static'
+        settings.ROOT_URLCONF = 'barbeque.tests.test_static_files'
 
     def test_file_exists(self, rf):
         request = rf.get('/static/test.jpg')
@@ -88,7 +88,7 @@ def test_redirect_other(self, rf):
         response = middleware.process_response(request, redirect)
         assert response == redirect
 
-    @mock.patch('barbeque.static.ServeStaticFileMiddleware.process_response')
+    @mock.patch('barbeque.static_files.middleware.ServeStaticFileMiddleware.process_response')
     def test_new_style_middleware(self, process_response_mock, rf):
         request = rf.get('/static/test.jpg')
         get_response_mock = mock.Mock()
@@ -134,10 +134,10 @@ def patch_settings(self, settings):
             'compressor.finders.CompressorFinder',
         )
         settings.MIDDLEWARE_CLASSES = [
-            'barbeque.static.ServeStaticFileMiddleware',
+            'barbeque.static_files.middleware.ServeStaticFileMiddleware',
         ]
         settings.INSTALLED_APPS = settings.INSTALLED_APPS + ('django.contrib.staticfiles',)
-        settings.ROOT_URLCONF = 'barbeque.tests.test_static'
+        settings.ROOT_URLCONF = 'barbeque.tests.test_static_files'
 
     def test_unhash_file_name(self):
         middleware = ServeStaticFileMiddleware()