gherkin 2.0.2-i386-mingw32 → 2.1.0-i386-mingw32

data/ragel/lexer.java.rl.erb

@@ -142,8 +142,7 @@ public class <%= @i18n.underscored_iso_code.upcase %> implements Lexer {
 
   %% write data noerror;
 
-  public void scan(String source, String uri, int offset)  {
-    listener.location(uri, offset);
+  public void scan(String source)  {
     String input = source + "\n%_FEATURE_END_%";
     byte[] data = null;
     try {

data/ragel/lexer.rb.rl.erb

@@ -127,8 +127,7 @@ module Gherkin
         %% write data;
       end
  
-      def scan(data, uri, offset)
-        @listener.location(uri, offset)
+      def scan(data)
         data = (data + "\n%_FEATURE_END_%").unpack("c*") # Explicit EOF simplifies things considerably
         eof = pe = data.length
  

data/spec/gherkin/fixtures/complex_for_filtering.feature

@@ -0,0 +1,60 @@
+#Comment on line 1
+#Comment on line 2
+@tag1 @tag2
+Feature: Feature Text
+  In order to test multiline forms
+  As a ragel writer
+  I need to check for complex combinations
+
+  #Comment on line 9
+  #Comment on line 11
+  Background: 
+    Given this is a background step
+    And this is another one
+
+  @tag3 @tag4
+  Scenario: Reading a Scenario
+    Given there is a step
+    But not another step
+
+  @tag3
+  Scenario: Reading a second scenario
+    With two lines of text
+
+    #Comment on line 24
+    Given a third step with a table
+      | a | b |
+      | c | d |
+      | e | f |
+    And I am still testing things
+    And I am done testing these tables
+    #Comment on line 29
+    Then I am happy
+      | g | h |
+      | e | r |
+      | k | i |
+      | n |   |
+
+  Scenario: Hammerzeit XX
+    Given All work and no play
+    Then crazy
+      """
+      Makes Homer something something
+      And something else
+      """
+
+  @more
+  Scenario Outline: More
+    Given Some <whaaa>
+
+    @neat
+    Examples: Neato XX
+      | whaa |
+      | neat |
+      | beat |
+
+    @hamster
+    Examples: Rodents
+      | whaa  |
+      | hammy |
+      | mousy |

data/spec/gherkin/fixtures/complex_with_tags.feature

@@ -0,0 +1,61 @@
+#Comment on line 1
+#Comment on line 2
+@tag1 @tag2
+Feature: Feature Text
+  In order to test multiline forms
+  As a ragel writer
+  I need to check for complex combinations
+
+  #Comment on line 9
+
+  #Comment on line 11
+
+  Background:
+    Given this is a background step
+    And this is another one
+
+  @tag3 @tag4
+  Scenario: Reading a Scenario
+    Given there is a step
+    But not another step
+
+  @tag3
+  Scenario: Reading a second scenario
+    With two lines of text
+    #Comment on line 24
+    Given a third step with a table
+    |a|b|
+    |c|d|
+    |e|f|
+    And I am still testing things
+      |g|h|
+      |e|r|
+      |k|i|
+      |n|| 
+    And I am done testing these tables
+    #Comment on line 29
+    Then I am happy
+
+  Scenario: Hammerzeit
+    Given All work and no play
+      """
+      Makes Homer something something
+      And something else
+      """
+    Then crazy
+
+  @more
+  Scenario Outline: More
+    Given Some <whaaa>
+    
+    @neat
+    Examples: Neato
+      |whaa|
+      |neat|
+      |beat|
+    
+    @hamster
+    Examples: Rodents
+      |whaa|
+      |hammy|
+      |mousy|

data/spec/gherkin/fixtures/hantu_pisang.feature

@@ -0,0 +1,35 @@
+Feature: search examples
+
+  Background: The background
+    Given passing without a table
+
+  Scenario: should match Hantu Pisang
+    Given passing without a table
+
+  Scenario: Ignore me
+    Given failing without a table
+
+  Scenario Outline: Ignore me
+    Given <state> without a table
+
+    Examples: 
+      | state   |
+      | 1111111 |
+
+  Scenario Outline: Hantu Pisang match
+    Given <state> without a table
+
+    Examples: 
+      | state   |
+      | 2222222 |
+
+  Scenario Outline: no match in name but in examples
+    Given <state> without a table
+
+    Examples: Hantu Pisang
+      | state   |
+      | 3333333 |
+
+    Examples: Ignore me
+      | state   |
+      | 4444444 |

data/spec/gherkin/formatter/filter_formatter_spec.rb

@@ -0,0 +1,156 @@
+# encoding: utf-8
+require 'stringio'
+require 'spec_helper'
+require 'gherkin/i18n_lexer'
+require 'gherkin/listener/formatter_listener'
+require 'gherkin/formatter/filter_formatter'
+require 'gherkin/formatter/pretty_formatter'
+
+module Gherkin
+  module Formatter
+    describe FilterFormatter do
+      attr_accessor :file
+
+      before do
+        self.file = 'complex_for_filtering.feature'
+      end
+
+      def verify_filter(filters, *line_ranges)
+        io = StringIO.new
+        pretty_formatter = Gherkin::Formatter::PrettyFormatter.new(io, true)
+        filter_formatter = Gherkin::Formatter::FilterFormatter.new(pretty_formatter, filters)
+        parser = Gherkin::Parser::Parser.new(filter_formatter)
+
+        path = File.dirname(__FILE__) + "/../fixtures/" + file
+        source = File.new(path).read + "# __EOF__"
+        parser.parse(source, path, 0)
+        
+        source_lines = source.split("\n")
+        expected = (line_ranges.map do |line_range|
+          source_lines[(line_range.first-1..line_range.last-1)]
+        end.flatten).join("\n").gsub(/# __EOF__/, '')
+        io.string.should == expected
+      end
+
+      context "tags" do
+        it "should filter on feature tag" do
+          verify_filter(['@tag1'], 1..61)
+        end
+
+        it "should filter on scenario tag" do
+          verify_filter(['@tag4'], 1..19)
+        end
+
+        it "should filter on abother scenario tag" do
+          verify_filter(['@tag3'], 1..37)
+        end
+
+        it "should filter on scenario outline tag" do
+          verify_filter(['@more'], 1..14, 46..61)
+        end
+
+        it "should filter on first examples tag" do
+          verify_filter(['@neat'], 1..14, 46..55)
+        end
+
+        it "should filter on second examples tag" do
+          verify_filter(['@hamster'], 1..14, 46..49, 56..61)
+        end
+      end
+
+      context "names" do
+        it "should filter on scenario name" do
+          verify_filter([/Reading a Scenario/], 1..19)
+        end
+
+        it "should filter on scenario outline name" do
+          verify_filter([/More/], 1..14, 46..61)
+        end
+
+        it "should filter on first examples name" do
+          verify_filter([/Neato/], 1..14, 46..55)
+        end
+
+        it "should filter on second examples name" do
+          verify_filter([/Rodents/], 1..14, 46..49, 56..61)
+        end
+
+        it "should filter on various names" do
+          self.file = 'hantu_pisang.feature'
+          verify_filter([/Pisang/], 1..8, 19..32)
+        end
+
+        it "should filter on background name" do
+          self.file = 'hantu_pisang.feature'
+          verify_filter([/The background/], 1..5)
+        end
+      end
+
+      context "lines" do
+        context "on the same line as feature element keyword" do
+          it "should filter on scenario line" do
+            verify_filter([16], 1..19)
+          end
+
+          it "should filter on scenario outline line" do
+            verify_filter([47], 1..14, 46..61)
+          end
+
+          it "should filter on first examples line" do
+            verify_filter([51], 1..14, 46..55)
+          end
+
+          it "should filter on second examples line" do
+            verify_filter([57], 1..14, 46..49, 56..61)
+          end
+        end
+
+        context "on the same line as step keyword" do
+          it "should filter on step line" do
+            verify_filter([17], 1..19)
+          end
+
+          it "should filter on scenario outline line" do
+            verify_filter([48], 1..14, 46..61)
+          end
+        end
+
+        context "on examples header line" do
+          it "should filter on first table" do
+            verify_filter([52], 1..14, 46..55)
+          end
+
+          it "should filter on second table" do
+            verify_filter([58], 1..14, 46..49, 56..61)
+          end
+        end
+
+        context "on examples example line" do
+          it "should filter on first table" do
+            verify_filter([53], 1..14, 46..53, 55..55)
+          end
+        end
+
+        context "on tag line" do
+          it "should filter on first tag" do
+            verify_filter([15], 1..19)
+          end
+        end
+
+        context "multiline argument" do
+          it "should filter on table line" do
+            verify_filter([36], 1..14, 20..37)
+          end
+
+          it "should filter on first pystring quote" do
+            verify_filter([41], 1..14, 38..45)
+          end
+
+          it "should filter on last pystring quote" do
+            verify_filter([44], 1..14, 38..45)
+          end
+        end
+      end
+    end
+  end
+end

data/spec/gherkin/formatter/model_spec.rb

@@ -0,0 +1,15 @@
+require 'spec_helper'
+require 'gherkin/formatter/model'
+
+module Gherkin
+  module Formatter
+    module Model
+      describe Tag do
+        it "should be equal when name is equal" do
+          tags = [Tag.new('@x', 1), Tag.new('@y', 2), Tag.new('@x', 3)]
+          tags.uniq.length.should == 2
+        end
+      end
+    end
+  end
+end

data/spec/gherkin/formatter/pretty_formatter_spec.rb

@@ -2,8 +2,8 @@
 require 'spec_helper'
 require 'gherkin/formatter/pretty_formatter'
 require 'gherkin/formatter/argument'
-require 'gherkin/parser/formatter_listener'
-require 'gherkin/parser/row'
+require 'gherkin/formatter/model'
+require 'gherkin/listener/formatter_listener'
 require 'stringio'
 
 module Gherkin
@@ -18,29 +18,31 @@ module Gherkin
         [true, false].each do |force_ruby|
           io = StringIO.new
           pf = Gherkin::Formatter::PrettyFormatter.new(io, true)
-          l  = Gherkin::Parser::FormatterListener.new(pf)
-          parser = Gherkin::Parser::Parser.new(l, true, "root")
-          lexer  = Gherkin::I18nLexer.new(parser, force_ruby)
-          lexer.scan(input, "test.feature", 0)
+          parser = Gherkin::Parser::Parser.new(pf, true, "root", force_ruby)
+          parser.parse(input, "test.feature", 0)
           actual = io.string
           actual.should == output
         end
       end
 
+      def result(status, error_message, arguments, stepdef_location)
+        Model::Result.new(status, error_message, arguments, stepdef_location)
+      end
+
       before do
         @io = StringIO.new
         @l = Gherkin::Formatter::PrettyFormatter.new(@io, true)
       end
 
       it "should print comments when scenario is longer" do
-        @l.feature([], [], "Feature", "Hello", "World", "features/foo.feature")
+        @l.feature(Model::Statement.new([], [], "Feature", "Hello", "World", 1), "features/foo.feature")
         @l.steps([
           ['Given ', 'some stuff'],
           ['When ', 'foo']
         ])
-        @l.scenario([], [], "Scenario", "The scenario", "", 4)
-        @l.step([], "Given ", "some stuff", 5, nil, nil, nil, nil, "features/step_definitions/bar.rb:56")
-        @l.step([], "When ", "foo", 6, nil, nil, nil, nil, "features/step_definitions/bar.rb:96")
+        @l.scenario(Model::Statement.new([], [], "Scenario", "The scenario", "", 4))
+        @l.step(Model::Statement.new([], [], "Given ", "some stuff", "", 5), nil, result('passed', nil, nil, "features/step_definitions/bar.rb:56"))
+        @l.step(Model::Statement.new([], [], "When ", "foo", "", 6), nil, result('passed', nil, nil, "features/step_definitions/bar.rb:96"))
 
         assert_io(%{Feature: Hello
   World
@@ -52,12 +54,12 @@ module Gherkin
       end
 
       it "should print comments when step is longer" do
-        @l.feature([], [], "Feature", "Hello", "World", "features/foo.feature")
+        @l.feature(Model::Statement.new([], [], "Feature", "Hello", "World", 1), "features/foo.feature")
         @l.steps([
           ['Given ', 'some stuff that is longer']
         ])
-        @l.scenario([], [], "Scenario", "The scenario", "", 4)
-        @l.step([], "Given ", "some stuff that is longer", 5, nil, nil, nil, nil, "features/step_definitions/bar.rb:56")
+        @l.scenario(Model::Statement.new([], [], "Scenario", "The scenario", "", 4))
+        @l.step(Model::Statement.new([], [], "Given ", "some stuff that is longer", "", 5), nil, result('passed', nil, nil, "features/step_definitions/bar.rb:56"))
 
         assert_io(%{Feature: Hello
   World
@@ -68,8 +70,7 @@ module Gherkin
       end
 
       it "should highlight arguments for regular steps" do
-        passed = defined?(JRUBY_VERSION) ? 'passed' : :passed
-        @l.step([], "Given ", "I have 999 cukes in my belly", 3, nil, passed, nil, [Gherkin::Formatter::Argument.new(7, '999')], nil)
+        @l.step(Model::Statement.new([], [], "Given ", "I have 999 cukes in my belly", "", 3), nil, result('passed', nil, [Gherkin::Formatter::Argument.new(7, '999')], nil))
         assert_io("    Given I have 999 cukes in my belly\n")
       end
 
@@ -128,7 +129,7 @@ Feature: Feature Description
       it "should escape backslashes and pipes" do
         io = StringIO.new
         l = Gherkin::Formatter::PrettyFormatter.new(io, true)
-        l.__send__(:table, [Gherkin::Parser::Row.new(['|', '\\'], [], nil)])
+        l.__send__(:table, [Gherkin::Formatter::Model::Row.new([], ['|', '\\'], nil)])
         io.string.should == '      | \\| | \\\\ |' + "\n"
       end
     end

data/spec/gherkin/formatter/tag_count_formatter_spec.rb

@@ -0,0 +1,31 @@
+# encoding: utf-8
+require 'spec_helper'
+require 'gherkin/i18n_lexer'
+require 'gherkin/listener/formatter_listener'
+require 'gherkin/formatter/tag_count_formatter'
+
+module Gherkin
+  module Formatter
+    describe TagCountFormatter do
+      it "should count tags" do
+        tag_counts = {}
+        dummy = Gherkin::SexpRecorder.new
+        formatter = Gherkin::Formatter::TagCountFormatter.new(dummy, tag_counts)
+        parser = Gherkin::Parser::Parser.new(formatter)
+
+        f = File.new(File.dirname(__FILE__) + "/../fixtures/complex_with_tags.feature").read
+        parser.parse(f, 'f.feature', 0)
+        
+        tag_counts.should == {
+          "@hamster" => ["f.feature:58"],
+          "@tag1"    => ["f.feature:18","f.feature:23","f.feature:39","f.feature:52","f.feature:58"],
+          "@tag2"    => ["f.feature:18","f.feature:23","f.feature:39","f.feature:52","f.feature:58"],
+          "@tag3"    => ["f.feature:18", "f.feature:23"],
+          "@tag4"    => ["f.feature:18"],
+          "@neat"    => ["f.feature:52"],
+          "@more"    => ["f.feature:52", "f.feature:58"]
+        }
+      end
+    end
+  end
+end