#441: Remove shells methods wrappers

tests/rules/conftest.py

@@ -1,6 +0,0 @@
-import pytest
-
-
-@pytest.fixture(autouse=True)
-def generic_shell(monkeypatch):
-    monkeypatch.setattr('thefuck.shells.and_', lambda *x: u' && '.join(x))

tests/rules/test_git_branch_list.py

@@ -1,5 +1,5 @@
-from thefuck import shells
 from thefuck.rules.git_branch_list import match, get_new_command
+from thefuck.shells import shell
 from tests.utils import Command
 
 
@@ -16,4 +16,4 @@ def test_not_match():
 
 def test_get_new_command():
     assert (get_new_command(Command('git branch list')) ==
-            shells.and_('git branch --delete list', 'git branch'))
+            shell.and_('git branch --delete list', 'git branch'))

tests/rules/test_history.py

@@ -5,7 +5,7 @@ from tests.utils import Command
 
 @pytest.fixture
 def history(mocker):
-    return mocker.patch('thefuck.rules.history.get_history',
+    return mocker.patch('thefuck.shells.shell.get_history',
                         return_value=['le cat', 'fuck', 'ls cat',
                                       'diff x', 'nocommand x'])