Move tests into separate top-level directory

dabapps · Feb 14, 2020 · 07e122f · 07e122f
1 parent 739d888
commit 07e122f
Show file tree

Hide file tree

Showing 13 changed files with 35 additions and 7 deletions.
diff --git a/manage.py b/manage.py
@@ -3,7 +3,7 @@
 import sys
 
 if __name__ == "__main__":
-    os.environ.setdefault("DJANGO_SETTINGS_MODULE", "wrapwith.tests.settings")
+    os.environ.setdefault("DJANGO_SETTINGS_MODULE", "tests.settings")
 
     from django.core.management import execute_from_command_line
 

diff --git a/scripts/check b/scripts/check
@@ -1,5 +1,5 @@
 #!/bin/sh -e
 
 flake8 wrapwith
-isort --check --diff --recursive wrapwith
-black --check --diff wrapwith
+isort --check --diff --recursive wrapwith tests
+black --check --diff wrapwith tests
diff --git a/scripts/lint b/scripts/lint
@@ -1,5 +1,5 @@
 #!/bin/sh -e
 
-autoflake --in-place --recursive wrapwith
-isort --recursive wrapwith
-black wrapwith
+autoflake --in-place --recursive wrapwith tests
+isort --recursive wrapwith tests
+black wrapwith tests
diff --git a/wrapwith/tests/__init__.py → tests/__init__.py b/wrapwith/tests/__init__.py → tests/__init__.py
diff --git a/wrapwith/tests/settings.py → tests/settings.py b/wrapwith/tests/settings.py → tests/settings.py
@@ -1,6 +1,6 @@
 INSTALLED_APPS = [
     "wrapwith",
-    "wrapwith.tests",
+    "tests",
 ]
 
 TEMPLATES = [

diff --git a/wrapwith/tests/templates/arguments.html → tests/templates/arguments.html b/wrapwith/tests/templates/arguments.html → tests/templates/arguments.html
diff --git a/tests/templates/nested.html b/tests/templates/nested.html
@@ -0,0 +1,11 @@
+{% load wrapwith %}
+
+{% wrapwith "wrappers/divwitharg.html" with class="outer" %}
+   hello!
+   {% wrapwith "wrappers/divwitharg.html" with class="inner1" %}
+   inner1
+   {% endwrapwith %}
+   {% wrapwith "wrappers/divwitharg.html" with class="inner2" %}
+   inner2
+   {% endwrapwith %}
+{% endwrapwith %}
diff --git a/wrapwith/tests/templates/only.html → tests/templates/only.html b/wrapwith/tests/templates/only.html → tests/templates/only.html
diff --git a/wrapwith/tests/templates/simple.html → tests/templates/simple.html b/wrapwith/tests/templates/simple.html → tests/templates/simple.html
diff --git a/wrapwith/tests/templates/wrappers/div.html → tests/templates/wrappers/div.html b/wrapwith/tests/templates/wrappers/div.html → tests/templates/wrappers/div.html
diff --git a/.../tests/templates/wrappers/divwitharg.html → tests/templates/wrappers/divwitharg.html b/.../tests/templates/wrappers/divwitharg.html → tests/templates/wrappers/divwitharg.html
diff --git a/...ts/templates/wrappers/divwithargonly.html → tests/templates/wrappers/divwithargonly.html b/...ts/templates/wrappers/divwithargonly.html → tests/templates/wrappers/divwithargonly.html
diff --git a/wrapwith/tests/tests.py → tests/tests.py b/wrapwith/tests/tests.py → tests/tests.py
@@ -14,3 +14,20 @@ def test_arguments(self):
     def test_only(self):
         rendered = render_to_string("only.html")
         self.assertHTMLEqual(rendered, "<div class='arg'>hello!</div>")
+
+    def test_nested(self):
+        rendered = render_to_string("nested.html")
+        self.assertHTMLEqual(
+            rendered,
+            """
+            <div class="outer">
+                hello!
+                <div class="inner1">
+                    inner1
+                </div>
+                <div class="inner2">
+                    inner2
+                </div>
+            </div>
+        """,
+        )