Skip to content

Commit bd6d763

Browse files
committed
Fix tests
1 parent eff40e5 commit bd6d763

File tree

5 files changed

+6
-7
lines changed

5 files changed

+6
-7
lines changed

scaladoc/src/dotty/tools/scaladoc/site/LoadedTemplate.scala

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -49,6 +49,6 @@ case class LoadedTemplate(
4949

5050
val updatedSettings = templateFile.settings ++ ctx.projectWideProperties +
5151
("site" -> (getMap("site") + ("posts" -> posts))) + ("urls" -> sourceLinks.toMap) +
52-
("page" -> (getMap("page") + ("title" -> templateFile.title)))
52+
("page" -> (getMap("page") + ("title" -> templateFile.title.name)))
5353

5454
templateFile.resolveInner(RenderingContext(updatedSettings, ctx.layouts))(using ctx)

scaladoc/src/dotty/tools/scaladoc/site/StaticSiteContext.scala

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -139,7 +139,7 @@ class StaticSiteContext(
139139
case t: TemplateName.YamlDefined => t
140140
case _: TemplateName.FilenameDefined => TemplateName.SidebarDefined(title)
141141
case t: TemplateName.SidebarDefined => t // should never reach this path
142-
LoadedTemplate(template.copy(settings = template.settings + ("title" -> title), file = file, title = newTitle), children, file)
142+
LoadedTemplate(template.copy(settings = template.settings + ("title" -> newTitle.name), file = file, title = newTitle), children, file)
143143
case None =>
144144
LoadedTemplate(template.copy(settings = template.settings, file = file), children, file)
145145

scaladoc/test/dotty/tools/scaladoc/site/NavigationTest.scala

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,6 @@ class NavigationTest extends BaseHtmlTest:
2929
NavMenuTestEntry("Nested in a directory", "dir/nested.html", Nil)
3030
)),
3131
NavMenuTestEntry("Adoc", "Adoc.html", Seq()),
32-
NavMenuTestEntry("Basic test", "../index.html", Seq()),
3332
NavMenuTestEntry("API", "../api/index.html", Seq(
3433
NavMenuTestEntry("tests.site", "../api/tests/site.html", Seq(
3534
NavMenuTestEntry("BrokenLink", "../api/tests/site/BrokenLink.html", Nil),
@@ -47,4 +46,4 @@ class NavigationTest extends BaseHtmlTest:
4746
))
4847

4948
testNavMenu("docs/Adoc.html", topLevelNav)
50-
}
49+
}

scaladoc/test/dotty/tools/scaladoc/site/SiteGeneratationTest.scala

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@ class SiteGeneratationTest extends BaseHtmlTest:
4141
checkFile("docs/index.html")(title = projectName, header = s"$projectName in header")
4242

4343
def testMainIndexPage()(using ProjectContext) =
44-
checkFile("index.html")(title = "Basic test", header = "Header", parents = Seq(projectName), indexLinks)
44+
checkFile("index.html")(title = "Basic test", header = "Header", parents = Seq(), indexLinks)
4545

4646
def testApiPages(
4747
mainTitle: String = "API",
@@ -110,4 +110,4 @@ class SiteGeneratationTest extends BaseHtmlTest:
110110
"dir/nested.svg"
111111
)
112112
}
113-
}
113+
}

scaladoc/test/dotty/tools/scaladoc/site/TemplateFileTests.scala

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@ class TemplateFileTests:
4343
|code""".stripMargin
4444
) { t =>
4545
assertEquals(t.rawCode, "code")
46-
assertEquals(t.title, "myTitle")
46+
assertEquals(t.title.name, "myTitle")
4747
}
4848

4949

0 commit comments

Comments
 (0)