Fixed #26402 -- Added relative path support in include/extends template tags.

17 files changed, 143 insertions, 0 deletions

diff --git a/tests/template_tests/relative_templates/dir1/dir2/inc1.html b/tests/template_tests/relative_templates/dir1/dir2/inc1.html
new file mode 100644
index 0000000000..a854bef662
--- /dev/null
+++ b/tests/template_tests/relative_templates/dir1/dir2/inc1.html
@@ -0,0 +1 @@
+{% include "./../../three.html" %}
diff --git a/tests/template_tests/relative_templates/dir1/dir2/inc2.html b/tests/template_tests/relative_templates/dir1/dir2/inc2.html
new file mode 100644
index 0000000000..376f47975e
--- /dev/null
+++ b/tests/template_tests/relative_templates/dir1/dir2/inc2.html
@@ -0,0 +1 @@
+{% include "./include_content.html" %}
diff --git a/tests/template_tests/relative_templates/dir1/dir2/include_content.html b/tests/template_tests/relative_templates/dir1/dir2/include_content.html
new file mode 100644
index 0000000000..132d8b8145
--- /dev/null
+++ b/tests/template_tests/relative_templates/dir1/dir2/include_content.html
@@ -0,0 +1 @@
+dir2 include
diff --git a/tests/template_tests/relative_templates/dir1/dir2/one.html b/tests/template_tests/relative_templates/dir1/dir2/one.html
new file mode 100644
index 0000000000..11e6424213
--- /dev/null
+++ b/tests/template_tests/relative_templates/dir1/dir2/one.html
@@ -0,0 +1,3 @@
+{% extends "./../../one.html" %}
+
+{% block content %}{{ block.super }} dir2 one{% endblock %}
diff --git a/tests/template_tests/relative_templates/dir1/looped.html b/tests/template_tests/relative_templates/dir1/looped.html
new file mode 100644
index 0000000000..8e9d8ac4e5
--- /dev/null
+++ b/tests/template_tests/relative_templates/dir1/looped.html
@@ -0,0 +1,3 @@
+{% extends "./dir2/../looped.html" %}
+
+{% block content %}{{ block.super }} dir1 three{% endblock %}
diff --git a/tests/template_tests/relative_templates/dir1/one.html b/tests/template_tests/relative_templates/dir1/one.html
new file mode 100644
index 0000000000..3b89c23330
--- /dev/null
+++ b/tests/template_tests/relative_templates/dir1/one.html
@@ -0,0 +1,3 @@
+{% extends "./../one.html" %}
+
+{% block content %}{{ block.super }} dir1 one{% endblock %}
diff --git a/tests/template_tests/relative_templates/dir1/one1.html b/tests/template_tests/relative_templates/dir1/one1.html
new file mode 100644
index 0000000000..9f60109975
--- /dev/null
+++ b/tests/template_tests/relative_templates/dir1/one1.html
@@ -0,0 +1,3 @@
+{% extends './../one.html' %}
+
+{% block content %}{{ block.super }} dir1 one{% endblock %}
diff --git a/tests/template_tests/relative_templates/dir1/one2.html b/tests/template_tests/relative_templates/dir1/one2.html
new file mode 100644
index 0000000000..1ca9f17b21
--- /dev/null
+++ b/tests/template_tests/relative_templates/dir1/one2.html
@@ -0,0 +1,3 @@
+{% extends '../one.html' %}
+
+{% block content %}{{ block.super }} dir1 one{% endblock %}
diff --git a/tests/template_tests/relative_templates/dir1/one3.html b/tests/template_tests/relative_templates/dir1/one3.html
new file mode 100644
index 0000000000..3df6195fbb
--- /dev/null
+++ b/tests/template_tests/relative_templates/dir1/one3.html
@@ -0,0 +1,3 @@
+{% extends "../one.html" %}
+
+{% block content %}{{ block.super }} dir1 one{% endblock %}
diff --git a/tests/template_tests/relative_templates/dir1/three.html b/tests/template_tests/relative_templates/dir1/three.html
new file mode 100644
index 0000000000..d8e3c3cb74
--- /dev/null
+++ b/tests/template_tests/relative_templates/dir1/three.html
@@ -0,0 +1,3 @@
+{% extends "./dir2/../../three.html" %}
+
+{% block content %}{{ block.super }} dir1 three{% endblock %}
diff --git a/tests/template_tests/relative_templates/dir1/two.html b/tests/template_tests/relative_templates/dir1/two.html
new file mode 100644
index 0000000000..b6542b8a3e
--- /dev/null
+++ b/tests/template_tests/relative_templates/dir1/two.html
@@ -0,0 +1,3 @@
+{% extends "./dir2/one.html" %}
+
+{% block content %}{{ block.super }} dir1 two{% endblock %}
diff --git a/tests/template_tests/relative_templates/error_extends.html b/tests/template_tests/relative_templates/error_extends.html
new file mode 100644
index 0000000000..83e41b2999
--- /dev/null
+++ b/tests/template_tests/relative_templates/error_extends.html
@@ -0,0 +1,3 @@
+{% extends "./../two.html" %}
+
+{% block content %}{{ block.super }} one{% endblock %}
diff --git a/tests/template_tests/relative_templates/error_include.html b/tests/template_tests/relative_templates/error_include.html
new file mode 100644
index 0000000000..a5efe30fbc
--- /dev/null
+++ b/tests/template_tests/relative_templates/error_include.html
@@ -0,0 +1 @@
+{% include "./../three.html" %}
diff --git a/tests/template_tests/relative_templates/one.html b/tests/template_tests/relative_templates/one.html
new file mode 100644
index 0000000000..9ced0ff8e4
--- /dev/null
+++ b/tests/template_tests/relative_templates/one.html
@@ -0,0 +1,3 @@
+{% extends "./two.html" %}
+
+{% block content %}{{ block.super }} one{% endblock %}
diff --git a/tests/template_tests/relative_templates/three.html b/tests/template_tests/relative_templates/three.html
new file mode 100644
index 0000000000..360aeeea5e
--- /dev/null
+++ b/tests/template_tests/relative_templates/three.html
@@ -0,0 +1 @@
+{% block content %}three{% endblock %}
diff --git a/tests/template_tests/relative_templates/two.html b/tests/template_tests/relative_templates/two.html
new file mode 100644
index 0000000000..5fb317db93
--- /dev/null
+++ b/tests/template_tests/relative_templates/two.html
@@ -0,0 +1,3 @@
+{% extends "./three.html" %}
+
+{% block content %}{{ block.super }} two{% endblock %}
diff --git a/tests/template_tests/test_extends_relative.py b/tests/template_tests/test_extends_relative.py
new file mode 100644
index 0000000000..12324f0df6
--- /dev/null
+++ b/tests/template_tests/test_extends_relative.py
@@ -0,0 +1,105 @@
+import os
+
+from django.template import Context, Engine, TemplateSyntaxError
+from django.test import SimpleTestCase
+
+from .utils import ROOT
+
+RELATIVE = os.path.join(ROOT, 'relative_templates')
+
+
+class ExtendsRelativeBehaviorTests(SimpleTestCase):
+
+    def test_normal_extend(self):
+        engine = Engine(dirs=[RELATIVE])
+        template = engine.get_template('one.html')
+        output = template.render(Context({}))
+        self.assertEqual(output.strip(), 'three two one')
+
+    def test_dir1_extend(self):
+        engine = Engine(dirs=[RELATIVE])
+        template = engine.get_template('dir1/one.html')
+        output = template.render(Context({}))
+        self.assertEqual(output.strip(), 'three two one dir1 one')
+
+    def test_dir1_extend1(self):
+        engine = Engine(dirs=[RELATIVE])
+        template = engine.get_template('dir1/one1.html')
+        output = template.render(Context({}))
+        self.assertEqual(output.strip(), 'three two one dir1 one')
+
+    def test_dir1_extend2(self):
+        engine = Engine(dirs=[RELATIVE])
+        template = engine.get_template('dir1/one2.html')
+        output = template.render(Context({}))
+        self.assertEqual(output.strip(), 'three two one dir1 one')
+
+    def test_dir1_extend3(self):
+        engine = Engine(dirs=[RELATIVE])
+        template = engine.get_template('dir1/one3.html')
+        output = template.render(Context({}))
+        self.assertEqual(output.strip(), 'three two one dir1 one')
+
+    def test_dir2_extend(self):
+        engine = Engine(dirs=[RELATIVE])
+        template = engine.get_template('dir1/dir2/one.html')
+        output = template.render(Context({}))
+        self.assertEqual(output.strip(), 'three two one dir2 one')
+
+    def test_extend_error(self):
+        engine = Engine(dirs=[RELATIVE])
+        msg = (
+            "The relative path '\"./../two.html\"' points outside the file "
+            "hierarchy that template 'error_extends.html' is in."
+        )
+        with self.assertRaisesMessage(TemplateSyntaxError, msg):
+            engine.render_to_string('error_extends.html')
+
+
+class IncludeRelativeBehaviorTests(SimpleTestCase):
+
+    def test_normal_include(self):
+        engine = Engine(dirs=[RELATIVE])
+        template = engine.get_template('dir1/dir2/inc2.html')
+        output = template.render(Context({}))
+        self.assertEqual(output.strip(), 'dir2 include')
+
+    def test_dir2_include(self):
+        engine = Engine(dirs=[RELATIVE])
+        template = engine.get_template('dir1/dir2/inc1.html')
+        output = template.render(Context({}))
+        self.assertEqual(output.strip(), 'three')
+
+    def test_include_error(self):
+        engine = Engine(dirs=[RELATIVE])
+        msg = (
+            "The relative path '\"./../three.html\"' points outside the file "
+            "hierarchy that template 'error_include.html' is in."
+        )
+        with self.assertRaisesMessage(TemplateSyntaxError, msg):
+            engine.render_to_string('error_include.html')
+
+
+class ExtendsMixedBehaviorTests(SimpleTestCase):
+
+    def test_mixing1(self):
+        engine = Engine(dirs=[RELATIVE])
+        template = engine.get_template('dir1/two.html')
+        output = template.render(Context({}))
+        self.assertEqual(output.strip(), 'three two one dir2 one dir1 two')
+
+    def test_mixing2(self):
+        engine = Engine(dirs=[RELATIVE])
+        template = engine.get_template('dir1/three.html')
+        output = template.render(Context({}))
+        self.assertEqual(output.strip(), 'three dir1 three')
+
+    def test_mixing_loop(self):
+        engine = Engine(dirs=[RELATIVE])
+        msg = (
+            "The relative path '\"./dir2/../looped.html\"' was translated to "
+            "template name \'dir1/looped.html\', the same template in which "
+            "the tag appears."
+        )
+        with self.assertRaisesMessage(TemplateSyntaxError, msg):
+            engine.render_to_string('dir1/looped.html')