Merge pull request #188 from The-Compiler/tags_with_spaces

Allow spaces in tags

Author: olegpidsadnyi

CHANGES.rst

@@ -1,12 +1,14 @@
 Changelog
 =========
 
-2.16.2
+2.17.0
 ------
 
 - Fix FixtureDef signature for newer pytest versions (The-Compiler)
 - Better error explanation for the steps defined outside of scenarios (olegpidsadnyi)
 - Add a ``pytest_bdd_apply_tag`` hook to customize handling of tags (The-Compiler)
+- Allow spaces in tag names. This can be useful when using the
+  ``pytest_bdd_apply_tag`` hook with tags like ``@xfail: Some reason``.
 
 
 2.16.1

pytest_bdd/__init__.py

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

pytest_bdd/feature.py

@@ -134,9 +134,10 @@ def get_tags(line):
 
     :return: List of tags.
     """
+    if not line or '@' not in line.strip():
+        return set()
     return (
-        set((tag[1:] for tag in line.split() if tag.startswith("@") and len(tag) > 1))
-        if line else set()
+        set((tag.lstrip('@') for tag in line.strip().split(' @') if len(tag) > 1))
     )
 
 

tests/feature/test_tags.py

@@ -1,5 +1,7 @@
 """Test tags."""
-from pytest_bdd import scenario
+import pytest
+
+from pytest_bdd import scenario, feature
 
 
 def test_tags(request):
@@ -139,3 +141,48 @@ def i_have_bar():
             "*= 2 skipped * =*",
         ],
     )
+
+
+def test_tag_with_spaces(testdir):
+    testdir.makeconftest("""
+        import pytest
+
+        @pytest.hookimpl(tryfirst=True)
+        def pytest_bdd_apply_tag(tag, function):
+            assert tag == 'test with spaces'
+    """)
+    testdir.makefile('.feature', test="""
+    Feature: Tag with spaces
+
+        @test with spaces
+        Scenario: Tags
+            Given I have a bar
+    """)
+    testdir.makepyfile("""
+        from pytest_bdd import given, scenarios
+
+        @given('I have a bar')
+        def i_have_bar():
+            return 'bar'
+
+        scenarios('test.feature')
+    """)
+    result = testdir.runpytest_subprocess()
+    result.stdout.fnmatch_lines(
+        [
+            "*= 1 passed * =*",
+        ],
+    )
+
+
+@pytest.mark.parametrize('line, expected', [
+    ('@foo @bar', {'foo', 'bar'}),
+    ('@with spaces @bar', {'with spaces', 'bar'}),
+    ('@double @double', {'double'}),
+    ('    @indented', {'indented'}),
+    (None, set()),
+    ('foobar', set()),
+    ('', set()),
+])
+def test_get_tags(line, expected):
+    assert feature.get_tags(line) == expected