Merge branch 'master' into gherkin_expanded_option_improved

Author: sliwinski-milosz

.travis.yml

@@ -1,17 +1,39 @@
 sudo: false
 language: python
-python: "3.4"
-env:
-  matrix:
-    - TESTENV=linters
-    - TESTENV=py27
-#    - TESTENV=py27-xdist
-    - TESTENV=py27-pytest-latest
-    - TESTENV=py34
-    - TESTENV=coveralls
+python: "2.7"
+
+matrix:
+  include:
+    - env: TOXENV=py27-pytestlatest-linters
+    - env: TOXENV=py27-pytest29
+    - env: TOXENV=py27-pytest30
+    - env: TOXENV=py27-pytest31
+    - env: TOXENV=py27-pytest32
+    - env: TOXENV=py27-pytest33
+    - env: TOXENV=py27-pytest34
+    - env: TOXENV=py27-pytest35
+    - env: TOXENV=py27-pytest36
+    - env: TOXENV=py27-pytest37
+    - env: TOXENV=py27-pytest38
+    - env: TOXENV=py27-pytest39
+    - env: TOXENV=py27-pytestlatest
+    - env: TOXENV=py27-pytestlatest-xdist
+    - env: TOXENV=py34-pytestlatest
+      python: "3.4"
+    - env: TOXENV=py35-pytestlatest
+      python: "3.5"
+    - env: TOXENV=py36-pytestlatest
+      python: "3.6"
+    - env: TOXENV=py37-pytestlatest
+      python: "3.7"
+      # Currently, python 3.7 is a little bit tricky to install:
+      # https://github.com/travis-ci/travis-ci/issues/9069#issuecomment-425720905
+      sudo: required
+      dist: xenial
+    - env: TOXENV=py27-pytestlatest-coveralls
 install:
   - pip install tox
-script: tox -e $TESTENV --recreate
+script: tox --recreate
 branches:
   except:
     - /^\d/

CHANGES.rst

@@ -1,6 +1,11 @@
 Changelog
 =========
 
+3.0.1
+------
+
+- Minimal supported version of `pytest` is now 2.9.0 as lower versions do not support `bool` type ini options (sliwinski-milosz) #260
+
 3.0.0
 ------
 

README.rst

@@ -1228,7 +1228,7 @@ If you used ``pytestbdd_feature_base_dir`` fixture to override the path discover
 
 For more details, check the `Feature file paths`_ section.
 
-If you used ``pytestbdd_strict_gherkin`` fixture to relax the parser, you can instead specify ``strict_gherking=False`` in the declaration of your scenarios, or change it globally in the pytest configuration file:
+If you used ``pytestbdd_strict_gherkin`` fixture to relax the parser, you can instead specify ``strict_gherkin=False`` in the declaration of your scenarios, or change it globally in the pytest configuration file:
 
 .. code-block:: ini
 

pytest_bdd/__init__.py

@@ -3,6 +3,6 @@
 from pytest_bdd.steps import given, when, then
 from pytest_bdd.scenario import scenario, scenarios
 
-__version__ = '3.0.0'
+__version__ = '3.0.1'
 
 __all__ = [given.__name__, when.__name__, then.__name__, scenario.__name__, scenarios.__name__]

pytest_bdd/reporting.py

@@ -7,6 +7,7 @@
 import time
 
 from .feature import force_unicode
+from .utils import get_parametrize_markers_args
 
 
 class StepReport(object):
@@ -73,11 +74,11 @@ def __init__(self, scenario, node):
         self.scenario = scenario
         self.step_reports = []
         self.param_index = None
-        parametrize = node.keywords._markers.get('parametrize')
-        if parametrize and scenario.examples:
-            param_names = parametrize.args[0] if isinstance(parametrize.args[0], (tuple, list)) else [
-                parametrize.args[0]]
-            param_values = parametrize.args[1]
+        parametrize_args = get_parametrize_markers_args(node)
+        if parametrize_args and scenario.examples:
+            param_names = parametrize_args[0] if isinstance(parametrize_args[0], (tuple, list)) else [
+                parametrize_args[0]]
+            param_values = parametrize_args[1]
             node_param_values = [node.funcargs[param_name] for param_name in param_names]
             if node_param_values in param_values:
                 self.param_index = param_values.index(node_param_values)

pytest_bdd/utils.py

@@ -84,3 +84,29 @@ def get_request_fixture_names(request):
     Compatibility with pytest 3.0.
     """
     return request._pyfuncitem._fixtureinfo.names_closure
+
+
+def get_parametrize_markers_args(node):
+    """In pytest 3.6 new API to access markers has been introduced and it deprecated
+    MarkInfo objects.
+
+    This function uses that API if it is available otherwise it uses MarkInfo objects.
+    """
+    mark_name = 'parametrize'
+    try:
+        return get_markers_args_using_iter_markers(node, mark_name)
+    except AttributeError:
+        return get_markers_args_using_get_marker(node, mark_name)
+
+
+def get_markers_args_using_iter_markers(node, mark_name):
+    """Recommended on pytest>=3.6"""
+    args = []
+    for mark in node.iter_markers(mark_name):
+        args += mark.args
+    return tuple(args)
+
+
+def get_markers_args_using_get_marker(node, mark_name):
+    """Deprecated on pytest>=3.6"""
+    return getattr(node.get_marker(mark_name), 'args', ())

requirements-testing.txt

@@ -2,4 +2,3 @@ mock
 pytest-pep8
 coverage<4.0a1
 pytest-cache
-pytest-xdist

setup.py

@@ -76,7 +76,7 @@ def run_tests(self):
         "parse",
         "parse_type",
         "py",
-        "pytest>=2.8.1",
+        "pytest>=2.9.0",
         "six>=1.9.0",
     ],
     # the following makes a plugin available to py.test

tests/feature/test_outline.py

@@ -6,15 +6,16 @@
 
 from pytest_bdd import given, when, then, scenario
 from pytest_bdd import exceptions
+from pytest_bdd.utils import get_parametrize_markers_args
 
 
 @scenario(
     'outline.feature',
     'Outlined given, when, thens',
     example_converters=dict(start=int, eat=float, left=str)
 )
-def test_outlined():
-    assert test_outlined.parametrize.args == (
+def test_outlined(request):
+    assert get_parametrize_markers_args(request.node) == (
         [u'start', u'eat', u'left'], [[12, 5.0, '7'], [5, 4.0, '1']])
 
 
@@ -133,35 +134,12 @@ def test_outlined_with_other_fixtures(other_fixture):
     'Outlined with vertical example table',
     example_converters=dict(start=int, eat=float, left=str)
 )
-def test_vertical_example():
+def test_vertical_example(request):
     """Test outlined scenario with vertical examples table."""
-    assert test_vertical_example.parametrize.args == (
+    assert get_parametrize_markers_args(request.node) == (
         [u'start', u'eat', u'left'], [[12, 5.0, '7'], [2, 1.0, '1']])
 
 
-def test_empty_example_values():
-    """Test outlined scenario with empty example values."""
-    @scenario(
-        'outline.feature',
-        'Outlined with empty example values',
-    )
-    def test_scenario():
-        pass
-
-    assert test_scenario.parametrize.args == (
-        [u'start', u'eat', u'left'], [['#', '', '']])
-
-    @scenario(
-        'outline.feature',
-        'Outlined with empty example values vertical',
-    )
-    def test_scenario():
-        pass
-
-    assert test_scenario.parametrize.args == (
-        [u'start', u'eat', u'left'], [['#', '', '']])
-
-
 @given('there are <start> <fruits>')
 def start_fruits(start, fruits):
     assert isinstance(start, int)
@@ -187,8 +165,8 @@ def should_have_left_fruits(start_fruits, start, eat, left, fruits):
     'Outlined given, when, thens',
     example_converters=dict(start=int, eat=float, left=str)
 )
-def test_outlined_feature():
-    assert test_outlined_feature.parametrize.args == (
+def test_outlined_feature(request):
+    assert get_parametrize_markers_args(request.node) == (
         ['start', 'eat', 'left'],
         [[12, 5.0, '7'], [5, 4.0, '1']],
         ['fruits'],

tests/feature/test_outline_empty_values.py

@@ -0,0 +1,36 @@
+"""Scenario Outline with empty example values tests."""
+from pytest_bdd import given, scenario, then, when
+from pytest_bdd.utils import get_parametrize_markers_args
+
+
+@given('there are <start> cucumbers')
+def start_cucumbers(start):
+    pass
+
+
+@when('I eat <eat> cucumbers')
+def eat_cucumbers(eat):
+    pass
+
+
+@then('I should have <left> cucumbers')
+def should_have_left_cucumbers(left):
+    pass
+
+
+@scenario(
+    'outline.feature',
+    'Outlined with empty example values',
+)
+def test_scenario_with_empty_example_values(request):
+    assert get_parametrize_markers_args(request.node) == (
+        [u'start', u'eat', u'left'], [['#', '', '']])
+
+
+@scenario(
+    'outline.feature',
+    'Outlined with empty example values vertical',
+)
+def test_scenario_with_empty_example_values_vertical(request):
+    assert get_parametrize_markers_args(request.node) == (
+        [u'start', u'eat', u'left'], [['#', '', '']])