#682: Unify work with output in classic and instant mode
This commit is contained in:
@@ -1,6 +1,6 @@
|
||||
import pytest
|
||||
from thefuck.rules.gradle_wrapper import match, get_new_command
|
||||
from tests.utils import Command
|
||||
from thefuck.types import Command
|
||||
|
||||
|
||||
@pytest.fixture(autouse=True)
|
||||
@@ -10,8 +10,8 @@ def exists(mocker):
|
||||
|
||||
|
||||
@pytest.mark.parametrize('command', [
|
||||
Command('gradle tasks', stderr='gradle: not found'),
|
||||
Command('gradle build', stderr='gradle: not found')])
|
||||
Command('gradle tasks', 'gradle: not found'),
|
||||
Command('gradle build', 'gradle: not found')])
|
||||
def test_match(mocker, command):
|
||||
mocker.patch('thefuck.rules.gradle_wrapper.which', return_value=None)
|
||||
|
||||
@@ -19,9 +19,9 @@ def test_match(mocker, command):
|
||||
|
||||
|
||||
@pytest.mark.parametrize('command, gradlew, which', [
|
||||
(Command('gradle tasks', stderr='gradle: not found'), False, None),
|
||||
(Command('gradle tasks', stderr='command not found'), True, '/usr/bin/gradle'),
|
||||
(Command('npm tasks', stderr='npm: not found'), True, None)])
|
||||
(Command('gradle tasks', 'gradle: not found'), False, None),
|
||||
(Command('gradle tasks', 'command not found'), True, '/usr/bin/gradle'),
|
||||
(Command('npm tasks', 'npm: not found'), True, None)])
|
||||
def test_not_match(mocker, exists, command, gradlew, which):
|
||||
mocker.patch('thefuck.rules.gradle_wrapper.which', return_value=which)
|
||||
exists.return_value = gradlew
|
||||
@@ -34,5 +34,5 @@ def test_not_match(mocker, exists, command, gradlew, which):
|
||||
('gradle --help', './gradlew --help'),
|
||||
('gradle build -c', './gradlew build -c')])
|
||||
def test_get_new_command(script, result):
|
||||
command = Command(script)
|
||||
command = Command(script, '')
|
||||
assert get_new_command(command) == result
|
||||
|
||||
Reference in New Issue
Block a user