Rename parametrized fixture to 'candindate' from 'wish'.

Author: alexamici

CHANGELOG.rst

@@ -2,8 +2,9 @@
 0.9.8 (unreleased)
 ------------------
 
-- Add the `pytest.mark.target` marker in the place of `pytest_nodev.search`.
+- Add the ``pytest.mark.target`` marker in the place of ``pytest_nodev.search``.
   Issue `#28 <https://github.com/nodev-io/pytest-nodev/issues/28>`_.
+- Rename main fixture to ``candidate`` from ``wish``.
 
 
 0.9.7 (2016-03-13)

pytest_nodev/plugin.py

@@ -38,7 +38,7 @@
 
 
 def pytest_addoption(parser):
-    group = parser.getgroup('wish')
+    group = parser.getgroup('nodev')
     group.addoption(
         '--wish-from-stdlib', action='store_true',
         help="Collects objects form the Python standard library.")
@@ -66,11 +66,11 @@ def pytest_addoption(parser):
     group.addoption('--wish-fail', action='store_true', help="Show wish failures.")
 
 
-def make_wish_index(config):
+def make_candidate_index(config):
     if config.getoption('wish_from_all') and os.environ.get('PYTEST_NODEV_MODE') != 'FEARLESS':
         raise ValueError("Use of --wish-from-all may be very dangerous, see the docs.")
 
-    if not hasattr(config, '_wish_index_items'):
+    if not hasattr(config, '_candicate_index'):
         # take over collect logging
         collect.logger.propagate = False
         collect.logger.setLevel(logging.DEBUG)  # FIXME: loglevel should be configurable
@@ -109,40 +109,40 @@ def make_wish_index(config):
         )
 
         # store index
-        config._wish_index_items = list(zip(*sorted(object_index.items()))) or [(), ()]
+        config._candicate_index = list(zip(*sorted(object_index.items()))) or [(), ()]
 
-    return config._wish_index_items
+    return config._candicate_index
 
 
 def pytest_pycollect_makeitem(collector, name, obj):
     target_marker = getattr(obj, 'target', None)
     if target_marker and getattr(target_marker, 'args', []):
         target_name = target_marker.args[0]
 
-        def wrapper(wish, monkeypatch, *args, **kwargs):
+        def wrapper(candidate, monkeypatch, *args, **kwargs):
             if '.' in target_name:
-                monkeypatch.setattr(target_name, wish, raising=False)
+                monkeypatch.setattr(target_name, candidate, raising=False)
             else:
-                monkeypatch.setattr(inspect.getmodule(obj), target_name, wish, raising=False)
+                monkeypatch.setattr(inspect.getmodule(obj), target_name, candidate, raising=False)
             return obj(*args, **kwargs)
 
         wrapper.__dict__ = obj.__dict__
         return list(collector._genfunctions(name, wrapper))
 
 
 def pytest_generate_tests(metafunc):
-    if 'wish' not in metafunc.fixturenames:
+    if 'candidate' not in metafunc.fixturenames:
         return
 
-    ids, params = make_wish_index(metafunc.config)
-    metafunc.parametrize('wish', params, ids=ids, scope='module')
+    ids, params = make_candidate_index(metafunc.config)
+    metafunc.parametrize('candidate', params, ids=ids, scope='module')
 
     if not metafunc.config.getoption('wish_fail'):
         metafunc.function = pytest.mark.xfail(metafunc.function)
 
 
 def pytest_terminal_summary(terminalreporter):
-    if not hasattr(terminalreporter.config, '_wish_index_items'):
+    if not hasattr(terminalreporter.config, '_candicate_index'):
         return
 
     hit_state = 'passed' if terminalreporter.config.getoption('wish_fail') else 'xpassed'

specs/test_object_from_name.py

@@ -1,18 +1,16 @@
 import os
 
-import pytest
 
-
-def test_object_from_name_simple(wish):
-    object_from_name = wish
+def test_object_from_name_simple(candidate):
+    object_from_name = candidate
     assert object_from_name('os:O_CREAT') is os.O_CREAT
     assert object_from_name('os.path:join') is os.path.join
     assert object_from_name('builtins:True') is True
     assert object_from_name('builtins:open') is open
 
 
-def test_object_from_name_pep3155(wish):
-    object_from_name = wish
+def test_object_from_name_pep3155(candidate):
+    object_from_name = candidate
     # instance methods compare by equality, see http://stackoverflow.com/questions/15977808
     assert object_from_name('os:O_CREAT.bit_length') == os.O_CREAT.bit_length
     assert object_from_name('builtins:int.bit_length') is int.bit_length

tests/test_plugin.py

@@ -15,8 +15,8 @@ def test_pass():
     assert True
 '''
 TEST_FACTORIAL_PY = '''
-def test_factorial(wish):
-    factorial = wish
+def test_factorial(candidate):
+    factorial = candidate
     assert factorial(0) == 1
     assert factorial(1) == 1
     assert factorial(21) == 51090942171709440000
@@ -45,7 +45,7 @@ def test_pytest_addoption(testdir):
     )
     # fnmatch_lines does an assertion internally
     result.stdout.fnmatch_lines([
-        'wish:',
+        'nodev:',
         '*--wish-from-stdlib*',
         '*--wish-fail*',
     ])
@@ -111,13 +111,13 @@ def test_pytest_run_no_wish(testdir):
 
 
 def test_pytest_run_no_wish_option(testdir):
-    """Skip tests with the *wish* fixture if no ``--wish-*`` option is given."""
+    """Skip tests with the *candidate* fixture if no ``--wish-*`` option is given."""
     testdir.makepyfile(TEST_FACTORIAL_PY)
     result = testdir.runpytest(
         '-v',
     )
     result.stdout.fnmatch_lines([
-        '*test_factorial*wish*SKIPPED',
+        '*test_factorial*candidate*SKIPPED',
     ])
     assert result.ret == 0