gryf/tuir
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fixed tests

Browse Source
This commit is contained in:
Michael Lazar
2017-05-10 21:40:40 -07:00
parent 29584acd3a
commit 1c66c5662f
4 changed files with 10 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
rtv/clipboard.py
View File

@@ -46,7 +46,6 @@ def copy_linux(text):
cmd_name = get_command_name() cmd_name = get_command_name()
if cmd_name is None: if cmd_name is None:
raise ProgramError("External copy application not found,\n" raise ProgramError("External copy application not found")
"try installing either `xsel` or `xclip`")
_subprocess_copy(text, cmd_args.get(cmd_name)) _subprocess_copy(text, cmd_args.get(cmd_name))

4
rtv/page.py
View File

@@ -340,7 +340,7 @@ class Page(object):
except (ProgramError, OSError) as e: except (ProgramError, OSError) as e:
_logger.exception(e) _logger.exception(e)
self.term.show_notification( self.term.show_notification(
'Failed to copy permalink to clipboard\n{0}'.format(e)) 'Failed to copy permalink: {0}'.format(e))
else: else:
self.term.show_notification( self.term.show_notification(
'Copied permalink to clipboard', timeout=1) 'Copied permalink to clipboard', timeout=1)
@@ -362,7 +362,7 @@ class Page(object):
except (ProgramError, OSError) as e: except (ProgramError, OSError) as e:
_logger.exception(e) _logger.exception(e)
self.term.show_notification( self.term.show_notification(
'Failed to copy url to clipboard\n{0}'.format(e)) 'Failed to copy url: {0}'.format(e))
else: else:
self.term.show_notification( self.term.show_notification(
'Copied url to clipboard', timeout=1) 'Copied url to clipboard', timeout=1)

0
tests/cassettes/test_copy_to_clipboard_linux.py → tests/cassettes/test_copy_to_clipboard_linux.yaml
View File

10
tests/test_submission.py
View File

@@ -520,13 +520,17 @@ def test_copy_to_clipboard_linux(submission_page, terminal, refresh_token):
assert data.get('permalink') == content assert data.get('permalink') == content
window.addstr.assert_called_with(1, 1, b'Copied permalink to clipboard') window.addstr.assert_called_with(1, 1, b'Copied permalink to clipboard')
else: else:
window.addstr.assert_called_with(1, 1, b'Failed to copy permalink to clipboard') # Nither xclip or xsel installed, this is what happens on Travis CI
text = b'Failed to copy permalink: External copy application not found'
window.addstr.assert_called_with(1, 1, text)
# Trigger copy command for submission # Trigger copy command for url
submission_page.controller.trigger('Y') submission_page.controller.trigger('Y')
content = get_clipboard_content() content = get_clipboard_content()
if content is not None: if content is not None:
assert data.get('url_full') == content assert data.get('url_full') == content
window.addstr.assert_called_with(1, 1, b'Copied url to clipboard') window.addstr.assert_called_with(1, 1, b'Copied url to clipboard')
else: else:
window.addstr.assert_called_with(1, 1, b'Failed to copy url to clipboard') # Nither xclip or xsel installed, this is what happens on Travis CI
text = b'Failed to copy url: External copy application not found'
window.addstr.assert_called_with(1, 1, text)