cucumber-core 5.0.1 → 5.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 43d9ba21be7a1d2a8060a59ce3c7717e1796bba5773e3ccf80131da4b37d04ee
-  data.tar.gz: 609dac1bcad6a6ee97037225fc410af71e4108290b02c4d17a407eb86034ebb0
+  metadata.gz: 3ab18c1635eeda0fbd575d01a83bafc96a0073a1ec0ba1249e4bf26b9c60f914
+  data.tar.gz: 1dccc021f15d75d76c2c3974049f768ee926e0dd7ced151cc9b46a2b422b6906
 SHA512:
-  metadata.gz: d6a2353ade5c6b868a1d962dfec47f146aeb4dfe92eeb2968ffa6a4db27a5b73994ab44c030d7e4a62893738a5b4893b0d5f5f0c2f938005384e3b2f2a4f362a
-  data.tar.gz: 8bd8e52373231c5275c09c4811308cb6414b12d29ccdcb04161131fe1548e817585205036556b650dd7b2d39dc5a8bf3bb4a64ed207bf7280e75b02064d8871b
+  metadata.gz: 81461cf45c9616e3e36fc70a25da1b3c0e30e709cc12e675994e6fd0f730ff4e68f9680453e31ecb4814d69a9a79a98ceeb0691a7365fc660fe9e4cad7462092
+  data.tar.gz: 3a8cc3c74351d91f90c36f509a813b56cab9a333057de9b3b596de4b1feaa8dc912d87827d2682f1fc3f2b2eca2f82c75f38bd2f75204119eb21bcbcf0b8507a

data/CHANGELOG.md

@@ -1,32 +1,16 @@
 Please see [CONTRIBUTING.md](https://github.com/cucumber/cucumber/blob/master/CONTRIBUTING.md) on how to contribute to Cucumber.
 
-## [In Git](https://github.com/cucumber/cucumber-ruby-core/compare/v5.0.1...master)
+## [5.0.2](https://github.com/cucumber/cucumber-ruby-core/compare/v5.0.1...v5.0.2)
 
 ### Changed
 
-* N/A
-
-### Added
-
-* N/A
-
-### Fixed
-
-* N/A
-
-### Removed
-
-* N/A
-
-### Improved
-
-* N/A
+* Update to use Gherkin v8
 
 ## [5.0.1](https://github.com/cucumber/cucumber-ruby-core/compare/v5.0.0...v5.0.1)
 
 ### Removed
 
-* Remove support for ruby 2.2 and below. 2.3 or higher is required now. 
+* Remove support for ruby 2.2 and below. 2.3 or higher is required now.
 
 ## [5.0.0](https://github.com/cucumber/cucumber-ruby-core/compare/v4.0.0...v5.0.0)
 

data/README.md

@@ -1,6 +1,7 @@
 # cucumber-core
 
 [![Chat with us](https://badges.gitter.im/Join%20Chat.svg)](https://gitter.im/cucumber/cucumber-ruby?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge&utm_content=badge)
+[![CircleCI](https://circleci.com/gh/cucumber/cucumber-ruby-core.svg?style=svg)](https://circleci.com/gh/cucumber/cucumber-ruby-core)
 [![Build Status](https://travis-ci.org/cucumber/cucumber-ruby-core.svg?branch=master)](https://travis-ci.org/cucumber/cucumber-ruby-core)
 [![Code Climate](https://codeclimate.com/github/cucumber/cucumber-ruby-core.svg)](https://codeclimate.com/github/cucumber/cucumber-ruby-core)
 [![Coverage Status](https://coveralls.io/repos/cucumber/cucumber-ruby-core/badge.svg?branch=master)](https://coveralls.io/r/cucumber/cucumber-ruby-core?branch=master)

data/lib/cucumber/core/gherkin/parser.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
-require 'gherkin/gherkin'
+require 'gherkin'
 
 module Cucumber
   module Core
@@ -16,7 +16,7 @@ module Cucumber
         end
 
         def document(document)
-          messages = ::Gherkin::Gherkin.from_source(document.uri, document.body, {default_dialect: document.language, include_source: false})
+          messages = ::Gherkin.from_source(document.uri, document.body, gherkin_options(document))
           messages.each do |message|
             if !message.gherkinDocument.nil?
               event_bus.gherkin_source_parsed(message.gherkinDocument)
@@ -31,6 +31,15 @@ module Cucumber
           end
         end
 
+        def gherkin_options(document)
+          {
+            default_dialect: document.language,
+            include_source: false,
+            include_gherkin_document: true,
+            include_pickles: true
+          }
+        end
+
         def done
           receiver.done
           self

data/lib/cucumber/core/gherkin/writer.rb

@@ -48,7 +48,7 @@ module Cucumber
 
           default_keyword 'Feature'
 
-          elements :background, :scenario, :scenario_outline
+          elements :background, :rule, :scenario, :scenario_outline
 
           def build(source = [])
             elements.inject(source + statements) { |acc, el| el.build(acc) + [NEW_LINE] }
@@ -85,7 +85,29 @@ module Cucumber
 
           private
           def statements
-            prepare_statements comments_statement, tag_statement, name_statement, description_statement
+            prepare_statements comments_statement,
+              tag_statement,
+              name_statement,
+              description_statement
+          end
+        end
+
+        class Rule
+          include HasElements
+          include HasOptionsInitializer
+          include HasDescription
+          include Indentation.level 2
+
+          default_keyword 'Rule'
+
+          elements :example, :scenario
+
+          private
+          def statements
+            prepare_statements comments_statement,
+              name_statement,
+              description_statement,
+              NEW_LINE
           end
         end
 
@@ -108,6 +130,12 @@ module Cucumber
           end
         end
 
+        class Example < Scenario
+          include Indentation.level 4
+
+          default_keyword 'Example'
+        end
+
         class ScenarioOutline
           include HasElements
           include HasOptionsInitializer

data/lib/cucumber/core/version.rb

@@ -3,7 +3,7 @@ module Cucumber
   module Core
     class Version
       def self.to_s
-        "5.0.1"
+        "5.0.2"
       end
     end
   end

data/spec/capture_warnings.rb

@@ -6,7 +6,7 @@ module CaptureWarnings
   def report_warnings(&block)
     current_dir = Dir.pwd
     warnings, errors = capture_error(&block).partition { |line| line.include?('warning') }
-    project_warnings, other_warnings = warnings.uniq.partition { |line| line.include?(current_dir) }
+    project_warnings, other_warnings = warnings.uniq.partition { |line| line.include?(current_dir) && !line.include?('/vendor/') }
 
     if errors.any?
       puts errors.join("\n")

data/spec/cucumber/core/gherkin/parser_spec.rb

@@ -89,6 +89,57 @@ module Cucumber
           end
         end
 
+        context "when scenario is inside a rule" do
+          source do
+            feature do
+              rule do
+                scenario name: "My scenario"
+              end
+            end
+          end
+
+          it "passes on the pickle" do
+            expect( receiver ).to receive(:pickle)
+            parse
+          end
+        end
+
+        context "when example is inside a rule" do
+          source do
+            feature do
+              rule do
+                example name: "My example"
+              end
+            end
+          end
+
+          it "passes on the pickle" do
+            expect( receiver ).to receive(:pickle)
+            parse
+          end
+        end
+
+        context "when there are multiple rules and scenarios or examples" do
+          source do
+            feature do
+              rule description: "First rule" do
+                scenario name: "Do not talk about the fight club" do
+                  step 'text'
+                end
+              end
+              rule description: "Second rule"do
+                example name: "Do not talk about the fight club" do
+                  step 'text'
+                end
+              end
+            end
+          end
+
+          it "passes on the pickles" do
+            expect( receiver ).to receive(:pickle).twice
+            parse
+          end
+        end
       end
     end
   end

data/spec/cucumber/core/test/location_spec.rb

@@ -100,14 +100,17 @@ module Cucumber::Core::Test
 
       context "when the location is neither below pwd nor in an installed gem" do
         it "use the absolute path to the file" do
-          expect( Location.from_source_location("/path/file.rb", 1).file ).to eq "/path/file.rb"
+          # Use File.expand on expectation to ensure tests work on multiple platform.
+          # On Windows, it will return "C:/path/file.rb" as an absolute path while it will return "/path/file.rb" on Linux.
+          expect( Location.from_source_location("/path/file.rb", 1).file ).to eq File.expand_path("/path/file.rb")
         end
       end
     end
 
     describe "created from file-colon-line" do
       it "handles also Windows paths" do
-        expect( Location.from_file_colon_line("c:\path\file.rb:123").file ).to eq "c:\path\file.rb"
+        # Note: running this test on Windows will produce "c:/path/file.rb", but "c:\path\file.rb" on Linux.
+        expect( Location.from_file_colon_line("c:\\path\\file.rb:123").file ).to match(/c:(\\|\/)path(\\|\/)file.rb/)
       end
     end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: cucumber-core
 version: !ruby/object:Gem::Version
-  version: 5.0.1
+  version: 5.0.2
 platform: ruby
 authors:
 - Aslak Hellesøy
@@ -12,7 +12,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-08-16 00:00:00.000000000 Z
+date: 2019-10-31 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: gherkin
@@ -20,20 +20,20 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '7.0'
+        version: '8.1'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 7.0.3
+        version: 8.1.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '7.0'
+        version: '8.1'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 7.0.3
+        version: 8.1.1
 - !ruby/object:Gem::Dependency
   name: cucumber-tag_expressions
   requirement: !ruby/object:Gem::Requirement
@@ -245,7 +245,7 @@ requirements: []
 rubygems_version: 3.0.3
 signing_key: 
 specification_version: 4
-summary: cucumber-core-5.0.1
+summary: cucumber-core-5.0.2
 test_files:
 - spec/cucumber/core/test/runner_spec.rb
 - spec/cucumber/core/test/doc_string_spec.rb