Pass settings to the rules

tests/rules/test_git_push.py

@@ -14,11 +14,11 @@ To push the current branch and set the remote as upstream, use
 
 
 def test_match(stderr):
-    assert match(Command('git push master', '', stderr))
-    assert not match(Command('git push master', '', ''))
-    assert not match(Command('ls', '', stderr))
+    assert match(Command('git push master', '', stderr), None)
+    assert not match(Command('git push master', '', ''), None)
+    assert not match(Command('ls', '', stderr), None)
 
 
 def test_get_new_command(stderr):
-    assert get_new_command(Command('', '', stderr))\
+    assert get_new_command(Command('', '', stderr), None)\
         == "git push --set-upstream origin master"

tests/rules/test_no_command.py

@@ -1,4 +1,4 @@
-from unittest.mock import patch
+from unittest.mock import patch, Mock
 import pytest
 from subprocess import PIPE
 from thefuck.rules.no_command import match, get_new_command
@@ -22,23 +22,24 @@ vom: command not found
 def test_match(command_found, command_not_found):
     with patch('thefuck.rules.no_command.Popen') as Popen:
         Popen.return_value.stderr.read.return_value = command_found
-        assert match(Command('aptget install vim', '', ''))
+        assert match(Command('aptget install vim', '', ''), None)
         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', '', ''))
+        assert not match(Command('ls', '', ''), None)
 
     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', '', ''))
-        Popen.assert_called_once_with('/usr/lib/command-not-found aptget',
+        assert match(Command('sudo aptget install vim', '', ''),
+                     Mock(command_not_found='test'))
+        Popen.assert_called_once_with('test aptget',
                                       shell=True, stderr=PIPE)
 
 
 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', '', ''))\
+        assert get_new_command(Command('aptget install vim', '', ''), None)\
             == 'apt-get install vim'
-        assert get_new_command(Command('sudo aptget install vim', '', '')) \
+        assert get_new_command(Command('sudo aptget install vim', '', ''), None) \
             == 'sudo apt-get install vim'

tests/rules/test_sudo.py

@@ -3,11 +3,11 @@ from thefuck.rules.sudo import match, get_new_command
 
 
 def test_match():
-    assert match(Command('', '', 'Permission denied'))
-    assert match(Command('', '', 'permission denied'))
-    assert match(Command('', '', "npm ERR! Error: EACCES, unlink"))
-    assert not match(Command('', '', ''))
+    assert match(Command('', '', 'Permission denied'), None)
+    assert match(Command('', '', 'permission denied'), None)
+    assert match(Command('', '', "npm ERR! Error: EACCES, unlink"), None)
+    assert not match(Command('', '', ''), None)
 
 
 def test_get_new_command():
-    assert get_new_command(Command('ls', '', '')) == 'sudo ls'
+    assert get_new_command(Command('ls', '', ''), None) == 'sudo ls'

tests/test_main.py

@@ -27,9 +27,9 @@ def test_get_settings():
 
 
 def test_is_rule_enabled():
-    assert main.is_rule_enabled(main.Settings(None), Path('bash.py'))
-    assert main.is_rule_enabled(main.Settings(['bash']), Path('bash.py'))
-    assert not main.is_rule_enabled(main.Settings(['bash']), Path('lisp.py'))
+    assert main.is_rule_enabled(Mock(rules=None), Path('bash.py'))
+    assert main.is_rule_enabled(Mock(rules=['bash']), Path('bash.py'))
+    assert not main.is_rule_enabled(Mock(rules=['bash']), Path('lisp.py'))
 
 
 def test_load_rule():
@@ -50,13 +50,13 @@ def test_get_rules():
         glob.return_value = [PosixPath('bash.py'), PosixPath('lisp.py')]
         assert main.get_rules(
             Path('~'),
-            main.Settings(None)) == [main.Rule('bash', 'bash'),
+            Mock(rules=None)) == [main.Rule('bash', 'bash'),
                                      main.Rule('lisp', 'lisp'),
                                      main.Rule('bash', 'bash'),
                                      main.Rule('lisp', 'lisp')]
         assert main.get_rules(
             Path('~'),
-            main.Settings(['bash'])) == [main.Rule('bash', 'bash'),
+            Mock(rules=['bash'])) == [main.Rule('bash', 'bash'),
                                          main.Rule('bash', 'bash')]
 
 
@@ -73,9 +73,9 @@ def test_get_command():
 
 
 def test_get_matched_rule():
-    rules = [main.Rule(lambda x: x.script == 'cd ..', None),
-             main.Rule(lambda _: False, None)]
+    rules = [main.Rule(lambda x, _: x.script == 'cd ..', None),
+             main.Rule(lambda _, _: False, None)]
     assert main.get_matched_rule(main.Command('ls', '', ''),
-                                 rules) is None
+                                 rules, None) is None
     assert main.get_matched_rule(main.Command('cd ..', '', ''),
-                                 rules) == rules[0]
+                                 rules, None) == rules[0]