1
0
mirror of https://github.com/nvbn/thefuck.git synced 2024-10-06 10:51:11 +01:00

Merge branch 'update-cargo-no-command' of https://github.com/scorphus/thefuck into scorphus-update-cargo-no-command

This commit is contained in:
nvbn 2016-06-28 15:49:04 +03:00
commit 2988e4871f
2 changed files with 11 additions and 4 deletions

View File

@ -3,19 +3,26 @@ from thefuck.rules.cargo_no_command import match, get_new_command
from tests.utils import Command from tests.utils import Command
no_such_subcommand = """No such subcommand no_such_subcommand_old = """No such subcommand
Did you mean `build`? Did you mean `build`?
""" """
no_such_subcommand = """error: no such subcommand
\tDid you mean `build`?
"""
@pytest.mark.parametrize('command', [ @pytest.mark.parametrize('command', [
Command(script='cargo buid', stderr=no_such_subcommand)]) Command(script='cargo buid', stderr=no_such_subcommand_old),
Command(script='cargo buils', stderr=no_such_subcommand)])
def test_match(command): def test_match(command):
assert match(command) assert match(command)
@pytest.mark.parametrize('command, new_command', [ @pytest.mark.parametrize('command, new_command', [
(Command('cargo buid', stderr=no_such_subcommand), 'cargo build')]) (Command('cargo buid', stderr=no_such_subcommand_old), 'cargo build'),
(Command('cargo buils', stderr=no_such_subcommand), 'cargo build')])
def test_get_new_command(command, new_command): def test_get_new_command(command, new_command):
assert get_new_command(command) == new_command assert get_new_command(command) == new_command

View File

@ -4,7 +4,7 @@ from thefuck.utils import replace_argument, for_app
@for_app('cargo', at_least=1) @for_app('cargo', at_least=1)
def match(command): def match(command):
return ('No such subcommand' in command.stderr return ('o such subcommand' in command.stderr
and 'Did you mean' in command.stderr) and 'Did you mean' in command.stderr)