Version 0.0.8 (#104)

* Working module counts

* Version 0.0.8 release candidate

* Ready to be released

* Typo fixed

CHANGELOG.md

@@ -2,13 +2,29 @@
 
 We follow Semantic Versions since the `0.1.0` release.
 
+
 ## Version 0.0.8 aka The Complex Complexity
 
 ### Features
 
+- Now all dependencies are direct, they will be installed together
+  with this package
 - Adds direct dependencies, now there's no need to install any extra packages
-- Adds `TooDeepNesting` check
-- Adds `--max-offset-blocks` option
+- Adds `TooDeepNestingViolation` and `TooManyElifsViolation` checks
+- Adds `--max-offset-blocks` and `--max-elifs` options
+- Adds `TooManyModuleMembersViolation` and `TooManyMethodsViolation` checks
+- Adds `--max-module-members` and `--max-methods` options
+- Restricts to use `f` strings
+
+### Bugfixes
+
+- Removes incorrect `generic_visit()` calls
+- Removes some unused `getattr()` calls
+- Refactors how options are registered
+
+### Misc
+
+- Improved type support for options parsing
 
 
 ## Version 0.0.7

CONTRIBUTING.md

@@ -28,6 +28,9 @@ To activate your `virtualenv` run `poetry shell`.
 ## Tests
 
 We use `pytest` and `flake8` for quality control.
+We also use `wemake_python_styleguide` itself
+to develop `wemake_python_styleguide`.
+
 To run all tests:
 
 ```bash

pyproject.lock

@@ -797,7 +797,7 @@ python-versions = ">=2.6, !=3.0.*, !=3.1.*, !=3.2.*, !=3.3.*, <4"
 version = "1.23"
 
 [metadata]
-content-hash = "74438a312f16545792a454d48412ac0945801840207190089246750dff05328d"
+content-hash = "e1429750118cbce8d59257582e4f5afaa59df8f73be0e39f8a93fa046628ff28"
 platform = "*"
 python-versions = "^3.6 || ^3.7"
 
@@ -810,7 +810,7 @@ babel = ["6778d85147d5d85345c14a26aada5e478ab04e39b078b0745ee6870c2b5cf669", "8c
 certifi = ["376690d6f16d32f9d1fe8932551d80b23e9d393a8578c5633a2ed39a64861638", "456048c7e371c089d0a77a5212fb37a2c2dce1e24146e3b7e0261736aaeaa22a"]
 chardet = ["84ab92ed1c4d4f16916e05906b6b75a6c0fb5db821cc65e70cbd64a3e2a5eaae", "fc323ffcaeaed0e0a02bf4d117757b98aed530d9ed4531e3e15460124c106691"]
 colorama = ["463f8483208e921368c9f306094eb6f725c6ca42b0f97e313cb5d5512459feda", "48eb22f4f8461b1df5734a074b57042430fb06e1d61bd1e11b078c0fe6d7a1f1"]
-coverage = ["03481e81d558d30d230bc12999e3edffe392d244349a90f4ef9b88425fac74ba", "0b136648de27201056c1869a6c0d4e23f464750fd9a9ba9750b8336a244429ed", "104ab3934abaf5be871a583541e8829d6c19ce7bde2923b2751e0d3ca44db60a", "10a46017fef60e16694a30627319f38a2b9b52e90182dddb6e37dcdab0f4bf95", "15b111b6a0f46ee1a485414a52a7ad1d703bdf984e9ed3c288a4414d3871dcbd", "198626739a79b09fa0a2f06e083ffd12eb55449b5f8bfdbeed1df4910b2ca640", "1c383d2ef13ade2acc636556fd544dba6e14fa30755f26812f54300e401f98f2", "23d341cdd4a0371820eb2b0bd6b88f5003a7438bbedb33688cd33b8eae59affd", "28b2191e7283f4f3568962e373b47ef7f0392993bb6660d079c62bd50fe9d162", "2a5b73210bad5279ddb558d9a2bfedc7f4bf6ad7f3c988641d83c40293deaec1", "2eb564bbf7816a9d68dd3369a510be3327f1c618d2357fa6b1216994c2e3d508", "337ded681dd2ef9ca04ef5d93cfc87e52e09db2594c296b4a0a3662cb1b41249", "3a2184c6d797a125dca8367878d3b9a178b6fdd05fdc2d35d758c3006a1cd694", "3c79a6f7b95751cdebcd9037e4d06f8d5a9b60e4ed0cd231342aa8ad7124882a", "3d72c20bd105022d29b14a7d628462ebdc61de2f303322c0212a054352f3b287", "3eb42bf89a6be7deb64116dd1cc4b08171734d721e7a7e57ad64cc4ef29ed2f1", "4635a184d0bbe537aa185a34193898eee409332a8ccb27eea36f262566585000", "56e448f051a201c5ebbaa86a5efd0ca90d327204d8b059ab25ad0f35fbfd79f1", "5a13ea7911ff5e1796b6d5e4fbbf6952381a611209b736d48e675c2756f3f74e", "69bf008a06b76619d3c3f3b1983f5145c75a305a0fea513aca094cae5c40a8f5", "6bc583dc18d5979dc0f6cec26a8603129de0304d5ae1f17e57a12834e7235062", "701cd6093d63e6b8ad7009d8a92425428bc4d6e7ab8d75efbb665c806c1d79ba", "7608a3dd5d73cb06c531b8925e0ef8d3de31fed2544a7de6c63960a1e73ea4bc", "76ecd006d1d8f739430ec50cc872889af1f9c1b6b8f48e29941814b09b0fd3cc", "7aa36d2b844a3e4a4b356708d79fd2c260281a7390d678a10b91ca595ddc9e99", "7d3f553904b0c5c016d1dad058a7554c7ac4c91a789fca496e7d8347ad040653", "7e1fe19bd6dce69d9fd159d8e4a80a8f52101380d5d3a4d374b6d3eae0e5de9c", "8c3cb8c35ec4d9506979b4cf90ee9918bc2e49f84189d9bf5c36c0c1119c6558", "9d6dd10d49e01571bf6e147d3b505141ffc093a06756c60b053a859cb2128b1f", "9e112fcbe0148a6fa4f0a02e8d58e94470fc6cb82a5481618fea901699bf34c4", "ac4fef68da01116a5c117eba4dd46f2e06847a497de5ed1d64bb99a5fda1ef91", "b8815995e050764c8610dbc82641807d196927c3dbed207f0a079833ffcf588d", "be6cfcd8053d13f5f5eeb284aa8a814220c3da1b0078fa859011c7fffd86dab9", "c1bb572fab8208c400adaf06a8133ac0712179a334c09224fb11393e920abcdd", "de4418dadaa1c01d497e539210cb6baa015965526ff5afc078c57ca69160108d", "e05cb4d9aad6233d67e0541caa7e511fa4047ed7750ec2510d466e806e0255d6", "e4d96c07229f58cb686120f168276e434660e4358cc9cf3b0464210b04913e77", "f3f501f345f24383c0000395b26b726e46758b71393267aeae0bd36f8b3ade80", "f8a923a85cb099422ad5a2e345fe877bbc89a8a8b23235824a93488150e45f6e"]
+coverage = ["03481e81d558d30d230bc12999e3edffe392d244349a90f4ef9b88425fac74ba", "0b136648de27201056c1869a6c0d4e23f464750fd9a9ba9750b8336a244429ed", "104ab3934abaf5be871a583541e8829d6c19ce7bde2923b2751e0d3ca44db60a", "15b111b6a0f46ee1a485414a52a7ad1d703bdf984e9ed3c288a4414d3871dcbd", "198626739a79b09fa0a2f06e083ffd12eb55449b5f8bfdbeed1df4910b2ca640", "1c383d2ef13ade2acc636556fd544dba6e14fa30755f26812f54300e401f98f2", "28b2191e7283f4f3568962e373b47ef7f0392993bb6660d079c62bd50fe9d162", "2eb564bbf7816a9d68dd3369a510be3327f1c618d2357fa6b1216994c2e3d508", "337ded681dd2ef9ca04ef5d93cfc87e52e09db2594c296b4a0a3662cb1b41249", "3a2184c6d797a125dca8367878d3b9a178b6fdd05fdc2d35d758c3006a1cd694", "3c79a6f7b95751cdebcd9037e4d06f8d5a9b60e4ed0cd231342aa8ad7124882a", "3d72c20bd105022d29b14a7d628462ebdc61de2f303322c0212a054352f3b287", "3eb42bf89a6be7deb64116dd1cc4b08171734d721e7a7e57ad64cc4ef29ed2f1", "4635a184d0bbe537aa185a34193898eee409332a8ccb27eea36f262566585000", "56e448f051a201c5ebbaa86a5efd0ca90d327204d8b059ab25ad0f35fbfd79f1", "5a13ea7911ff5e1796b6d5e4fbbf6952381a611209b736d48e675c2756f3f74e", "69bf008a06b76619d3c3f3b1983f5145c75a305a0fea513aca094cae5c40a8f5", "6bc583dc18d5979dc0f6cec26a8603129de0304d5ae1f17e57a12834e7235062", "701cd6093d63e6b8ad7009d8a92425428bc4d6e7ab8d75efbb665c806c1d79ba", "7608a3dd5d73cb06c531b8925e0ef8d3de31fed2544a7de6c63960a1e73ea4bc", "76ecd006d1d8f739430ec50cc872889af1f9c1b6b8f48e29941814b09b0fd3cc", "7aa36d2b844a3e4a4b356708d79fd2c260281a7390d678a10b91ca595ddc9e99", "7d3f553904b0c5c016d1dad058a7554c7ac4c91a789fca496e7d8347ad040653", "7e1fe19bd6dce69d9fd159d8e4a80a8f52101380d5d3a4d374b6d3eae0e5de9c", "8c3cb8c35ec4d9506979b4cf90ee9918bc2e49f84189d9bf5c36c0c1119c6558", "9d6dd10d49e01571bf6e147d3b505141ffc093a06756c60b053a859cb2128b1f", "9e112fcbe0148a6fa4f0a02e8d58e94470fc6cb82a5481618fea901699bf34c4", "ac4fef68da01116a5c117eba4dd46f2e06847a497de5ed1d64bb99a5fda1ef91", "b8815995e050764c8610dbc82641807d196927c3dbed207f0a079833ffcf588d", "be6cfcd8053d13f5f5eeb284aa8a814220c3da1b0078fa859011c7fffd86dab9", "c1bb572fab8208c400adaf06a8133ac0712179a334c09224fb11393e920abcdd", "de4418dadaa1c01d497e539210cb6baa015965526ff5afc078c57ca69160108d", "e05cb4d9aad6233d67e0541caa7e511fa4047ed7750ec2510d466e806e0255d6", "e4d96c07229f58cb686120f168276e434660e4358cc9cf3b0464210b04913e77", "f3f501f345f24383c0000395b26b726e46758b71393267aeae0bd36f8b3ade80", "f8a923a85cb099422ad5a2e345fe877bbc89a8a8b23235824a93488150e45f6e"]
 doc8 = ["2df89f9c1a5abfb98ab55d0175fed633cae0cf45025b8b1e0ee5ea772be28543", "d12f08aa77a4a65eb28752f4bc78f41f611f9412c4155e2b03f1f5d4a45efe04"]
 docutils = ["02aec4bd92ab067f6ff27a38a38a41173bf01bed8f89157768c1573f53e474a6", "51e64ef2ebfb29cae1faa133b3710143496eca21c530f3f71424d77687764274", "7a4bd47eaf6596e1295ecb11361139febe29b084a87bf005bf899f9a42edc3c6"]
 execnet = ["a7a84d5fa07a089186a329528f127c9d73b9de57f1a1131b82bb5320ee651f6a", "fc155a6b553c66c838d1a22dba1dc9f5f505c43285a878c6f74a79c024750b83"]
@@ -868,7 +868,7 @@ sphinx-readable-theme = ["f5fe65a2e112cb956b366df41e0fc894ff6b6f0e4a4814fcbff692
 sphinxcontrib-napoleon = ["614b779888629f14dfdfad6c17bffbb6d3813a0a0917a9541651d85384d4d6bd", "cbb31953b15d2102c18f16f02591f92e2614a08ef0218c9e514e2dc4c4f9daf9"]
 sphinxcontrib-websupport = ["68ca7ff70785cbe1e7bccc71a48b5b6d965d79ca50629606c7861a21b206d9dd", "9de47f375baf1ea07cdb3436ff39d7a9c76042c10a769c52353ec46e4e8fc3b9"]
 stevedore = ["1e153545aca7a6a49d8337acca4f41c212fbfa60bf864ecd056df0cafb9627e8", "c7eac1c0d95824c88b655273da5c17cdde6482b2739f47c30bf851dcc9d3c2c0"]
-typed-ast = ["0948004fa228ae071054f5208840a1e88747a357ec1101c17217bfe99b299d58", "10703d3cec8dcd9eef5a630a04056bbc898abc19bac5691612acba7d1325b66d", "1f6c4bd0bdc0f14246fd41262df7dfc018d65bb05f6e16390b7ea26ca454a291", "25d8feefe27eb0303b73545416b13d108c6067b846b543738a25ff304824ed9a", "29464a177d56e4e055b5f7b629935af7f49c196be47528cc94e0a7bf83fbc2b9", "2e214b72168ea0275efd6c884b114ab42e316de3ffa125b267e732ed2abda892", "3e0d5e48e3a23e9a4d1a9f698e32a542a4a288c871d33ed8df1b092a40f3a0f9", "519425deca5c2b2bdac49f77b2c5625781abbaf9a809d727d3a5596b30bb4ded", "57fe287f0cdd9ceaf69e7b71a2e94a24b5d268b35df251a88fef5cc241bf73aa", "668d0cec391d9aed1c6a388b0d5b97cd22e6073eaa5fbaa6d2946603b4871efe", "68ba70684990f59497680ff90d18e756a47bf4863c604098f10de9716b2c0bdd", "6de012d2b166fe7a4cdf505eee3aaa12192f7ba365beeefaca4ec10e31241a85", "79b91ebe5a28d349b6d0d323023350133e927b4de5b651a8aa2db69c761420c6", "8550177fa5d4c1f09b5e5f524411c44633c80ec69b24e0e98906dd761941ca46", "898f818399cafcdb93cbbe15fc83a33d05f18e29fb498ddc09b0214cdfc7cd51", "94b091dc0f19291adcb279a108f5d38de2430411068b219f41b343c03b28fb1f", "a26863198902cda15ab4503991e8cf1ca874219e0118cbf07c126bce7c4db129", "a8034021801bc0440f2e027c354b4eafd95891b573e12ff0418dec385c76785c", "bc978ac17468fe868ee589c795d06777f75496b1ed576d308002c8a5756fb9ea", "c05b41bc1deade9f90ddc5d988fe506208019ebba9f2578c622516fd201f5863", "c9b060bd1e5a26ab6e8267fd46fc9e02b54eb15fffb16d112d4c7b1c12987559", "edb04bdd45bfd76c8292c4d9654568efaedf76fe78eb246dde69bdb13b2dad87", "f19f2a4f547505fe9072e15f6f4ae714af51b5a681a97f187971f50c283193b6"]
+typed-ast = ["0948004fa228ae071054f5208840a1e88747a357ec1101c17217bfe99b299d58", "25d8feefe27eb0303b73545416b13d108c6067b846b543738a25ff304824ed9a", "29464a177d56e4e055b5f7b629935af7f49c196be47528cc94e0a7bf83fbc2b9", "2e214b72168ea0275efd6c884b114ab42e316de3ffa125b267e732ed2abda892", "3e0d5e48e3a23e9a4d1a9f698e32a542a4a288c871d33ed8df1b092a40f3a0f9", "519425deca5c2b2bdac49f77b2c5625781abbaf9a809d727d3a5596b30bb4ded", "57fe287f0cdd9ceaf69e7b71a2e94a24b5d268b35df251a88fef5cc241bf73aa", "668d0cec391d9aed1c6a388b0d5b97cd22e6073eaa5fbaa6d2946603b4871efe", "68ba70684990f59497680ff90d18e756a47bf4863c604098f10de9716b2c0bdd", "6de012d2b166fe7a4cdf505eee3aaa12192f7ba365beeefaca4ec10e31241a85", "79b91ebe5a28d349b6d0d323023350133e927b4de5b651a8aa2db69c761420c6", "8550177fa5d4c1f09b5e5f524411c44633c80ec69b24e0e98906dd761941ca46", "a8034021801bc0440f2e027c354b4eafd95891b573e12ff0418dec385c76785c", "bc978ac17468fe868ee589c795d06777f75496b1ed576d308002c8a5756fb9ea", "c05b41bc1deade9f90ddc5d988fe506208019ebba9f2578c622516fd201f5863", "c9b060bd1e5a26ab6e8267fd46fc9e02b54eb15fffb16d112d4c7b1c12987559", "edb04bdd45bfd76c8292c4d9654568efaedf76fe78eb246dde69bdb13b2dad87", "f19f2a4f547505fe9072e15f6f4ae714af51b5a681a97f187971f50c283193b6"]
 typing = ["4027c5f6127a6267a435201981ba156de91ad0d1d98e9ddc2aa173453453492d", "57dcf675a99b74d64dacf6fba08fb17cf7e3d5fdff53d4a30ea2a5e7e52543d4", "a4c8473ce11a65999c8f59cb093e70686b6c84c98df58c1dae9b3b196089858a"]
 typing-extensions = ["1c0a8e3b4ce55207a03dd0dcb98bc47a704c71f14fe4311ec860cc8af8f4bd27", "8b0962ecb92847974514b1724c8ae2b6dd1ffe86bcdfac429517f5e583ada658", "be7b05ddab71727fabf1f071365043cf034e4cdac9cade1f1d61a6cc526aaafe"]
 urllib3 = ["a68ac5e15e76e7e5dd2b8f94007233e01effe3e50e8daddf69acfd81cb686baf", "b5725a0bd4ba422ab0e66e89e030c806576753ea3ee08554382c14e685d117b5"]

pyproject.toml

@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "wemake-python-styleguide"
-version = "0.0.7"
+version = "0.0.8"
 description = "Opinionated styleguide that we use in wemake.services"
 
 license = "MIT"

setup.cfg

@@ -23,8 +23,10 @@ accept-encodings = utf-8
 
 [tool:pytest]
 flake8-ignore =
-  # These imports are API declaration:
+  # These function names are part of 3d party API:
   wemake_python_styleguide/visitors/*.py N802
+  # These modules should contain a lot of classes:
+  wemake_python_styleguide/errors/*.py Z208
   # Disable some pydocstyle checks:
   *.py D100 D104 D106 D401
 

tests/test_visitors/conftest.py

@@ -11,15 +11,6 @@
 from wemake_python_styleguide.options import defaults
 from wemake_python_styleguide.visitors.base.visitor import BaseNodeVisitor
 
-Options = namedtuple('options', [
-    'max_arguments',
-    'max_expressions',
-    'max_local_variables',
-    'max_returns',
-    'min_variable_length',
-    'max_offset_blocks',
-])
-
 
 @pytest.fixture(scope='session')
 def parse_ast_tree():
@@ -46,18 +37,24 @@ def factory(visiter: BaseNodeVisitor, errors: Sequence[str]):
 @pytest.fixture(scope='session')
 def options():
     """Returns the options builder."""
+    default_values = {
+        'max_arguments': defaults.MAX_ARGUMENTS,
+        'max_expressions': defaults.MAX_EXPRESSIONS,
+        'max_local_variables': defaults.MAX_LOCAL_VARIABLES,
+        'max_returns': defaults.MAX_RETURNS,
+        'min_variable_length': defaults.MIN_VARIABLE_LENGTH,
+        'max_offset_blocks': defaults.MAX_OFFSET_BLOCKS,
+        'max_elifs': defaults.MAX_ELIFS,
+        'max_module_members': defaults.MAX_MODULE_MEMBERS,
+        'max_methods': defaults.MAX_METHODS,
+    }
+
+    Options = namedtuple('options', default_values.keys())
+
     def factory(**kwargs):
-        default_values = {
-            'max_arguments': defaults.MAX_ARGUMENTS,
-            'max_expressions': defaults.MAX_EXPRESSIONS,
-            'max_local_variables': defaults.MAX_LOCAL_VARIABLES,
-            'max_returns': defaults.MAX_RETURNS,
-            'min_variable_length': defaults.MIN_VARIABLE_LENGTH,
-            'max_offset_blocks': defaults.MAX_OFFSET_BLOCKS,
-        }
-
-        default_values.update(kwargs)
-        return Options(**default_values)
+        final_options = default_values.copy()
+        final_options.update(kwargs)
+        return Options(**final_options)
 
     return factory
 

tests/test_visitors/test_complexity/test_counts/test_method_counts.py

@@ -0,0 +1,64 @@
+# -*- coding: utf-8 -*-
+
+import pytest
+
+from wemake_python_styleguide.visitors.complexity.counts import (
+    MethodMembersVisitor,
+    TooManyMethodsViolation,
+)
+
+module_without_methods = """
+def first(): ...
+
+def second(): ...
+"""
+
+class_with_methods = """
+class First(object):
+    def method(self): ...
+
+    def method2(self): ...
+"""
+
+class_with_class_methods = """
+class First(object):
+    @classmethod
+    def method(cls): ...
+
+    @classmethod
+    def method2(cls): ...
+"""
+
+
+@pytest.mark.parametrize('code', [
+    module_without_methods,
+    class_with_methods,
+    class_with_class_methods,
+])
+def test_method_counts_normal(
+    assert_errors, parse_ast_tree, code, default_options,
+):
+    """Testing that regular classes and functions work well."""
+    tree = parse_ast_tree(code)
+
+    visiter = MethodMembersVisitor(default_options)
+    visiter.visit(tree)
+
+    assert_errors(visiter, [])
+
+
+@pytest.mark.parametrize('code', [
+    class_with_methods,
+    class_with_class_methods,
+])
+def test_method_counts_violation(
+    assert_errors, parse_ast_tree, code, options,
+):
+    """Testing that violations are raised when reaching max value."""
+    tree = parse_ast_tree(code)
+
+    option_values = options(max_methods=1)
+    visiter = MethodMembersVisitor(option_values)
+    visiter.visit(tree)
+
+    assert_errors(visiter, [TooManyMethodsViolation])

tests/test_visitors/test_complexity/test_counts/test_module_counts.py

@@ -0,0 +1,55 @@
+# -*- coding: utf-8 -*-
+
+import pytest
+
+from wemake_python_styleguide.visitors.complexity.counts import (
+    ModuleMembersVisitor,
+    TooManyModuleMembersViolation,
+)
+
+module_with_function_and_class = """
+def first(): ...
+
+class Second(object): ...
+"""
+
+module_with_methods = """
+class First(object):
+    def method(self): ...
+
+class Second(object):
+    def method2(self): ...
+"""
+
+
+@pytest.mark.parametrize('code', [
+    module_with_function_and_class,
+    module_with_methods,
+])
+def test_module_counts_normal(
+    assert_errors, parse_ast_tree, code, default_options,
+):
+    """Testing that classes and functions in a module work well."""
+    tree = parse_ast_tree(code)
+
+    visiter = ModuleMembersVisitor(default_options)
+    visiter.visit(tree)
+
+    assert_errors(visiter, [])
+
+
+@pytest.mark.parametrize('code', [
+    module_with_function_and_class,
+    module_with_methods,
+])
+def test_module_counts_violation(
+    assert_errors, parse_ast_tree, code, options,
+):
+    """Testing that violations are raised when reaching max value."""
+    tree = parse_ast_tree(code)
+
+    option_values = options(max_module_members=1)
+    visiter = ModuleMembersVisitor(option_values)
+    visiter.visit(tree)
+
+    assert_errors(visiter, [TooManyModuleMembersViolation])

tests/test_visitors/test_complexity/test_function/test_elifs.py

@@ -0,0 +1,62 @@
+# -*- coding: utf-8 -*-
+
+import pytest
+
+from wemake_python_styleguide.visitors.complexity.function import (
+    FunctionComplexityVisitor,
+    TooManyElifsViolation,
+)
+
+function_with_elifs = """
+def test_module():
+    if 1 > 2:
+        print(1)
+    elif 2 > 3:
+        print(2)
+    elif 3 > 4:
+        print(3)
+    else:
+        print(4)
+"""
+
+function_with_raw_if = """
+def function():
+    if 1 == 2:
+        print(1)
+"""
+
+function_with_if_else = """
+def function(param):
+    if 1 == 2:
+        print(1)
+    else:
+        print(2)
+"""
+
+
+@pytest.mark.parametrize('code', [
+    function_with_elifs,
+    function_with_raw_if,
+    function_with_if_else,
+])
+def test_elif_correct_count(
+    assert_errors, parse_ast_tree, code, default_options,
+):
+    """Testing that all `if`/`elif`/`else` stuff is allowed."""
+    tree = parse_ast_tree(code)
+
+    visiter = FunctionComplexityVisitor(default_options)
+    visiter.visit(tree)
+
+    assert_errors(visiter, [])
+
+
+def test_elif_incorrect_count(assert_errors, parse_ast_tree, options):
+    """Testing that incorrect number of `elif` stuff is restricted."""
+    tree = parse_ast_tree(function_with_elifs)
+
+    option_values = options(max_elifs=1)
+    visiter = FunctionComplexityVisitor(option_values)
+    visiter.visit(tree)
+
+    assert_errors(visiter, [TooManyElifsViolation])

tests/test_visitors/test_complexity/test_offset/test_offset_visitor.py → tests/test_visitors/test_complexity/test_offset_visitor.py

@@ -13,6 +13,12 @@ def container():
         x = 1
 """
 
+nested_if2 = """
+def container():
+    if some_value:
+        call_other()
+"""
+
 nested_for = """
 def container():
     for i in '123':
@@ -27,6 +33,15 @@ def container():
         raise
 """
 
+nested_try2 = """
+def container():
+    if some:
+        try:
+            some()
+        except Exception:
+            raise
+"""
+
 nested_with = """
 if True:
     with open('some') as temp:
@@ -43,8 +58,10 @@ def container():
 
 @pytest.mark.parametrize('code', [
     nested_if,
+    nested_if2,
     nested_for,
     nested_try,
+    nested_try2,
     nested_with,
     nested_while,
 ])
@@ -60,8 +77,10 @@ def test_nested_offset(assert_errors, parse_ast_tree, code, default_options):
 
 @pytest.mark.parametrize('code, number_of_errors', [
     (nested_if, 1),
+    (nested_if2, 1),
     (nested_for, 1),
     (nested_try, 2),
+    (nested_try2, 4),
     (nested_with, 1),
     (nested_while, 1),
 ])