Merge branch 'master' into ISSUE-139-gherkin-terminal-reporter

Author: Omer Katz

CHANGES.rst

@@ -6,6 +6,11 @@ Changelog
 
 - Add gherkin terminal reporter (spinus + thedrow)
 
+2.17.2
+------
+
+- Fix scenario lines containing an ``@`` being parsed as a tag. (The-Compiler)
+
 2.17.1
 ------
 

pytest_bdd/feature.py

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

tests/feature/test_tags.py

@@ -170,6 +170,37 @@ def i_have_bar():
     )
 
 
+def test_at_in_scenario(testdir):
+    testdir.makefile('.feature', test="""
+    Feature: At sign in a scenario
+
+        Scenario: Tags
+            Given I have a foo@bar
+
+        Scenario: Second
+            Given I have a baz
+    """)
+    testdir.makepyfile("""
+        from pytest_bdd import given, scenarios
+
+        @given('I have a foo@bar')
+        def i_have_at():
+            return 'foo@bar'
+
+        @given('I have a baz')
+        def i_have_baz():
+            return 'baz'
+
+        scenarios('test.feature')
+    """)
+    result = testdir.runpytest_subprocess('--strict')
+    result.stdout.fnmatch_lines(
+        [
+            "*= 2 passed * =*",
+        ],
+    )
+
+
 @pytest.mark.parametrize('line, expected', [
     ('@foo @bar', {'foo', 'bar'}),
     ('@with spaces @bar', {'with spaces', 'bar'}),

tox.ini

@@ -22,7 +22,7 @@ commands=
 basepython=python2.7
 deps =
     {[testenv]deps}
-    hg+https://bitbucket.org/pytest-dev/py#egg=py
+    git+https://github.com/pytest-dev/py#egg=py
     git+https://github.com/pytest-dev/pytest.git@features#egg=pytest
 
 [testenv:coveralls]