Merge pull request #29 from jamescooke/cleanups

Cleanups

flake8_aaa/function.py

@@ -38,7 +38,7 @@ def check_all(self):
 
         self.act_block = self.load_act_block()
         self.arrange_block = self.load_arrange_block()
-        self.check_act_arrange_spacing()
+        self.check_arrange_act_spacing()
         self.assert_block = self.load_assert_block()
         self.check_act_assert_spacing()
 
@@ -101,7 +101,7 @@ def load_assert_block(self):
 
         return None
 
-    def check_act_arrange_spacing(self):
+    def check_arrange_act_spacing(self):
         """
         When Function has an Arrange block, then ensure that there is a blank
         line between that and the Act block.

tests/function/test_check_act_arrange_spacing.py → tests/function/test_check_arrange_act_spacing.py

@@ -14,7 +14,7 @@ def test():
     ids=['no arrange'],
 )
 def test_no_arrange(function_with_arrange_act_blocks):
-    result = function_with_arrange_act_blocks.check_act_arrange_spacing()
+    result = function_with_arrange_act_blocks.check_arrange_act_spacing()
 
     assert result is None
 
@@ -44,7 +44,7 @@ def test(person):
     ids=['well spaced test', 'spaced test with pytest.raises'],
 )
 def test_has_act_block_good_spacing(function_with_arrange_act_blocks):
-    result = function_with_arrange_act_blocks.check_act_arrange_spacing()
+    result = function_with_arrange_act_blocks.check_arrange_act_spacing()
 
     assert result is None
 
@@ -65,7 +65,7 @@ def test():
 )
 def test_missing_leading_space(function_with_arrange_act_blocks):
     with pytest.raises(ValidationError) as excinfo:
-        function_with_arrange_act_blocks.check_act_arrange_spacing()
+        function_with_arrange_act_blocks.check_arrange_act_spacing()
 
     assert excinfo.value.line_number == 5
     assert excinfo.value.offset == 4

tests/test_run.py

@@ -34,36 +34,3 @@ def test():
 
     assert len(result.out_lines)
     assert result.out_lines[0] == './test_plus.py:1:1: AAA01 no Act block found in test'
-
-
-def test_ignore(flake8dir):
-    flake8dir.make_setup_cfg('''
-        [flake8]
-        ignore = AAA01
-    ''')
-    flake8dir.make_py_files(
-        test_plus='''
-            def test():
-                x = 1 + 1
-                assert x == 2
-        ''',
-    )
-
-    result = flake8dir.run_flake8()
-
-    assert result.out_lines == []
-
-
-def test_act(flake8dir):
-    flake8dir.make_py_files(
-        test_plus='''
-            def test():
-                x = 1 + 1  # act
-
-                assert x == 2
-        ''',
-    )
-
-    result = flake8dir.run_flake8()
-
-    assert result.out_lines == []