Implement refresh fix

hotwired · Apr 23, 2024 · 1521f68 · 1521f68
1 parent bfca516
commit 1521f68
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 3 deletions.
diff --git a/src/core/session.js b/src/core/session.js
@@ -109,7 +109,8 @@ export class Session {
 
   refresh(url, requestId) {
     const isRecentRequest = requestId && this.recentRequests.has(requestId)
-    if (!isRecentRequest) {
+    const isCurrentUrl = url === document.baseURI
+    if (!isRecentRequest && isCurrentUrl) {
       this.visit(url, { action: "replace", shouldCacheSnapshot: false })
     }
   }

diff --git a/src/tests/functional/page_refresh_stream_action_tests.js b/src/tests/functional/page_refresh_stream_action_tests.js
@@ -55,6 +55,7 @@ test("debounce stream page refreshes", async ({ page }) => {
 })
 
 test("debounced refresh of stale URL does not hijack new location navigated to", async ({ page }) => {
+  await setLongerPageRefreshDebouncePeriod(page)
   const urlBeforeVisit = page.url()
 
   await page.click("#refresh button")
@@ -79,6 +80,6 @@ async function fetchRequestId(page) {
   })
 }
 
-async function visitLocation(page, location) {
-  return page.evaluate((location) => window.Turbo.visit(location), location)
+async function setLongerPageRefreshDebouncePeriod(page, period = 500) {
+  return page.evaluate((period) => window.Turbo.session.pageRefreshDebouncePeriod = period, period)
 }