From b37431976cdc39ad46ae4fc60b12be6e1f993bd2 Mon Sep 17 00:00:00 2001
From: Simon Willison <swillison@gmail.com>
Date: Wed, 7 Oct 2020 15:16:41 -0700
Subject: [PATCH] custom pages tests templates now in repo

---
 tests/test_custom_pages.py                   | 38 +++-----------------
 tests/test_templates/pages/202.html          |  1 +
 tests/test_templates/pages/about.html        |  1 +
 tests/test_templates/pages/atom.html         |  1 +
 tests/test_templates/pages/headers.html      |  1 +
 tests/test_templates/pages/nested/nest.html  |  1 +
 tests/test_templates/pages/redirect.html     |  1 +
 tests/test_templates/pages/redirect2.html    |  1 +
 tests/test_templates/pages/request.html      |  1 +
 tests/test_templates/pages/route_{name}.html |  2 ++
 10 files changed, 15 insertions(+), 33 deletions(-)
 create mode 100644 tests/test_templates/pages/202.html
 create mode 100644 tests/test_templates/pages/about.html
 create mode 100644 tests/test_templates/pages/atom.html
 create mode 100644 tests/test_templates/pages/headers.html
 create mode 100644 tests/test_templates/pages/nested/nest.html
 create mode 100644 tests/test_templates/pages/redirect.html
 create mode 100644 tests/test_templates/pages/redirect2.html
 create mode 100644 tests/test_templates/pages/request.html
 create mode 100644 tests/test_templates/pages/route_{name}.html

diff --git a/tests/test_custom_pages.py b/tests/test_custom_pages.py
index 89e59a75..f6180c16 100644
--- a/tests/test_custom_pages.py
+++ b/tests/test_custom_pages.py
@@ -1,41 +1,13 @@
+import pathlib
 import pytest
 from .fixtures import make_app_client
 
 
 @pytest.fixture(scope="session")
-def custom_pages_client(tmp_path_factory):
-    template_dir = tmp_path_factory.mktemp("page-templates")
-    pages_dir = template_dir / "pages"
-    pages_dir.mkdir()
-    (pages_dir / "about.html").write_text("ABOUT! view_name:{{ view_name }}", "utf-8")
-    (pages_dir / "request.html").write_text("path:{{ request.path }}", "utf-8")
-    (pages_dir / "202.html").write_text("{{ custom_status(202) }}202!", "utf-8")
-    (pages_dir / "headers.html").write_text(
-        '{{ custom_header("x-this-is-foo", "foo") }}FOO'
-        '{{ custom_header("x-this-is-bar", "bar") }}BAR',
-        "utf-8",
-    )
-    (pages_dir / "atom.html").write_text(
-        '{{ custom_header("content-type", "application/xml") }}<?xml ...>',
-        "utf-8",
-    )
-    (pages_dir / "redirect.html").write_text(
-        '{{ custom_redirect("/example") }}', "utf-8"
-    )
-    (pages_dir / "redirect2.html").write_text(
-        '{{ custom_redirect("/example", 301) }}', "utf-8"
-    )
-    (pages_dir / "route_{name}.html").write_text(
-        """
-        {% if name == "OhNo" %}{{ raise_404("Oh no") }}{% endif %}
-        <p>Hello from {{ name }}</p>
-        """,
-        "utf-8",
-    )
-    nested_dir = pages_dir / "nested"
-    nested_dir.mkdir()
-    (nested_dir / "nest.html").write_text("Nest!", "utf-8")
-    with make_app_client(template_dir=str(template_dir)) as client:
+def custom_pages_client():
+    with make_app_client(
+        template_dir=str(pathlib.Path(__file__).parent / "test_templates")
+    ) as client:
         yield client
 
 
diff --git a/tests/test_templates/pages/202.html b/tests/test_templates/pages/202.html
new file mode 100644
index 00000000..43a313b2
--- /dev/null
+++ b/tests/test_templates/pages/202.html
@@ -0,0 +1 @@
+{{ custom_status(202) }}202!
\ No newline at end of file
diff --git a/tests/test_templates/pages/about.html b/tests/test_templates/pages/about.html
new file mode 100644
index 00000000..11d78862
--- /dev/null
+++ b/tests/test_templates/pages/about.html
@@ -0,0 +1 @@
+ABOUT! view_name:{{ view_name }}
\ No newline at end of file
diff --git a/tests/test_templates/pages/atom.html b/tests/test_templates/pages/atom.html
new file mode 100644
index 00000000..1c7faafd
--- /dev/null
+++ b/tests/test_templates/pages/atom.html
@@ -0,0 +1 @@
+{{ custom_header("content-type", "application/xml") }}<?xml ...>
\ No newline at end of file
diff --git a/tests/test_templates/pages/headers.html b/tests/test_templates/pages/headers.html
new file mode 100644
index 00000000..8a59d4aa
--- /dev/null
+++ b/tests/test_templates/pages/headers.html
@@ -0,0 +1 @@
+{{ custom_header("x-this-is-foo", "foo") }}FOO{{ custom_header("x-this-is-bar", "bar") }}BAR
\ No newline at end of file
diff --git a/tests/test_templates/pages/nested/nest.html b/tests/test_templates/pages/nested/nest.html
new file mode 100644
index 00000000..5510f99e
--- /dev/null
+++ b/tests/test_templates/pages/nested/nest.html
@@ -0,0 +1 @@
+Nest!
\ No newline at end of file
diff --git a/tests/test_templates/pages/redirect.html b/tests/test_templates/pages/redirect.html
new file mode 100644
index 00000000..36a71554
--- /dev/null
+++ b/tests/test_templates/pages/redirect.html
@@ -0,0 +1 @@
+{{ custom_redirect("/example") }}
\ No newline at end of file
diff --git a/tests/test_templates/pages/redirect2.html b/tests/test_templates/pages/redirect2.html
new file mode 100644
index 00000000..b7ae092a
--- /dev/null
+++ b/tests/test_templates/pages/redirect2.html
@@ -0,0 +1 @@
+{{ custom_redirect("/example", 301) }}
\ No newline at end of file
diff --git a/tests/test_templates/pages/request.html b/tests/test_templates/pages/request.html
new file mode 100644
index 00000000..aa8e0b62
--- /dev/null
+++ b/tests/test_templates/pages/request.html
@@ -0,0 +1 @@
+path:{{ request.path }}
\ No newline at end of file
diff --git a/tests/test_templates/pages/route_{name}.html b/tests/test_templates/pages/route_{name}.html
new file mode 100644
index 00000000..42bd1e04
--- /dev/null
+++ b/tests/test_templates/pages/route_{name}.html
@@ -0,0 +1,2 @@
+{% if name == "OhNo" %}{{ raise_404("Oh no") }}{% endif %}
+<p>Hello from {{ name }}</p>
\ No newline at end of file