Fix turbo stream link setting the src of a turbo frame container (#968)

hotwired · Sep 13, 2023 · 750f649 · 750f649
1 parent d9821c4
commit 750f649
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 1 deletion.
diff --git a/src/observers/form_link_click_observer.js b/src/observers/form_link_click_observer.js
@@ -20,7 +20,7 @@ export class FormLinkClickObserver {
   willFollowLinkToLocation(link, location, originalEvent) {
     return (
       this.delegate.willSubmitFormLinkToLocation(link, location, originalEvent) &&
-      link.hasAttribute("data-turbo-method")
+      (link.hasAttribute("data-turbo-method") || link.hasAttribute("data-turbo-stream"))
     )
   }
 

diff --git a/src/tests/functional/frame_tests.js b/src/tests/functional/frame_tests.js
@@ -82,6 +82,19 @@ test("test following a link sets the frame element's [src]", async ({ page }) =>
   assert.equal(src.searchParams.get("key"), "value", "[src] attribute encodes query parameters")
 })
 
+test("test following a link doesn't set the frame element's [src] if the link has [data-turbo-stream]", async ({ page }) => {
+  await page.goto("/src/tests/fixtures/form.html")
+
+  const originalSrc = await page.getAttribute("#frame", "src")
+
+  await page.click("#stream-link-get-method-inside-frame")
+  await nextBeat()
+
+  const newSrc = await page.getAttribute("#frame", "src")
+
+  assert.equal(originalSrc, newSrc, "the turbo-frame src should not change after clicking the link")
+})
+
 test("test a frame whose src references itself does not infinitely loop", async ({ page }) => {
   await page.click("#frame-self")