1
0
mirror of https://github.com/nvbn/thefuck.git synced 2024-10-05 18:31:10 +01:00

Merge branch 'scorphus-pull-request-702'

This commit is contained in:
Vladimir Iakovlev 2017-10-16 19:09:53 +02:00
commit 50d14be43a
2 changed files with 15 additions and 10 deletions

View File

@ -3,8 +3,12 @@ from thefuck.rules.php_s import get_new_command, match
from thefuck.types import Command from thefuck.types import Command
def test_match(): @pytest.mark.parametrize('command', [
assert match(Command('php -s localhost:8000', '')) Command('php -s localhost:8000', ''),
Command('php -t pub -s 0.0.0.0:8080', '')
])
def test_match(command):
assert match(command)
@pytest.mark.parametrize('command', [ @pytest.mark.parametrize('command', [
@ -15,6 +19,9 @@ def test_not_match(command):
assert not match(command) assert not match(command)
def test_get_new_command(): @pytest.mark.parametrize('command, new_command', [
new_command = get_new_command(Command('php -s localhost:8000', '')) (Command('php -s localhost:8000', ''), 'php -S localhost:8000'),
assert new_command == 'php -S localhost:8000' (Command('php -t pub -s 0.0.0.0:8080', ''), 'php -t pub -S 0.0.0.0:8080')
])
def test_get_new_command(command, new_command):
assert get_new_command(command) == new_command

View File

@ -1,13 +1,11 @@
from thefuck.utils import replace_argument, for_app from thefuck.utils import replace_argument, for_app
@for_app('php') @for_app('php', at_least=2)
def match(command): def match(command):
return "php -s" in command.script return ('-s' in command.script_parts
and command.script_parts[-1] != '-s')
def get_new_command(command): def get_new_command(command):
return replace_argument(command.script, "-s", "-S") return replace_argument(command.script, "-s", "-S")
requires_output = False