-
Notifications
You must be signed in to change notification settings - Fork 28
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
client: fix problems with the browser history
The browser history of the client never *really* worked. When you were redirected to a Lona app from an external site, you couldn't go back by clicking on the back button. When you were three links into an Lona app and refreshed the tab, the history before the refresh was unreachable. Previously, both client1 and client2 created a new history entry, using `history.pushState`, when a new view started, regardless the reason of the view starting. So initial setup, refreshes, and reconnects also created history items. This is not correct! `history.pushState` should only be called when you want to *extend* the browser history, beyond the normal history behaviour. This patch limits all calls to `history.pushState` to cases of actual in-app navigation, and adds a test to check the now corrected behaviour. Signed-off-by: Florian Scherf <[email protected]>
- Loading branch information
Showing
5 changed files
with
116 additions
and
20 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,94 @@ | ||
| import pytest | ||
|
|
||
|
|
||
| @pytest.mark.parametrize('client_version', [1, 2]) | ||
| @pytest.mark.parametrize('browser_name', ['chromium', 'firefox', 'webkit']) | ||
| async def test_client_history( | ||
| browser_name, | ||
| client_version, | ||
| lona_app_context, | ||
| ): | ||
|
|
||
| """ | ||
| This test checks if the browser history works correctly by navigating | ||
| a browser page using the back and forward "buttons". | ||
| """ | ||
|
|
||
| from playwright.async_api import async_playwright | ||
|
|
||
| from lona.html import HTML, H1, A | ||
| from lona import View | ||
|
|
||
| def setup_app(app): | ||
|
|
||
| @app.route('/<title>') | ||
| class TestView(View): | ||
| def handle_request(self, request): | ||
| return HTML( | ||
| H1(request.match_info['title']), | ||
| A('foo', href='/foo', _id='foo'), | ||
| A('bar', href='/bar', _id='bar'), | ||
| A('baz', href='/baz', _id='baz'), | ||
| ) | ||
|
|
||
| @app.route('/') | ||
| class Index(View): | ||
| def handle_request(self, request): | ||
| return HTML( | ||
| H1('index'), | ||
| A('foo', href='/foo', _id='foo'), | ||
| A('bar', href='/bar', _id='bar'), | ||
| A('baz', href='/baz', _id='baz'), | ||
| ) | ||
|
|
||
| context = await lona_app_context(setup_app) | ||
|
|
||
| async with async_playwright() as p: | ||
| browser = await p.chromium.launch() | ||
| browser_context = await browser.new_context() | ||
| page = await browser_context.new_page() | ||
|
|
||
| # external site, about:blank | ||
| await page.goto('about:blank') | ||
| await page.wait_for_url('about:blank') | ||
|
|
||
| # / | ||
| await page.goto(context.make_url('/')) | ||
| await page.wait_for_url('/') | ||
| await page.wait_for_selector('h1:has-text("index")') | ||
|
|
||
| # /foo | ||
| await page.click('#foo') | ||
| await page.wait_for_url('/foo') | ||
| await page.wait_for_selector('h1:has-text("foo")') | ||
|
|
||
| # /bar | ||
| await page.click('#bar') | ||
| await page.wait_for_url('/bar') | ||
| await page.wait_for_selector('h1:has-text("bar")') | ||
|
|
||
| # back to /foo | ||
| await page.go_back() | ||
| await page.wait_for_url('/foo') | ||
| await page.wait_for_selector('h1:has-text("foo")') | ||
|
|
||
| # forward to /bar | ||
| await page.go_forward() | ||
| await page.wait_for_url('/bar') | ||
| await page.wait_for_selector('h1:has-text("bar")') | ||
|
|
||
| # back to / | ||
| await page.go_back() | ||
| await page.go_back() | ||
| await page.wait_for_url('/') | ||
| await page.wait_for_selector('h1:has-text("index")') | ||
|
|
||
| # back to external site | ||
| await page.go_back() | ||
| await page.wait_for_url('about:blank') | ||
|
|
||
| # forward to /foo | ||
| await page.go_forward() | ||
| await page.go_forward() | ||
| await page.wait_for_url('/foo') | ||
| await page.wait_for_selector('h1:has-text("foo")') |