gherkin 2.6.4-java → 2.6.5-java

data/.travis.yml

@@ -12,4 +12,4 @@ notifications:
     - cukes-devs@googlegroups.com
   irc:
     - "irc.freenode.org#cucumber"
-    
+    

data/History.md

@@ -1,3 +1,9 @@
+## [2.6.5](https://github.com/cucumber/gherkin/compare/v2.6.4...v2.6.5)
+
+### Bugfixes
+
+* Bad filtering when Scenario Outline+Examples followed by Scenario ([https://github.com/cucumber/gherkin/issues/145](#145) Aslak Hellesøy)
+
 ## [2.6.4](https://github.com/cucumber/gherkin/compare/v2.6.3...v2.6.4)
 
 ### Changed Features

data/README.md

@@ -54,7 +54,7 @@ The jar file is in the central Maven repo.
     <dependency>
         <groupId>info.cukes</groupId>
         <artifactId>gherkin</artifactId>
-        <version>2.6.4</version>
+        <version>2.6.5</version>
     </dependency>
 
 You can get it manually from [Maven Central](http://search.maven.org/#browse%7C-2073395818)

data/gherkin.gemspec

@@ -3,7 +3,7 @@
 Gem::Specification.new do |s|
   s.name        = "gherkin"
   # If bumping the major version here, comment out the cucumber dependency below and uncomment in the Gemfile to build against a local cucumber.
-  s.version     = "2.6.4"
+  s.version     = "2.6.5"
   s.authors     = ["Mike Sassak", "Gregory Hnatiuk", "Aslak Hellesøy"]
   s.description = "A fast Gherkin lexer/parser based on the Ragel State Machine Compiler."
   s.summary     = "#{s.name}-#{s.version}"

data/lib/gherkin/formatter/filter_formatter.rb

@@ -128,6 +128,7 @@ module Gherkin
         @examples_events.clear
         @examples_tags.clear
         @examples_name = nil
+	@examples_range = nil
       end
 
       def replay_events!(events)

data/spec/gherkin/fixtures/issue_145.feature

@@ -0,0 +1,22 @@
+Feature: issue 145
+
+  Scenario: Scenario 1
+    Given some condition
+
+  Scenario Outline: Scenario 2
+    Given some condition
+    When I go to <page>
+    Then some assertion
+
+    Examples: 
+      | page  |
+      | /aaaa |
+      | /bbbb |
+      | /cccc |
+
+  Scenario: Scenario 3
+    Given some condition
+
+  Scenario: Scenario 4
+    Given some condition
+

data/spec/gherkin/formatter/filter_formatter_spec.rb

@@ -28,7 +28,7 @@ module Gherkin
         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
+        io.string.strip.should == expected.strip
       end
 
       context "tags" do
@@ -133,6 +133,16 @@ module Gherkin
             verify_filter([13], 1..7, 12..15)
             verify_filter([14], 1..7, 12..15)
           end
+
+          it "should fix issue 145" do
+            self.file = 'issue_145.feature'
+            verify_filter([14], 1..2, 6..12, 14..14)
+          end
+
+          it "should fix issue 145 more tests" do
+            self.file = 'issue_145.feature'
+            verify_filter([13,15,18], 1..2, 6..13, 15..15, 16..18)
+          end
         end
 
         context "on the same line as step keyword" do

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: gherkin
 version: !ruby/object:Gem::Version
-  version: 2.6.4
+  version: 2.6.5
   prerelease: 
 platform: java
 authors:
@@ -11,11 +11,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-11-12 00:00:00.000000000 Z
+date: 2011-11-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: json
-  requirement: &2164297360 !ruby/object:Gem::Requirement
+  requirement: &2156370880 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -23,10 +23,10 @@ dependencies:
         version: 1.4.6
   type: :runtime
   prerelease: false
-  version_requirements: *2164297360
+  version_requirements: *2156370880
 - !ruby/object:Gem::Dependency
   name: cucumber
-  requirement: &2164295440 !ruby/object:Gem::Requirement
+  requirement: &2156370380 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -34,10 +34,10 @@ dependencies:
         version: 1.1.2
   type: :development
   prerelease: false
-  version_requirements: *2164295440
+  version_requirements: *2156370380
 - !ruby/object:Gem::Dependency
   name: rake
-  requirement: &2164293780 !ruby/object:Gem::Requirement
+  requirement: &2156369900 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -45,10 +45,10 @@ dependencies:
         version: 0.9.2
   type: :development
   prerelease: false
-  version_requirements: *2164293780
+  version_requirements: *2156369900
 - !ruby/object:Gem::Dependency
   name: bundler
-  requirement: &2164319720 !ruby/object:Gem::Requirement
+  requirement: &2156369440 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -56,10 +56,10 @@ dependencies:
         version: 1.0.21
   type: :development
   prerelease: false
-  version_requirements: *2164319720
+  version_requirements: *2156369440
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &2164317560 !ruby/object:Gem::Requirement
+  requirement: &2156368980 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -67,10 +67,10 @@ dependencies:
         version: 2.7.0
   type: :development
   prerelease: false
-  version_requirements: *2164317560
+  version_requirements: *2156368980
 - !ruby/object:Gem::Dependency
   name: therubyracer
-  requirement: &2164316020 !ruby/object:Gem::Requirement
+  requirement: &2156368440 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -78,10 +78,10 @@ dependencies:
         version: 0.9.9
   type: :development
   prerelease: false
-  version_requirements: *2164316020
+  version_requirements: *2156368440
 - !ruby/object:Gem::Dependency
   name: yard
-  requirement: &2164314220 !ruby/object:Gem::Requirement
+  requirement: &2156349520 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -89,10 +89,10 @@ dependencies:
         version: 0.7.3
   type: :development
   prerelease: false
-  version_requirements: *2164314220
+  version_requirements: *2156349520
 - !ruby/object:Gem::Dependency
   name: rdiscount
-  requirement: &2164313240 !ruby/object:Gem::Requirement
+  requirement: &2156349000 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -100,10 +100,10 @@ dependencies:
         version: 1.6.8
   type: :development
   prerelease: false
-  version_requirements: *2164313240
+  version_requirements: *2156349000
 - !ruby/object:Gem::Dependency
   name: term-ansicolor
-  requirement: &2164335280 !ruby/object:Gem::Requirement
+  requirement: &2156348500 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -111,10 +111,10 @@ dependencies:
         version: 1.0.6
   type: :development
   prerelease: false
-  version_requirements: *2164335280
+  version_requirements: *2156348500
 - !ruby/object:Gem::Dependency
   name: builder
-  requirement: &2164332140 !ruby/object:Gem::Requirement
+  requirement: &2156347860 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -122,7 +122,7 @@ dependencies:
         version: 2.1.2
   type: :development
   prerelease: false
-  version_requirements: *2164332140
+  version_requirements: *2156347860
 description: A fast Gherkin lexer/parser based on the Ragel State Machine Compiler.
 email: cukes@googlegroups.com
 executables: []
@@ -213,6 +213,7 @@ files:
 - spec/gherkin/fixtures/i18n_fr2.feature
 - spec/gherkin/fixtures/i18n_no.feature
 - spec/gherkin/fixtures/i18n_zh-CN.feature
+- spec/gherkin/fixtures/issue_145.feature
 - spec/gherkin/fixtures/scenario_outline_with_tags.feature
 - spec/gherkin/fixtures/scenario_without_steps.feature
 - spec/gherkin/fixtures/simple_with_comments.feature
@@ -289,7 +290,7 @@ rubyforge_project:
 rubygems_version: 1.8.10
 signing_key: 
 specification_version: 3
-summary: gherkin-2.6.4
+summary: gherkin-2.6.5
 test_files:
 - features/escaped_pipes.feature
 - features/feature_parser.feature
@@ -319,6 +320,7 @@ test_files:
 - spec/gherkin/fixtures/i18n_fr2.feature
 - spec/gherkin/fixtures/i18n_no.feature
 - spec/gherkin/fixtures/i18n_zh-CN.feature
+- spec/gherkin/fixtures/issue_145.feature
 - spec/gherkin/fixtures/scenario_outline_with_tags.feature
 - spec/gherkin/fixtures/scenario_without_steps.feature
 - spec/gherkin/fixtures/simple_with_comments.feature