Merge remote-tracking branch 'upstream/master' into enable_gherkin_output_with_expand_option

Author: sliwinski-milosz

.travis.yml

@@ -1,35 +1,12 @@
 dist: xenial
 language: python
-python: "2.7"
+python:
+  - "2.7"
+  - "3.5"
+  - "3.6"
+  - "3.7"
 
-matrix:
-  include:
-    - python: "2.7"
-      env: TOXENV=py27-pytestlatest-linters
-    - 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-pytest310
-    - env: TOXENV=py27-pytest40
-    - env: TOXENV=py27-pytest41
-    - env: TOXENV=py27-pytest42
-    - 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"
-    - env: TOXENV=py27-pytestlatest-coveralls
-
-install: pip install tox
+install: pip install tox tox-travis
 
 script: tox --recreate
 
@@ -39,5 +16,5 @@ branches:
 
 notifications:
   email:
-  - [email protected]
-  - [email protected]
+    - [email protected]
+    - [email protected]

CHANGES.rst

@@ -4,6 +4,12 @@ Changelog
 Unreleased
 ----------
 
+3.1.1
+----------
+
+- Allow unicode string in ``@given()`` step names when using python2.
+  This makes the transition of projects from python 2 to 3 easier.
+
 3.1.0
 ----------
 

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.1.0'
+__version__ = '3.1.1'
 
 __all__ = [given.__name__, when.__name__, then.__name__, scenario.__name__, scenarios.__name__]

pytest_bdd/steps.py

@@ -85,7 +85,7 @@ def step_func(request):
 
         step_func.step_type = GIVEN
         step_func.converters = converters
-        step_func.__name__ = name
+        step_func.__name__ = force_encode(name, 'ascii')
         step_func.fixture = fixture
         func = pytest.fixture(scope=scope)(lambda: step_func)
         func.__doc__ = 'Alias for the "{0}" fixture.'.format(fixture)

requirements-testing.txt

@@ -1,4 +1,4 @@
 mock
-pytest-pep8
 coverage<4.0a1
 pytest-cache
+pycodestyle

setup.cfg

@@ -1,3 +1,5 @@
 [wheel]
 universal = 1
 
+[pycodestyle]
+max-line-length = 120

tests/feature/test_cucumber_json.py

@@ -31,6 +31,14 @@ def __cmp__(self, other):
 
 def test_step_trace(testdir):
     """Test step trace."""
+    testdir.makefile(".ini", pytest=textwrap.dedent("""
+    [pytest]
+    markers =
+        scenario-passing-tag
+        scenario-failing-tag
+        scenario-outline-passing-tag
+        feature-tag
+    """))
     testdir.makefile('.feature', test=textwrap.dedent("""
     @feature-tag
     Feature: One passing scenario, one failing scenario
@@ -273,6 +281,12 @@ def test_passing_outline():
 
 def test_step_trace_with_expand_option(testdir):
     """Test step trace."""
+    testdir.makefile(".ini", pytest=textwrap.dedent("""
+    [pytest]
+    markers =
+        feature-tag
+        scenario-outline-passing-tag
+    """))
     testdir.makefile('.feature', test=textwrap.dedent("""
     @feature-tag
     Feature: One scenario outline, expanded to multiple scenarios
@@ -299,7 +313,7 @@ def type_type_and_value_value():
         def test_passing_outline():
             pass
     """))
-    result, jsonobject = runandparse(testdir, '--cucumber-json-expand')
+    result, jsonobject = runandparse(testdir, '--cucumber-json-expanded')
     assert result.ret == 0
 
     assert jsonobject[0]["elements"][0]["steps"][0]["name"] == "type str and value hello"

tests/feature/test_report.py

@@ -23,6 +23,13 @@ def __cmp__(self, other):
 
 def test_step_trace(testdir):
     """Test step trace."""
+    testdir.makefile(".ini", pytest=textwrap.dedent("""
+    [pytest]
+    markers =
+        feature-tag
+        scenario-passing-tag
+        scenario-failing-tag
+    """))
     feature = testdir.makefile('.feature', test=textwrap.dedent("""
     @feature-tag
     Feature: One passing scenario, one failing scenario

tests/feature/test_reuse.py

@@ -21,6 +21,7 @@ def appends_1(empty_list):
     empty_list.append(1)
     return empty_list
 
+
 given('I have a fixture (appends 1 to a list) in reuse syntax', fixture='appends_1')
 
 

tests/feature/test_tags.py

@@ -1,25 +1,23 @@
 """Test tags."""
-import pytest
-
-from pytest_bdd import scenario, feature
+import textwrap
 
+import pytest
 
-def test_tags(request):
-    """Test tags for the scenario and the feature."""
-    @scenario(
-        'tags.feature',
-        'Tags'
-    )
-    def test():
-        pass
-
-    assert test.__scenario__.tags == set(['scenario_tag_1', 'scenario_tag_2'])
-    assert test.__scenario__.feature.tags == set(['feature_tag_1', 'feature_tag_2'])
-    test(request)
+from pytest_bdd import feature
 
 
 def test_tags_selector(testdir):
     """Test tests selection by tags."""
+    testdir.makefile(".ini", pytest=textwrap.dedent("""
+    [pytest]
+    markers =
+        feature_tag_1
+        feature_tag_2
+        scenario_tag_01
+        scenario_tag_02
+        scenario_tag_10
+        scenario_tag_20
+    """))
     testdir.makefile('.feature', test="""
     @feature_tag_1 @feature_tag_2
     Feature: Tags
@@ -43,9 +41,10 @@ def i_have_bar():
 
         scenarios('test.feature')
     """)
-    result = testdir.runpytest('-m', 'scenario_tag_10 and not scenario_tag_01', '-vv').parseoutcomes()
-    assert result['passed'] == 1
-    assert result['deselected'] == 1
+    result = testdir.runpytest('-m', 'scenario_tag_10 and not scenario_tag_01', '-vv')
+    outcomes = result.parseoutcomes()
+    assert outcomes['passed'] == 1
+    assert outcomes['deselected'] == 1
 
     result = testdir.runpytest('-m', 'scenario_tag_01 and not scenario_tag_10', '-vv').parseoutcomes()
     assert result['passed'] == 1
@@ -60,6 +59,10 @@ def i_have_bar():
 
 def test_tags_after_background_issue_160(testdir):
     """Make sure using a tag after background works."""
+    testdir.makefile(".ini", pytest=textwrap.dedent("""
+    [pytest]
+    markers = tag
+    """))
     testdir.makefile('.feature', test="""
     Feature: Tags after background
 
@@ -132,6 +135,11 @@ def i_have_bar():
 
 
 def test_tag_with_spaces(testdir):
+    testdir.makefile(".ini", pytest=textwrap.dedent("""
+    [pytest]
+    markers =
+        test with spaces
+    """))
     testdir.makeconftest("""
         import pytest