diff options
| author | Florian Bruhin <git@the-compiler.org> | 2018-07-08 22:09:56 +0200 |
|---|---|---|
| committer | Florian Bruhin <git@the-compiler.org> | 2018-07-10 16:09:44 +0200 |
| commit | 39704648913e8824435ec2fcb16183ce26069e59 (patch) | |
| tree | 1f440f6fd4736e20c371e5cc501b1999bd152d20 | |
| parent | af2eabdbfa860300f5eee76182b01bae6e67897f (diff) | |
| download | qutebrowser-39704648913e8824435ec2fcb16183ce26069e59.tar.gz qutebrowser-39704648913e8824435ec2fcb16183ce26069e59.zip | |
Strip trailing newlines from pastebin URL
(cherry picked from commit 274b66ec46799799fc4e8cc4015a6369ac3e4042)
| -rw-r--r-- | qutebrowser/utils/version.py | 1 | ||||
| -rw-r--r-- | tests/unit/utils/test_version.py | 13 |
2 files changed, 8 insertions, 6 deletions
diff --git a/qutebrowser/utils/version.py b/qutebrowser/utils/version.py index 570d1f887..a2d949635 100644 --- a/qutebrowser/utils/version.py +++ b/qutebrowser/utils/version.py @@ -484,6 +484,7 @@ def pastebin_version(pbclient=None): def _on_paste_version_success(url): global pastebin_url + url = url.strip() _yank_url(url) pbclient.deleteLater() pastebin_url = url diff --git a/tests/unit/utils/test_version.py b/tests/unit/utils/test_version.py index e2fbf8f1c..2120a4b97 100644 --- a/tests/unit/utils/test_version.py +++ b/tests/unit/utils/test_version.py @@ -987,11 +987,12 @@ def test_pastebin_version(pbclient, message_mock, monkeypatch, qtbot): monkeypatch.setattr('qutebrowser.utils.utils.log_clipboard', True) version.pastebin_version(pbclient) - pbclient.success.emit("test") + pbclient.success.emit("https://www.example.com/\n") msg = message_mock.getmsg(usertypes.MessageLevel.info) - assert msg.text == "Version url test yanked to clipboard." - assert version.pastebin_url == "test" + expected_text = "Version url https://www.example.com/ yanked to clipboard." + assert msg.text == expected_text + assert version.pastebin_url == "https://www.example.com/" def test_pastebin_version_twice(pbclient, monkeypatch): @@ -1000,16 +1001,16 @@ def test_pastebin_version_twice(pbclient, monkeypatch): lambda: "dummy") version.pastebin_version(pbclient) - pbclient.success.emit("test") + pbclient.success.emit("https://www.example.com/\n") pbclient.url = None pbclient.data = None - version.pastebin_url = "test2" + version.pastebin_url = "https://www.example.org/" version.pastebin_version(pbclient) assert pbclient.url 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): |