Implement `{% include 'template' %}` feature

2 files changed, 33 insertions, 13 deletions

diff --git a/doc-tool/test/dotty/tools/dottydoc/staticsite/PageTests.scala b/doc-tool/test/dotty/tools/dottydoc/staticsite/PageTests.scala
index 87358d738..6f20e28c2 100644
--- a/doc-tool/test/dotty/tools/dottydoc/staticsite/PageTests.scala
+++ b/doc-tool/test/dotty/tools/dottydoc/staticsite/PageTests.scala
@@ -15,6 +15,7 @@ class PageTests extends DottyDocTest {
          |---
          |
          |great""".stripMargin,
+      Map.empty,
       Map.empty
     )
 
@@ -33,7 +34,8 @@ class PageTests extends DottyDocTest {
          |---
          |
          |{{ content }}""".stripMargin,
-       Map("content" -> "Hello, world!")
+       Map("content" -> "Hello, world!"),
+       Map.empty
     )
 
     assert(
@@ -45,7 +47,8 @@ class PageTests extends DottyDocTest {
 
     val page2 = new MarkdownPage(
       """|{{ content }}""".stripMargin,
-      Map("content" -> "hello")
+      Map("content" -> "hello"),
+      Map.empty
     )
     assert(
       page2.yaml == Map(),
@@ -57,7 +60,8 @@ class PageTests extends DottyDocTest {
       """|{% if product.title == "Awesome Shoes" %}
          |These shoes are awesome!
          |{% endif %}""".stripMargin,
-      Map("product" -> Map("title" -> "Awesome Shoes").asJava)
+      Map("product" -> Map("title" -> "Awesome Shoes").asJava),
+      Map.empty
     )
 
     assertEquals(
@@ -67,7 +71,7 @@ class PageTests extends DottyDocTest {
   }
 
   @Test def simpleHtmlPage = {
-    val p1 = new HtmlPage("""<h1>{{ "hello, world!" }}</h1>""", Map.empty)
+    val p1 = new HtmlPage("""<h1>{{ "hello, world!" }}</h1>""", Map.empty, Map.empty)
     assert(p1.yaml == Map(), "non-empty yaml found")
     assertEquals("<h1>hello, world!</h1>", p1.html)
   }
@@ -79,6 +83,7 @@ class PageTests extends DottyDocTest {
          |---
          |
          |Hello, world!""".stripMargin,
+      Map.empty,
       Map.empty
     )
 
@@ -93,6 +98,7 @@ class PageTests extends DottyDocTest {
          |
          |
          |Hello, world!""".stripMargin,
+      Map.empty,
       Map.empty
     )
 
diff --git a/doc-tool/test/dotty/tools/dottydoc/staticsite/SiteTests.scala b/doc-tool/test/dotty/tools/dottydoc/staticsite/SiteTests.scala
index 2a8b6ac9b..0c6d232f5 100644
--- a/doc-tool/test/dotty/tools/dottydoc/staticsite/SiteTests.scala
+++ b/doc-tool/test/dotty/tools/dottydoc/staticsite/SiteTests.scala
@@ -6,6 +6,12 @@ import org.junit.Test
 import org.junit.Assert._
 
 class SiteTests extends DottyDocTest {
+  private def html(
+    str: String,
+    params: Map[String, AnyRef] = Map.empty,
+    includes: Map[String, String] = Map.empty
+  ) = new HtmlPage(str, params, includes)
+
   @Test def hasCorrectLayoutFiles = {
     val site = new Site(new java.io.File("../doc-tool/resources/"))
 
@@ -20,13 +26,12 @@ class SiteTests extends DottyDocTest {
   @Test def renderHelloInMainLayout = {
     val site = new Site(new java.io.File("../doc-tool/resources/"))
 
-    val renderedPage = site.render(new HtmlPage(
+    val renderedPage = site.render(html(
       """|---
          |layout: main
          |---
          |
-         |Hello, world!""".stripMargin,
-      Map.empty
+         |Hello, world!""".stripMargin
     ), Map.empty)
 
     assert(
@@ -40,12 +45,11 @@ class SiteTests extends DottyDocTest {
   @Test def renderMultipleTemplates = {
     val site = new Site(new java.io.File("../doc-tool/resources/"))
 
-    val renderedPage = site.render(new HtmlPage(
+    val renderedPage = site.render(html(
       """|---
          |layout: index
          |---
-         |Hello, world!""".stripMargin,
-      Map.empty
+         |Hello, world!""".stripMargin
     ), Map.empty)
 
     assert(
@@ -60,13 +64,12 @@ class SiteTests extends DottyDocTest {
   @Test def preservesPageYaml = {
     val site = new Site(new java.io.File("../doc-tool/resources/"))
 
-    val renderedPage = site.render(new HtmlPage(
+    val renderedPage = site.render(html(
       """|---
          |title: Hello, world
          |layout: index
          |---
-         |Hello, world!""".stripMargin,
-      Map.empty
+         |Hello, world!""".stripMargin
     ), Map.empty)
 
     assert(
@@ -78,4 +81,15 @@ class SiteTests extends DottyDocTest {
       "html page did not render properly"
     )
   }
+
+  @Test def include = {
+    val site = new Site(new java.io.File("../doc-tool/resources/"))
+
+    val renderedInclude = site.render(
+      html("""{% include "header.html" %}""", includes = site.includes),
+      Map.empty
+    )
+
+    assertEquals("<h1>Some header</h1>\n", renderedInclude)
+  }
 }