Merge pull request #1306 from seanpdoyle/turbo-session-config-properties

Delegate `Turbo.session` properties to `Turbo.config`
hotwired · Aug 30, 2024 · 7ae9546 · 7ae9546
2 parents 4d65288 + 391452f
commit 7ae9546
Show file tree

Hide file tree

Showing 4 changed files with 38 additions and 3 deletions.
diff --git a/src/core/session.js b/src/core/session.js
@@ -144,6 +144,22 @@ export class Session {
     return config.drive.progressBarDelay
   }
 
+  set drive(value) {
+    config.drive.enabled = value
+  }
+
+  get drive() {
+    return config.drive.enabled
+  }
+
+  set formMode(value) {
+    config.forms.mode = value
+  }
+
+  get formMode() {
+    return config.forms.mode
+  }
+
   get location() {
     return this.history.location
   }

diff --git a/src/tests/fixtures/drive_disabled.html b/src/tests/fixtures/drive_disabled.html
@@ -15,7 +15,7 @@
       })
     </script>
     <script>
-      Turbo.config.drive = false
+      Turbo.config.drive.enabled = false
     </script>
   </head>
   <body>

diff --git a/src/tests/functional/frame_tests.js b/src/tests/functional/frame_tests.js
@@ -163,7 +163,7 @@ test("successfully following a link to a page without a matching frame shows an
 
   await page.click("#missing-frame-link")
 
-  assert.match(await page.innerText("#missing"), /Content missing/)
+  await expect(page.locator("#missing")).toHaveText("Content missing")
 
   assert.exists(error)
   assert.include(error.message, `The response (200) did not contain the expected <turbo-frame id="missing">`)
@@ -195,7 +195,7 @@ test("failing to follow a link to a page without a matching frame shows an error
 
   await page.click("#missing-page-link")
 
-  assert.match(await page.innerText("#missing"), /Content missing/)
+  await expect(page.locator("#missing")).toHaveText("Content missing")
 
   assert.exists(error)
   assert.include(error.message, `The response (404) did not contain the expected <turbo-frame id="missing">`)

diff --git a/src/tests/unit/export_tests.js b/src/tests/unit/export_tests.js
@@ -19,9 +19,28 @@ test("Turbo interface", () => {
   assert.equal(typeof Turbo.cache.clear, "function")
   assert.equal(typeof Turbo.navigator, "object")
   assert.equal(typeof Turbo.session, "object")
+  assert.equal(typeof Turbo.session.drive, "boolean")
+  assert.equal(typeof Turbo.session.formMode, "string")
   assert.equal(typeof Turbo.fetch, "function")
 })
 
+test("Session interface", () => {
+  const { session, config } = Turbo
+
+  assert.equal(true, session.drive)
+  assert.equal(true, config.drive.enabled)
+  assert.equal("on", session.formMode)
+  assert.equal("on", config.forms.mode)
+
+  session.drive = false
+  session.formMode = "off"
+
+  assert.equal(false, session.drive)
+  assert.equal(false, config.drive.enabled)
+  assert.equal("off", session.formMode)
+  assert.equal("off", config.forms.mode)
+})
+
 test("StreamActions interface", () => {
   assert.equal(typeof StreamActions, "object")
 })