MirroredRepos/thefuck
1
0
Fork 0
mirror of https://github.com/nvbn/thefuck.git synced 2025-09-29 00:22:32 +01:00
Code Issues Releases Wiki Activity

#682: Unify work with output in classic and instant mode

Browse Source
This commit is contained in:
Vladimir Iakovlev
2017-08-31 17:58:56 +02:00
parent 96843fc6cd
commit 4625d8503d
237 changed files with 1322 additions and 1332 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
tests/rules/test_git_add.py
View File

@@ -1,6 +1,6 @@
import pytest
from thefuck.rules.git_add import match, get_new_command
from tests.utils import Command
from thefuck.types import Command
@pytest.fixture(autouse=True)
@@ -10,7 +10,7 @@ def path_exists(mocker):
@pytest.fixture
def stderr(target):
def output(target):
return ("error: pathspec '{}' did not match any "
'file(s) known to git.'.format(target))
@@ -18,17 +18,17 @@ def stderr(target):
@pytest.mark.parametrize('script, target', [
('git submodule update unknown', 'unknown'),
('git commit unknown', 'unknown')])
def test_match(stderr, script, target):
assert match(Command(script=script, stderr=stderr))
def test_match(output, script, target):
assert match(Command(script, output))
@pytest.mark.parametrize('script, target, exists', [
('git submodule update known', '', True),
('git commit known', '', True),
('git submodule update known', stderr, False)])
def test_not_match(path_exists, stderr, script, target, exists):
('git submodule update known', output, False)])
def test_not_match(path_exists, output, script, target, exists):
path_exists.return_value = exists
assert not match(Command(script=script, stderr=stderr))
assert not match(Command(script, output))
@pytest.mark.parametrize('script, target, new_command', [
@@ -36,5 +36,5 @@ def test_not_match(path_exists, stderr, script, target, exists):
'git add -- unknown && git submodule update unknown'),
('git commit unknown', 'unknown',
'git add -- unknown && git commit unknown')])
def test_get_new_command(stderr, script, target, new_command):
assert get_new_command(Command(script=script, stderr=stderr)) == new_command
def test_get_new_command(output, script, target, new_command):
assert get_new_command(Command(script, output)) == new_command