#24 Make no_command crossplatform

tests/rules/test_no_command.py

@@ -1,62 +1,19 @@
-from subprocess import PIPE
 from mock import patch, Mock
-import pytest
 from thefuck.rules.no_command import match, get_new_command
-from thefuck.main import Command
 
 
-@pytest.fixture
-def command_found():
-    return b'''No command 'aptget' found, did you mean:
- Command 'apt-get' from package 'apt' (main)
-aptget: command not found
-'''
-
-@pytest.fixture
-def command_not_found():
-    return b'''No command 'vom' found, but there are 19 similar ones
-vom: command not found
-'''
+def test_match():
+    with patch('thefuck.rules.no_command._get_all_bins',
+               return_value=['vim', 'apt-get']):
+        assert match(Mock(stderr='vom: not found', script='vom file.py'), None)
+        assert not match(Mock(stderr='qweqwe: not found', script='qweqwe'), None)
+        assert not match(Mock(stderr='some text', script='vom file.py'), None)
 
 
-@pytest.fixture
-def bins_exists(request):
-    p = patch('thefuck.rules.no_command.which',
-              return_value=True)
-    p.start()
-    request.addfinalizer(p.stop)
-
-
-@pytest.fixture
-def settings():
-    class _Settings(object):
-        pass
-    return _Settings
-
-
-@pytest.mark.usefixtures('bins_exists')
-def test_match(command_found, command_not_found, settings):
-    with patch('thefuck.rules.no_command.Popen') as Popen:
-        Popen.return_value.stderr.read.return_value = command_found
-        assert match(Command('aptget install vim', '', ''), settings)
-        Popen.assert_called_once_with('/usr/lib/command-not-found aptget',
-                                      shell=True, stderr=PIPE)
-        Popen.return_value.stderr.read.return_value = command_not_found
-        assert not match(Command('ls', '', ''), settings)
-
-    with patch('thefuck.rules.no_command.Popen') as Popen:
-        Popen.return_value.stderr.read.return_value = command_found
-        assert match(Command('sudo aptget install vim', '', ''),
-                     Mock(command_not_found='test'))
-        Popen.assert_called_once_with('test aptget',
-                                      shell=True, stderr=PIPE)
-
-
-@pytest.mark.usefixtures('bins_exists')
-def test_get_new_command(command_found):
-    with patch('thefuck.rules.no_command._get_output',
-               return_value=command_found.decode()):
-        assert get_new_command(Command('aptget install vim', '', ''), settings)\
-            == 'apt-get install vim'
-        assert get_new_command(Command('sudo aptget install vim', '', ''), settings) \
-            == 'sudo apt-get install vim'
+def test_get_new_command():
+    with patch('thefuck.rules.no_command._get_all_bins',
+               return_value=['vim', 'apt-get']):
+        assert get_new_command(
+            Mock(stderr='vom: not found',
+                 script='vom file.py'),
+            None) == 'vim file.py'