From 1f96faef2cd530806310478f6e812113ed583874 Mon Sep 17 00:00:00 2001 From: nvbn Date: Thu, 23 Apr 2015 21:47:46 +0200 Subject: [PATCH] #116 Fix tests --- tests/rules/test_composer_not_command.py | 8 ++++---- thefuck/rules/composer_not_command.py | 11 +++++------ 2 files changed, 9 insertions(+), 10 deletions(-) diff --git a/tests/rules/test_composer_not_command.py b/tests/rules/test_composer_not_command.py index c546289..d1a2e02 100644 --- a/tests/rules/test_composer_not_command.py +++ b/tests/rules/test_composer_not_command.py @@ -1,5 +1,5 @@ import pytest -from thefuck.main import Command +from thefuck.types import Command from thefuck.rules.composer_not_command import match, get_new_command @@ -34,15 +34,15 @@ def composer_not_command_one_of_this(): """ + def test_match(composer_not_command, composer_not_command_one_of_this): assert match(Command('composer udpate', '', composer_not_command), None) assert match(Command('composer pdate', '', composer_not_command_one_of_this), None) assert not match(Command('ls update', '', composer_not_command), None) - #assert not match(Command('composer update', '', composer_command), None) def test_get_new_command(composer_not_command, composer_not_command_one_of_this): - assert get_new_command(Command('composer udpate', '', composer_not_command), None)\ - == 'composer update' + assert get_new_command(Command('composer udpate', '', composer_not_command), None) \ + == 'composer update' assert get_new_command( Command('composer pdate', '', composer_not_command_one_of_this), None) == 'composer selfupdate' diff --git a/thefuck/rules/composer_not_command.py b/thefuck/rules/composer_not_command.py index ec8916e..930608d 100644 --- a/thefuck/rules/composer_not_command.py +++ b/thefuck/rules/composer_not_command.py @@ -1,16 +1,15 @@ import re + def match(command, settings): return ('composer' in command.script - and ( - 'did you mean this?' in command.stderr.lower() - or 'did you mean one of these?' in command.stderr.lower() - ) - ) + and ('did you mean this?' in command.stderr.lower() + or 'did you mean one of these?' in command.stderr.lower())) + def get_new_command(command, settings): broken_cmd = re.findall(r"Command \"([^']*)\" is not defined", command.stderr)[0] new_cmd = re.findall(r'Did you mean this\?[^\n]*\n\s*([^\n]*)', command.stderr) if not new_cmd: - new_cmd = re.findall(r'Did you mean one of these\?[^\n]*\n\s*([^\n]*)', command.stderr) + new_cmd = re.findall(r'Did you mean one of these\?[^\n]*\n\s*([^\n]*)', command.stderr) return command.script.replace(broken_cmd, new_cmd[0].strip(), 1) \ No newline at end of file