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

Return Promise<void> from FrameElement.reload #661

Merged
merged 2 commits into from Aug 1, 2022
Merged

Return Promise<void> from FrameElement.reload #661

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
f64957b
Return `Promise<void>` from `FrameElement.reload`
seanpdoyle Aug 1, 2022
962d27c
Resolve flaky navigation tests
seanpdoyle Aug 1, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
3 changes: 2 additions & 1 deletion src/elements/frame_element.ts
View file
Open in desktop
Expand Up @@ -62,11 +62,12 @@ export class FrameElement extends HTMLElement {
this.delegate.disconnect()
}

reload() {
reload(): Promise<void> {
const { src } = this
this.removeAttribute("complete")
this.src = null
this.src = src
return this.loaded
}

attributeChangedCallback(name: string) {
Expand Down
9 changes: 4 additions & 5 deletions src/tests/functional/loading_tests.ts
View file
Open in desktop
Expand Up @@ -3,6 +3,7 @@ import { assert } from "chai"
import {
attributeForSelector,
hasSelector,
nextAttributeMutationNamed,
nextBeat,
nextBody,
nextEventNamed,
Expand Down Expand Up @@ -103,18 +104,16 @@ test("test changing src attribute on a frame with loading=eager navigates", asyn
})

test("test reloading a frame reloads the content", async ({ page }) => {
await nextBeat()

await page.click("#loading-eager summary")
await nextBeat()
await nextEventOnTarget(page, "frame", "turbo:frame-load")

const frameContent = "#loading-eager turbo-frame#frame h2"
assert.ok(await hasSelector(page, frameContent))
assert.ok(await hasSelector(page, "#loading-eager turbo-frame[complete]"), "has [complete] attribute")
assert.equal(await nextAttributeMutationNamed(page, "frame", "complete"), "", "has [complete] attribute")

await page.evaluate(() => (document.querySelector("#loading-eager turbo-frame") as any)?.reload())
assert.ok(await hasSelector(page, frameContent))
assert.ok(await hasSelector(page, "#loading-eager turbo-frame:not([complete])"), "clears [complete] attribute")
assert.equal(await nextAttributeMutationNamed(page, "frame", "complete"), null, "clears [complete] attribute")
})

test("test navigating away from a page does not reload its frames", async ({ page }) => {
Expand Down
13 changes: 8 additions & 5 deletions src/tests/functional/navigation_tests.ts
View file
Open in desktop
Expand Up @@ -11,6 +11,7 @@ import {
nextEventNamed,
noNextEventNamed,
pathname,
readEventLogs,
search,
selectorHasFocus,
visitAction,
Expand All @@ -21,6 +22,7 @@ import {

test.beforeEach(async ({ page }) => {
await page.goto("/src/tests/fixtures/navigation.html")
await readEventLogs(page)
})

test("test navigating renders a progress bar", async ({ page }) => {
Expand Down Expand Up @@ -129,8 +131,8 @@ test("test following a same-origin POST form[data-turbo-action=replace]", async
})

test("test following a same-origin POST form button[data-turbo-action=replace]", async ({ page }) => {
page.click("#same-origin-replace-form-submitter-post button")
await nextBody(page)
await page.click("#same-origin-replace-form-submitter-post button")
await nextEventNamed(page, "turbo:load")

assert.equal(pathname(page.url()), "/src/tests/fixtures/one.html")
assert.equal(await visitAction(page), "replace")
Expand Down Expand Up @@ -339,10 +341,11 @@ test("test correct referrer header", async ({ page }) => {
})

test("test double-clicking on a link", async ({ page }) => {
page.click("#delayed-link")
page.click("#delayed-link")
await page.click("#delayed-link", { clickCount: 2 })
await nextBeat()

await nextEventNamed(page, "turbo:load")

await nextBody(page, 1200)
assert.equal(pathname(page.url()), "/__turbo/delayed_response")
assert.equal(await visitAction(page), "advance")
})
Expand Down