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

Fix url_text, take 3

Browse Source
This commit is contained in:
Florian Bruhin 2016-07-11 15:02:57 +02:00
parent 9b75e661e2
commit f46d6cbe27
2 changed files with 14 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
qutebrowser/mainwindow/statusbar/url.py
View File

@ -134,8 +134,11 @@ class UrlText(textbase.TextBase):
"""Setter to be used as a Qt slot. """Setter to be used as a Qt slot.
Args: Args:
url: The URL to set as QUrl. url: The URL to set as QUrl, or None.
""" """
if url is None:
self._normal_url = None
else:
self._normal_url = url.toDisplayString() self._normal_url = url.toDisplayString()
self._normal_url_type = UrlType.normal self._normal_url_type = UrlType.normal
self._update_url() self._update_url()

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

@ -51,17 +51,16 @@ def url_widget(qtbot, monkeypatch, config_stub):
return widget return widget
@pytest.mark.parametrize('url_text', [ @pytest.mark.parametrize('qurl', [
'http://abc123.com/this/awesome/url.html', QUrl('http://abc123.com/this/awesome/url.html'),
'https://supersecret.gov/nsa/files.txt', QUrl('https://supersecret.gov/nsa/files.txt'),
'Th1$ i$ n0t @ n0rm@L uRL! P@n1c! <-->',
None None
]) ])
def test_set_url(url_widget, url_text): def test_set_url(url_widget, qurl):
"""Test text displayed by the widget.""" """Test text displayed by the widget."""
url_widget.set_url(url_text) url_widget.set_url(qurl)
if url_text is not None: if qurl is not None:
assert url_widget.text() == url_text assert url_widget.text() == qurl.toDisplayString()
else: else:
assert url_widget.text() == "" assert url_widget.text() == ""
@ -107,7 +106,7 @@ def test_set_hover_url_encoded(url_widget, url_text, expected):
]) ])
def test_on_load_status_changed(url_widget, status, expected): def test_on_load_status_changed(url_widget, status, expected):
"""Test text when status is changed.""" """Test text when status is changed."""
url_widget.set_url('www.example.com') url_widget.set_url(QUrl('www.example.com'))
url_widget.on_load_status_changed(status.name) url_widget.on_load_status_changed(status.name)
assert url_widget._urltype == expected assert url_widget._urltype == expected
@ -154,5 +153,5 @@ def test_normal_url(url_widget, qurl, load_status, expected_status):
url_widget.on_load_status_changed(load_status.name) url_widget.on_load_status_changed(load_status.name)
url_widget.set_hover_url(qurl.toDisplayString()) url_widget.set_hover_url(qurl.toDisplayString())
url_widget.set_hover_url("") url_widget.set_hover_url("")
assert url_widget.text() == url_text assert url_widget.text() == qurl.toDisplayString()
assert url_widget._urltype == expected_status assert url_widget._urltype == expected_status