MirroredRepos/thefuck
1
0
Fork 0
mirror of https://github.com/nvbn/thefuck.git synced 2025-10-08 04:44:00 +01:00
Code Issues Releases Wiki Activity

#N/A: Fix tests with py.test 4

Browse Source
This commit is contained in:
Vladimir Iakovlev
2018-11-21 19:43:01 +01:00
parent 81b05b9f88
commit 5b3350b2dd
4 changed files with 15 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
tests/rules/test_git_merge.py
View File

@@ -3,24 +3,22 @@ from thefuck.rules.git_merge import match, get_new_command
from thefuck.types import Command
@pytest.fixture
def output():
return 'merge: local - not something we can merge\n\n' \
'Did you mean this?\n\tremote/local'
output = 'merge: local - not something we can merge\n\n' \
'Did you mean this?\n\tremote/local'
def test_match(output):
def test_match():
assert match(Command('git merge test', output))
assert not match(Command('git merge master', ''))
assert not match(Command('ls', output))
@pytest.mark.parametrize('command, new_command', [
(Command('git merge local', output()),
(Command('git merge local', output),
'git merge remote/local'),
(Command('git merge -m "test" local', output()),
(Command('git merge -m "test" local', output),
'git merge -m "test" remote/local'),
(Command('git merge -m "test local" local', output()),
(Command('git merge -m "test local" local', output),
'git merge -m "test local" remote/local')])
def test_get_new_command(command, new_command):
assert get_new_command(command) == new_command