Increases specificity of webpack bundle test dir

Author: joaopslins

.gitignore

@@ -79,6 +79,7 @@ tests/venv/
 tests/venv3/
 tests/node_modules/
 tests/assets/bundles/
+tests/assets/django_webpack_loader_bundles/
 tests/webpack-stats.json
 tests/webpack-stats-app2.json
 

tests/app/settings.py

@@ -111,12 +111,12 @@
 WEBPACK_LOADER = {
     'DEFAULT': {
         'CACHE': False,
-        'BUNDLE_DIR_NAME': 'bundles/',
+        'BUNDLE_DIR_NAME': 'django_webpack_loader_bundles/',
         'STATS_FILE': os.path.join(BASE_DIR, 'webpack-stats.json'),
     },
     'APP2': {
         'CACHE': False,
-        'BUNDLE_DIR_NAME': 'bundles/',
+        'BUNDLE_DIR_NAME': 'django_webpack_loader_bundles/',
         'STATS_FILE': os.path.join(BASE_DIR, 'webpack-stats-app2.json'),
     },
     'NO_IGNORE_APP': {

tests/app/tests/test_custom_loaders.py

@@ -32,7 +32,7 @@ def test_bad_custom_loader(self):
         with self.settings(WEBPACK_LOADER={
             'DEFAULT': {
                 'CACHE': False,
-                'BUNDLE_DIR_NAME': 'bundles/',
+                'BUNDLE_DIR_NAME': 'django_webpack_loader_bundles/',
                 'LOADER_CLASS': loader_class
             }
         }):
@@ -54,7 +54,7 @@ def test_good_custom_loader(self):
         with self.settings(WEBPACK_LOADER={
             'DEFAULT': {
                 'CACHE': False,
-                'BUNDLE_DIR_NAME': 'bundles/',
+                'BUNDLE_DIR_NAME': 'django_webpack_loader_bundles/',
                 'LOADER_CLASS': loader_class,
             }
         }):

tests/app/tests/test_webpack.py

@@ -20,7 +20,7 @@
 from webpack_loader.utils import get_loader
 
 
-BUNDLE_PATH = os.path.join(settings.BASE_DIR, 'assets/bundles/')
+BUNDLE_PATH = os.path.join(settings.BASE_DIR, 'assets/django_webpack_loader_bundles/')
 DEFAULT_CONFIG = 'DEFAULT'
 
 
@@ -30,7 +30,7 @@ def setUp(self):
         self.cleanup_bundles_folder()
 
     def cleanup_bundles_folder(self):
-        rmtree('./assets/bundles', ignore_errors=True)
+        rmtree('./assets/django_webpack_loader_bundles', ignore_errors=True)
 
     def compile_bundles(self, config, wait=None):
         if wait:
@@ -44,7 +44,7 @@ def test_config_check(self):
         from webpack_loader.errors import BAD_CONFIG_ERROR
 
         with self.settings(WEBPACK_LOADER={
-                                'BUNDLE_DIR_NAME': 'bundles/',
+                                'BUNDLE_DIR_NAME': 'django_webpack_loader_bundles/',
                                 'STATS_FILE': 'webpack-stats.json',
                            }):
             errors = webpack_cfg_check(None)
@@ -69,8 +69,8 @@ def test_simple_and_css_extract(self):
         self.assertEqual(len(chunks), 1)
 
         files = assets['assets']
-        self.assertEqual(files['main.css']['path'], os.path.join(settings.BASE_DIR, 'assets/bundles/main.css'))
-        self.assertEqual(files['main.js']['path'], os.path.join(settings.BASE_DIR, 'assets/bundles/main.js'))
+        self.assertEqual(files['main.css']['path'], os.path.join(settings.BASE_DIR, 'assets/django_webpack_loader_bundles/main.css'))
+        self.assertEqual(files['main.js']['path'], os.path.join(settings.BASE_DIR, 'assets/django_webpack_loader_bundles/main.js'))
 
     def test_default_ignore_config_ignores_map_files(self):
         self.compile_bundles('webpack.config.sourcemaps.js')
@@ -95,8 +95,8 @@ def test_js_gzip_extract(self):
         self.assertEqual(len(chunks), 1)
 
         files = assets['assets']
-        self.assertEqual(files['main.css']['path'], os.path.join(settings.BASE_DIR, 'assets/bundles/main.css'))
-        self.assertEqual(files['main.js.gz']['path'], os.path.join(settings.BASE_DIR, 'assets/bundles/main.js.gz'))
+        self.assertEqual(files['main.css']['path'], os.path.join(settings.BASE_DIR, 'assets/django_webpack_loader_bundles/main.css'))
+        self.assertEqual(files['main.js.gz']['path'], os.path.join(settings.BASE_DIR, 'assets/django_webpack_loader_bundles/main.js.gz'))
 
     def test_static_url(self):
         self.compile_bundles('webpack.config.publicPath.js')
@@ -115,26 +115,26 @@ def test_code_spliting(self):
         self.assertEquals(len(chunks), 1)
 
         files = assets['assets']
-        self.assertEqual(files['main.js']['path'], os.path.join(settings.BASE_DIR, 'assets/bundles/main.js'))
-        self.assertEqual(files['vendors.js']['path'], os.path.join(settings.BASE_DIR, 'assets/bundles/vendors.js'))
+        self.assertEqual(files['main.js']['path'], os.path.join(settings.BASE_DIR, 'assets/django_webpack_loader_bundles/main.js'))
+        self.assertEqual(files['vendors.js']['path'], os.path.join(settings.BASE_DIR, 'assets/django_webpack_loader_bundles/vendors.js'))
 
     def test_templatetags(self):
         self.compile_bundles('webpack.config.simple.js')
         self.compile_bundles('webpack.config.app2.js')
         view = TemplateView.as_view(template_name='home.html')
         request = self.factory.get('/')
         result = view(request)
-        self.assertIn('<link type="text/css" href="/static/bundles/main.css" rel="stylesheet" />', result.rendered_content)
-        self.assertIn('<script type="text/javascript" src="/static/bundles/main.js" async charset="UTF-8"></script>', result.rendered_content)
+        self.assertIn('<link type="text/css" href="/static/django_webpack_loader_bundles/main.css" rel="stylesheet" />', result.rendered_content)
+        self.assertIn('<script type="text/javascript" src="/static/django_webpack_loader_bundles/main.js" async charset="UTF-8"></script>', result.rendered_content)
 
-        self.assertIn('<link type="text/css" href="/static/bundles/app2.css" rel="stylesheet" />', result.rendered_content)
-        self.assertIn('<script type="text/javascript" src="/static/bundles/app2.js" ></script>', result.rendered_content)
+        self.assertIn('<link type="text/css" href="/static/django_webpack_loader_bundles/app2.css" rel="stylesheet" />', result.rendered_content)
+        self.assertIn('<script type="text/javascript" src="/static/django_webpack_loader_bundles/app2.js" ></script>', result.rendered_content)
         self.assertIn('<img src="/static/my-image.png"/>', result.rendered_content)
 
         view = TemplateView.as_view(template_name='only_files.html')
         result = view(request)
-        self.assertIn("var contentCss = '/static/bundles/main.css'", result.rendered_content)
-        self.assertIn("var contentJS = '/static/bundles/main.js'", result.rendered_content)
+        self.assertIn("var contentCss = '/static/django_webpack_loader_bundles/main.css'", result.rendered_content)
+        self.assertIn("var contentJS = '/static/django_webpack_loader_bundles/main.js'", result.rendered_content)
 
         self.compile_bundles('webpack.config.publicPath.js')
         view = TemplateView.as_view(template_name='home.html')
@@ -173,8 +173,8 @@ def test_jinja2(self):
         with self.settings(**settings):
             request = self.factory.get('/')
             result = view(request)
-            self.assertIn('<link type="text/css" href="/static/bundles/main.css" rel="stylesheet" />', result.rendered_content)
-            self.assertIn('<script type="text/javascript" src="/static/bundles/main.js" async charset="UTF-8"></script>', result.rendered_content)
+            self.assertIn('<link type="text/css" href="/static/django_webpack_loader_bundles/main.css" rel="stylesheet" />', result.rendered_content)
+            self.assertIn('<script type="text/javascript" src="/static/django_webpack_loader_bundles/main.js" async charset="UTF-8"></script>', result.rendered_content)
 
     def test_reporting_errors(self):
         self.compile_bundles('webpack.config.error.js')

tests/webpack.config.error.js

@@ -8,7 +8,7 @@ module.exports = {
   context: __dirname,
   entry: './assets/js/bad_index',
   output: {
-      path: path.resolve('./assets/bundles/'),
+      path: path.resolve('./assets/django_webpack_loader_bundles/'),
       filename: "[name].js",
   },
 

tests/webpack.config.gzipTest.js

@@ -8,7 +8,7 @@ module.exports = {
   context: __dirname,
   entry: './assets/js/index',
   output: {
-      path: path.resolve('./assets/bundles/'),
+      path: path.resolve('./assets/django_webpack_loader_bundles/'),
       filename: "[name].js.gz"
   },
 

tests/webpack.config.simple.js

@@ -8,7 +8,7 @@ module.exports = {
   context: __dirname,
   entry: './assets/js/index',
   output: {
-      path: path.resolve('./assets/bundles/'),
+      path: path.resolve('./assets/django_webpack_loader_bundles/'),
       filename: "[name].js"
   },
 

tests/webpack.config.sourcemaps.js

@@ -9,7 +9,7 @@ module.exports = {
   entry: './assets/js/index',
   devtool: 'source-map',
   output: {
-      path: path.resolve('./assets/bundles/'),
+      path: path.resolve('./assets/django_webpack_loader_bundles/'),
       filename: "[name].js"
   },
 

tests/webpack.config.split.js

@@ -8,7 +8,7 @@ module.exports = {
   context: __dirname,
   entry: './assets/js/index',
   output: {
-      path: path.resolve('./assets/bundles/'),
+      path: path.resolve('./assets/django_webpack_loader_bundles/'),
       filename: "[name].js",
       chunkFilename: "[name].js"
   },