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

Strip trailing newlines from pastebin URL

Browse Source
This commit is contained in:
Florian Bruhin 2018-07-08 22:09:56 +02:00
parent ae32b79d54
commit 274b66ec46
2 changed files with 8 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
qutebrowser/utils/version.py
View File

@ -484,6 +484,7 @@ def pastebin_version(pbclient=None):
def _on_paste_version_success(url): def _on_paste_version_success(url):
global pastebin_url global pastebin_url
url = url.strip()
_yank_url(url) _yank_url(url)
pbclient.deleteLater() pbclient.deleteLater()
pastebin_url = url pastebin_url = url

13
tests/unit/utils/test_version.py
View File

@ -987,11 +987,12 @@ def test_pastebin_version(pbclient, message_mock, monkeypatch, qtbot):
monkeypatch.setattr('qutebrowser.utils.utils.log_clipboard', True) monkeypatch.setattr('qutebrowser.utils.utils.log_clipboard', True)
version.pastebin_version(pbclient) version.pastebin_version(pbclient)
pbclient.success.emit("test") pbclient.success.emit("https://www.example.com/\n")
msg = message_mock.getmsg(usertypes.MessageLevel.info) msg = message_mock.getmsg(usertypes.MessageLevel.info)
assert msg.text == "Version url test yanked to clipboard." expected_text = "Version url https://www.example.com/ yanked to clipboard."
assert version.pastebin_url == "test" assert msg.text == expected_text
assert version.pastebin_url == "https://www.example.com/"
def test_pastebin_version_twice(pbclient, monkeypatch): def test_pastebin_version_twice(pbclient, monkeypatch):
@ -1000,16 +1001,16 @@ def test_pastebin_version_twice(pbclient, monkeypatch):
lambda: "dummy") lambda: "dummy")
version.pastebin_version(pbclient) version.pastebin_version(pbclient)
pbclient.success.emit("test") pbclient.success.emit("https://www.example.com/\n")
pbclient.url = None pbclient.url = None
pbclient.data = None pbclient.data = None
version.pastebin_url = "test2" version.pastebin_url = "https://www.example.org/"
version.pastebin_version(pbclient) version.pastebin_version(pbclient)
assert pbclient.url is None assert pbclient.url is None
assert pbclient.data is None assert pbclient.data is None
assert version.pastebin_url == "test2" assert version.pastebin_url == "https://www.example.org/"
def test_pastebin_version_error(pbclient, caplog, message_mock, monkeypatch): def test_pastebin_version_error(pbclient, caplog, message_mock, monkeypatch):