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

Fix checking for primary selection.

Browse Source
This commit is contained in:
Florian Bruhin 2015-11-02 08:07:25 +01:00
parent 362ef3f74e
commit 8884de71d8
2 changed files with 9 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
tests/integration/features/test_features.py
View File

@ -57,6 +57,12 @@ def reload(qtbot, httpbin, quteproc, command):
quteproc.send_cmd(':reload') quteproc.send_cmd(':reload')
@bdd.when("selection is supported")
def selection_supported(qapp):
if not qapp.clipboard().supportsSelection():
pytest.skip("OS doesn't support primary selection!")
@bdd.then(bdd.parsers.parse("{path} should be loaded")) @bdd.then(bdd.parsers.parse("{path} should be loaded"))
def path_should_be_loaded(httpbin, path): def path_should_be_loaded(httpbin, path):
requests = httpbin.get_requests() requests = httpbin.get_requests()
@ -86,18 +92,14 @@ def expect_error(quteproc, httpbin, category, message):
@bdd.then(bdd.parsers.re(r'the (?P<what>primary selection|clipboard) should ' @bdd.then(bdd.parsers.re(r'the (?P<what>primary selection|clipboard) should '
r'contain "(?P<content>.*)"')) r'contain "(?P<content>.*)"'))
def clipboard_contains(qapp, httpbin, what, content): def clipboard_contains(qapp, httpbin, what, content):
clipboard = qapp.clipboard()
if what == 'clipboard': if what == 'clipboard':
mode = QClipboard.Clipboard mode = QClipboard.Clipboard
elif what == 'primary selection': elif what == 'primary selection':
if not clipboard.supportsSelection():
pytest.skip("OS doesn't support primary selection!")
mode = QClipboard.Selection mode = QClipboard.Selection
else: else:
raise AssertionError raise AssertionError
expected = content.replace('(port)', str(httpbin.port)) expected = content.replace('(port)', str(httpbin.port))
data = clipboard.text(mode=mode) data = qapp.clipboard().text(mode=mode)
assert data == expected assert data == expected

3
tests/integration/features/yankpaste.feature
View File

@ -11,7 +11,8 @@ Feature: Yanking and pasting.
And the clipboard should contain "http://localhost:(port)/data/yankpaste/test.html" And the clipboard should contain "http://localhost:(port)/data/yankpaste/test.html"
Scenario: Yanking URLs to primary selection Scenario: Yanking URLs to primary selection
When I run :yank --sel When selection is supported
And I run :yank --sel
Then the message "Yanked URL to primary selection: http://localhost:(port)/data/yankpaste/test.html" should be shown. Then the message "Yanked URL to primary selection: http://localhost:(port)/data/yankpaste/test.html" should be shown.
And the primary selection should contain "http://localhost:(port)/data/yankpaste/test.html" And the primary selection should contain "http://localhost:(port)/data/yankpaste/test.html"