Merge pull request #13 from TalentBox/allows-dash-in-tags

Allows dash (`-`) in tags
codegram · May 21, 2012 · 5290138 · 5290138
2 parents 7ba6d4b + e3a6b29
commit 5290138
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 6 deletions.
diff --git a/lib/gherkin/parser/gherkin.rex b/lib/gherkin/parser/gherkin.rex
@@ -19,7 +19,7 @@ rule
   Scenario:                             { [:SCENARIO, text[0..-2]] }
 
   # Tags
-  @\w+                                  { [:TAG, text[1..-1]] }
+  @(\w|-)+                              { [:TAG, text[1..-1]] }
 
   # Step keywords
   Given                                 { [:GIVEN, text] }

diff --git a/lib/gherkin/parser/lexer.rb b/lib/gherkin/parser/lexer.rb
@@ -77,7 +77,7 @@ def _next_token
       when (text = @ss.scan(/Scenario:/))
          action { [:SCENARIO, text[0..-2]] }
 
-      when (text = @ss.scan(/@\w+/))
+      when (text = @ss.scan(/@(\w|-)+/))
          action { [:TAG, text[1..-1]] }
 
       when (text = @ss.scan(/Given/))

diff --git a/lib/gherkin/parser/parser.rb b/lib/gherkin/parser/parser.rb
diff --git a/test/gherkin/parser/parser_test.rb b/test/gherkin/parser/parser_test.rb
@@ -96,7 +96,7 @@ def parse(input)
     Given blah foo bar
     Then something else
 
-  @javascript @wip
+  @javascript @wip @with-vcr
   Scenario: Foo bar baz blah
     Given blah foo bar
     Then something else
@@ -105,8 +105,9 @@ def parse(input)
 
         last_scenario  = scenarios.last
 
-        last_scenario.tags.first.name.must_equal "javascript"
+        last_scenario.tags[0].name.must_equal "javascript"
-        last_scenario.tags.last.name.must_equal "wip"
+        last_scenario.tags[1].name.must_equal "wip"
+        last_scenario.tags[2].name.must_equal "with-vcr"
       end
     end
   end