rnhmjoj/qutebrowser
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Fix test_on_tab_changed in statusbar.url tests

Browse Source 
- The invalid URL will now get encoded when using QUrl.
- The check for a None url_text is somewhat pointless as I don't think
  this can ever happen in the real circumstances.
This commit is contained in:
Florian Bruhin 2016-07-08 10:17:53 +02:00
parent 37d20023b3
commit 7c6dd60f35
1 changed files with 11 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
tests/unit/mainwindow/statusbar/test_url.py
View File

@ -113,24 +113,19 @@ def test_on_load_status_changed(url_widget, status, expected):
assert url_widget._urltype == expected assert url_widget._urltype == expected
@pytest.mark.parametrize('load_status, url_text', [ @pytest.mark.parametrize('load_status, qurl', [
(url.UrlType.success, 'http://abc123.com/this/awesome/url.html'), (url.UrlType.success, QUrl('http://abc123.com/this/awesome/url.html')),
(url.UrlType.success, 'http://reddit.com/r/linux'), (url.UrlType.success, QUrl('http://reddit.com/r/linux')),
(url.UrlType.success_https, 'www.google.com'), (url.UrlType.success_https, QUrl('www.google.com')),
(url.UrlType.success_https, 'https://supersecret.gov/nsa/files.txt'), (url.UrlType.success_https, QUrl('https://supersecret.gov/nsa/files.txt')),
(url.UrlType.warn, 'www.shadysite.org/some/path/to/file/with/issues.htm'), (url.UrlType.warn, QUrl('www.shadysite.org/some/path/to/file/with/issues.htm')),
(url.UrlType.error, 'Th1$ i$ n0t @ n0rm@L uRL! P@n1c! <-->'), (url.UrlType.error, QUrl('invalid::/url')),
(url.UrlType.error, None)
]) ])
def test_on_tab_changed(url_widget, stubs, qapp, load_status, url_text): def test_on_tab_changed(url_widget, stubs, qapp, load_status, qurl):
tab_widget = stubs.FakeWebTab(load_status=load_status, url=QUrl(url_text)) tab_widget = stubs.FakeWebTab(load_status=load_status, url=qurl)
url_widget.on_tab_changed(tab_widget) url_widget.on_tab_changed(tab_widget)
if url_text is not None:
assert url_widget._urltype == load_status assert url_widget._urltype == load_status
assert url_widget.text() == url_text assert url_widget.text() == qurl.toDisplayString()
else:
assert url_widget._urltype == url.UrlType.normal
assert url_widget.text() == ''
@pytest.mark.parametrize('url_text, load_status, expected_status', [ @pytest.mark.parametrize('url_text, load_status, expected_status', [