Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Use 'will render' false for action 'replace' after GET redirect #516

Merged
merged 7 commits into from
Jun 19, 2022
Merged

Use 'will render' false for action 'replace' after GET redirect #516

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
6ba1181
fix(visit): will render false for action 'replace' after redirect
blrB Jan 20, 2022
ba5a8a3
feat(eager frame): add test for check fetch eager frame count
blrB Jan 20, 2022
5df3d7d
Merge branch 'main' into double_rendering_for_get_redirect
dhh Apr 30, 2022
03b0f35
ref(tests): fix eslint errors
blrB Apr 30, 2022
a1224e9
ref(test): fix eslint Insert errors
blrB Apr 30, 2022
47d4e66
ref(eslint): fix all errors from eslint in branch
blrB Apr 30, 2022
17145d7
Merge branch 'hotwired:main' into double_rendering_for_get_redirect
blrB May 3, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions src/core/drive/visit.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -281,6 +281,7 @@ export class Visit implements FetchRequestDelegate {
if (this.redirectedToLocation && !this.followedRedirect && this.response?.redirected) {
this.adapter.visitProposedToLocation(this.redirectedToLocation, {
action: "replace",
willRender: false,
response: this.response,
})
this.followedRedirect = true
Expand Down
2 changes: 2 additions & 0 deletions src/tests/fixtures/frames.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -121,5 +121,7 @@ <h2>Frames: #nested-child</h2>
<hr class="push-off-screen">
<input id="below-the-fold-input">
<a id="below-the-fold-link-frame-action" data-turbo-action="advance" data-turbo-frame="frame" href="/src/tests/fixtures/frames/frame.html">Navigate #frame</a>

<a id="link-to-eager-loaded-frame" href="/__turbo/redirect?path=/src/tests/fixtures/page_with_eager_frame.html">Eager-loaded frame after GET redirect</a>
</body>
</html>
3 changes: 3 additions & 0 deletions src/tests/fixtures/frames/frame_for_eager.html
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
<turbo-frame id="eager-loaded-frame" >
<h2>Eager-loaded frame: Loaded</h2>
</turbo-frame>
19 changes: 19 additions & 0 deletions src/tests/fixtures/page_with_eager_frame.html
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,19 @@
<!DOCTYPE html>
<html id="html" data-skip-event-details="turbo:before-render">
<head>
<meta charset="utf-8">
<title>Frame</title>
<script src="/dist/turbo.es2017-umd.js" data-turbo-track="reload"></script>
<script src="/src/tests/fixtures/test.js"></script>
</head>
<body>
<h1>Eager-loaded frame</h1>

<turbo-frame id="eager-loaded-frame" src="/src/tests/fixtures/frames/frame_for_eager.html" loading="eager">
<h2>Eager-loaded frame: NOT Loaded...</h2>
</turbo-frame>


<a href="/src/tests/fixtures/frames.html">Page /src/tests/fixtures/frames.html</a>
</body>
</html>
23 changes: 23 additions & 0 deletions src/tests/functional/frame_tests.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -579,6 +579,29 @@ export class FrameTests extends TurboDriveTestCase {
this.assert.ok(await this.nextEventOnTarget("frame", "turbo:before-fetch-response"))
}

async "test navigating a eager frame with a link[method=get] that does not fetch eager frame twice"() {
await this.clickSelector("#link-to-eager-loaded-frame")

await this.nextBeat

const eventLogs = await this.eventLogChannel.read()
const fetchLogs = eventLogs.filter(
([name, options]) =>
name == "turbo:before-fetch-request" &&
options?.url?.includes("/src/tests/fixtures/frames/frame_for_eager.html")
)
this.assert.equal(fetchLogs.length, 1)

const src = (await this.attributeForSelector("#eager-loaded-frame", "src")) ?? ""
this.assert.ok(src.includes("/src/tests/fixtures/frames/frame_for_eager.html"), "updates src attribute")
this.assert.equal(await (await this.querySelector("h1")).getVisibleText(), "Eager-loaded frame")
this.assert.equal(
await (await this.querySelector("#eager-loaded-frame h2")).getVisibleText(),
"Eager-loaded frame: Loaded"
)
this.assert.equal(await this.pathname, "/src/tests/fixtures/page_with_eager_frame.html")
}

async withoutChangingEventListenersCount(callback: () => void) {
const name = "eventListenersAttachedToDocument"
const setup = () => {
Expand Down