diff --git a/src/core/frames/frame_controller.js b/src/core/frames/frame_controller.js index 5940ba761..f06241ba0 100644 --- a/src/core/frames/frame_controller.js +++ b/src/core/frames/frame_controller.js @@ -321,7 +321,7 @@ export class FrameController { } } - async #visit(url) { + #visit(url) { const request = new FetchRequest(this, FetchMethod.get, url, new URLSearchParams(), this.element) this.#currentFetchRequest?.cancel() @@ -333,7 +333,7 @@ export class FrameController { this.#currentFetchRequest = null resolve() } - request.perform() + return request.perform() }) } diff --git a/src/http/fetch_request.js b/src/http/fetch_request.js index 3d79f24ae..6f3b73322 100644 --- a/src/http/fetch_request.js +++ b/src/http/fetch_request.js @@ -148,9 +148,9 @@ export class FetchRequest { if (event.defaultPrevented) { this.delegate.requestPreventedHandlingResponse(this, fetchResponse) } else if (fetchResponse.succeeded) { - this.delegate.requestSucceededWithResponse(this, fetchResponse) + await this.delegate.requestSucceededWithResponse(this, fetchResponse) } else { - this.delegate.requestFailedWithResponse(this, fetchResponse) + await this.delegate.requestFailedWithResponse(this, fetchResponse) } return fetchResponse } diff --git a/src/tests/functional/frame_tests.js b/src/tests/functional/frame_tests.js index b090aff8a..915a6a0f3 100644 --- a/src/tests/functional/frame_tests.js +++ b/src/tests/functional/frame_tests.js @@ -608,9 +608,9 @@ test("navigating pushing URL state from a frame navigation fires events", async await nextEventOnTarget(page, "frame", "turbo:before-fetch-response") await nextEventOnTarget(page, "frame", "turbo:frame-render") await nextEventOnTarget(page, "frame", "turbo:frame-load") - assert.notOk(await nextAttributeMutationNamed(page, "frame", "aria-busy"), "removes aria-busy from the ") - assert.equal(await nextAttributeMutationNamed(page, "html", "aria-busy"), "true", "sets aria-busy on the ") + + assert.notOk(await nextAttributeMutationNamed(page, "frame", "aria-busy"), "removes aria-busy from the ") await nextEventOnTarget(page, "html", "turbo:before-visit") await nextEventOnTarget(page, "html", "turbo:visit") await nextEventOnTarget(page, "html", "turbo:before-cache")