Unify #setDirection and #setLanguage

seanpdoyle · seanpdoyle · commit d49c8142f735 · 2025-11-09T23:07:37.000-05:00
Append the `#setDirection` implementation to the existing `#setLanguage`
private method.

Use `expect` rather than `assert` in the accompanying test coverage.
Remove the `nextEventNamed("turbo:load")` test synchronization in favor
of Playwright's underlying assertion retries.
diff --git a/src/core/drive/page_renderer.js b/src/core/drive/page_renderer.js
@@ -30,7 +30,6 @@ export class PageRenderer extends Renderer {
 
   async prepareToRender() {
     this.#setLanguage()
-    this.#setDirection()
     await this.mergeHead()
   }
 
@@ -61,19 +60,13 @@ export class PageRenderer extends Renderer {
 
   #setLanguage() {
     const { documentElement } = this.currentSnapshot
-    const { lang } = this.newSnapshot
+    const { dir, lang } = this.newSnapshot
 
     if (lang) {
       documentElement.setAttribute("lang", lang)
     } else {
       documentElement.removeAttribute("lang")
     }
-  }
-
-  #setDirection() {
-    const { documentElement } = this.currentSnapshot
-    const { dir } = this.newSnapshot
-
     if (dir) {
       documentElement.setAttribute("dir", dir)
     } else {
diff --git a/src/tests/fixtures/dir_rtl.html b/src/tests/fixtures/dir_rtl.html
@@ -1,12 +1,12 @@
 <!doctype html>
 <html dir="rtl">
-    <head>
-        <meta charset="utf-8" />
-        <title>Turbo</title>
-        <script src="/dist/turbo.es2017-umd.js" data-turbo-track="reload"></script>
-        <script src="/src/tests/fixtures/test.js"></script>
-    </head>
-    <body>
-        <h1>html[dir="rtl"]</h1>
-    </body>
+  <head>
+    <meta charset="utf-8" />
+    <title>Turbo</title>
+    <script src="/dist/turbo.es2017-umd.js" data-turbo-track="reload"></script>
+    <script src="/src/tests/fixtures/test.js"></script>
+  </head>
+  <body>
+    <h1>html[dir="rtl"]</h1>
+  </body>
 </html>
diff --git a/src/tests/functional/rendering_tests.js b/src/tests/functional/rendering_tests.js
@@ -203,9 +203,8 @@ test("changes the html[lang] attribute", async ({ page }) => {
 
 test("changes the html[dir] attribute", async ({ page }) => {
   await page.click("#dir-rtl")
-  await nextEventNamed(page, "turbo:load")
 
-  assert.equal(await page.getAttribute("html", "dir"), "rtl")
+  await expect(page.locator("html")).toHaveAttribute("dir", "rtl")
 })
 
 test("accumulates script elements in head", async ({ page }) => {
