summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAntoine Catton <acatton@fusionbox.com>2014-08-04 11:11:14 +0200
committerAntoine Catton <acatton@fusionbox.com>2014-08-04 11:11:14 +0200
commit56c7db6e2b09f8913da9ee0d8d66cb38c11cdd32 (patch)
tree0e203e82724d7a3f9a8501d67b0e8c01ca9f2dd0
parentd7f1b849a04437a04443d68957717179b6b4d7d3 (diff)
downloaddjango-pyscss-56c7db6e2b09f8913da9ee0d8d66cb38c11cdd32.tar.gz
Add test for path conflictstest-for-path-conflicts
-rw-r--r--testproject/testproject/static/css/path_conflict.scss3
-rw-r--r--testproject/testproject/static/css/path_conflict/content.scss3
-rw-r--r--tests/test_scss.py7
3 files changed, 13 insertions, 0 deletions
diff --git a/testproject/testproject/static/css/path_conflict.scss b/testproject/testproject/static/css/path_conflict.scss
new file mode 100644
index 0000000..f672943
--- /dev/null
+++ b/testproject/testproject/static/css/path_conflict.scss
@@ -0,0 +1,3 @@
+.path_conflict {
+ color: #000000;
+}
diff --git a/testproject/testproject/static/css/path_conflict/content.scss b/testproject/testproject/static/css/path_conflict/content.scss
new file mode 100644
index 0000000..77c9d58
--- /dev/null
+++ b/testproject/testproject/static/css/path_conflict/content.scss
@@ -0,0 +1,3 @@
+.content {
+ color: #000000;
+}
diff --git a/tests/test_scss.py b/tests/test_scss.py
index bc9c6ef..e2e8748 100644
--- a/tests/test_scss.py
+++ b/tests/test_scss.py
@@ -29,6 +29,9 @@ with open(os.path.join(settings.BASE_DIR, 'testproject', 'static', 'css', 'css_f
with open(os.path.join(settings.BASE_DIR, 'testproject', 'static', 'css', '_baz.scss')) as f:
BAZ_CONTENTS = f.read()
+with open(os.path.join(settings.BASE_DIR, 'testproject', 'static', 'css', 'path_conflict.scss')) as f:
+ PATH_CONFLICT_CONTENTS = f.read()
+
class CompilerTestMixin(object):
def setUp(self):
@@ -84,6 +87,10 @@ class ImportTestMixin(CompilerTestMixin):
actual = self.compiler.compile(scss_string='@import "/css/baz";')
self.assertEqual(clean_css(actual), clean_css(BAZ_CONTENTS))
+ def test_import_conflict(self):
+ actual = self.compiler.compile(scss_string='@import "/css/path_conflict";')
+ self.assertEqual(clean_css(actual), clean_css(PATH_CONFLICT_CONTENTS))
+
@override_settings(DEBUG=True)
class FindersImportTest(ImportTestMixin, TestCase):