cucumber-core 3.2.1 → 4.0.0

data/lib/cucumber/core/{ast → test}/data_table.rb

@@ -1,10 +1,9 @@
 # frozen_string_literal: true
-require 'cucumber/core/ast/describes_itself'
-require 'cucumber/core/ast/location'
+require 'cucumber/core/test/location'
 
 module Cucumber
   module Core
-    module Ast
+    module Test
       # Step Definitions that match a plain text Step with a multiline argument table
       # will receive it as an instance of DataTable. A DataTable object holds the data of a
       # table parsed from a feature file and lets you access and manipulate the data
@@ -25,7 +24,6 @@ module Cucumber
       # This will store <tt>[['a', 'b'], ['c', 'd']]</tt> in the <tt>data</tt> variable.
       #
       class DataTable
-        include DescribesItself
         include HasLocation
 
         # Creates a new instance. +raw+ should be an Array of Array of String
@@ -41,6 +39,10 @@ module Cucumber
         end
         attr_reader :raw
 
+        def describe_to(visitor, *args)
+          visitor.data_table(self, *args)
+        end
+
         def to_step_definition_arg
           dup
         end
@@ -109,10 +111,6 @@ module Cucumber
           [header] + hashes.map{|hash| header.map{|key| hash[key]}}
         end
 
-        def description_for_visitors
-          :data_table
-        end
-
       end
     end
   end

data/lib/cucumber/core/{ast → test}/doc_string.rb

@@ -1,9 +1,8 @@
 # frozen_string_literal: true
-require 'cucumber/core/ast/describes_itself'
 require 'delegate'
 module Cucumber
   module Core
-    module Ast
+    module Test
       # Represents an inline argument in a step. Example:
       #
       #   Given the message
@@ -22,7 +21,6 @@ module Cucumber
       #
       class DocString < SimpleDelegator
         include HasLocation
-        include DescribesItself
 
         attr_reader :content_type, :content
 
@@ -33,6 +31,10 @@ module Cucumber
           super @content
         end
 
+        def describe_to(visitor, *args)
+          visitor.doc_string(self, *args)
+        end
+
         def data_table?
           false
         end
@@ -70,12 +72,6 @@ module Cucumber
           ].join("\n")
         end
 
-        private
-
-        def description_for_visitors
-          :doc_string
-        end
-
       end
     end
   end

data/lib/cucumber/core/{ast → test}/empty_multiline_argument.rb

@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 module Cucumber
   module Core
-    module Ast
+    module Test
       class EmptyMultilineArgument
         def describe_to(*)
           self
@@ -30,4 +30,3 @@ module Cucumber
     end
   end
 end
-

data/lib/cucumber/core/test/filters/locations_filter.rb

@@ -25,8 +25,8 @@ module Cucumber
 
         def sorted_test_cases
           filter_locations.map { |filter_location|
-            test_cases[filter_location.file].select { |test_case| 
-              test_case.all_locations.any? { |location| filter_location.match?(location) }
+            test_cases[filter_location.file].select { |test_case|
+              filter_location.match?(test_case.location)
             }
           }.flatten.uniq
         end

data/lib/cucumber/core/{ast → test}/location.rb

@@ -3,7 +3,7 @@ require 'forwardable'
 require 'cucumber/core/platform'
 module Cucumber
   module Core
-    module Ast
+    module Test
       IncompatibleLocations = Class.new(StandardError)
 
       module Location
@@ -38,12 +38,6 @@ module Cucumber
           end
         end
 
-        def self.merge(*locations)
-          locations.reduce do |a, b|
-            a + b
-          end
-        end
-
         class Wildcard < Struct.new(:file)
           def to_s
             file
@@ -88,11 +82,6 @@ module Cucumber
             Location.new(file, new_line)
           end
 
-          def +(other)
-            raise IncompatibleLocations if file != other.file
-            Precise.new(file, lines + other.lines)
-          end
-
           def inspect
             "<#{self.class}: #{to_s}>"
           end
@@ -110,6 +99,14 @@ module Cucumber
             data.first
           end
 
+          def min
+            data.min
+          end
+
+          def max
+            data.max
+          end
+
           def include?(other)
             other.data.subset?(data) || data.subset?(other.data)
           end
@@ -155,10 +152,6 @@ module Cucumber
           @location
         end
 
-        def all_locations
-          @all_locations ||= Location.merge([location] + attributes.map { |node| node.all_locations }.flatten)
-        end
-
         def attributes
           [tags, comments, multiline_arg].flatten
         end
@@ -175,7 +168,7 @@ module Cucumber
 
         def multiline_arg
           # will be overriden by nodes that actually have a multiline_argument
-          EmptyMultilineArgument.new
+          Test::EmptyMultilineArgument.new
         end
 
       end

data/lib/cucumber/core/test/runner.rb

@@ -17,7 +17,9 @@ module Cucumber
           @running_test_step = nil
           event_bus.test_case_started(test_case)
           descend.call(self)
-          event_bus.test_case_finished(test_case, running_test_case.result)
+          result = running_test_case.result
+          result = Result::Undefined.new('The test case has no steps', Result::UnknownDuration.new, ["#{test_case.location}:in `#{test_case.name}'"]) if result.unknown?
+          event_bus.test_case_finished(test_case, result)
           self
         end
 
@@ -103,7 +105,7 @@ module Cucumber
               def execute(test_step, monitor, &continue)
                 result = test_step.execute(monitor.result, &continue)
                 result = result.with_message(%(Undefined step: "#{test_step.text}")) if result.undefined?
-                result = result.with_appended_backtrace(test_step.source.last) if IsStepVisitor.new(test_step).step?
+                result = result.with_appended_backtrace(test_step) unless test_step.hook?
                 result.describe_to(monitor, result)
               end
 
@@ -129,7 +131,7 @@ module Cucumber
                 result = test_step.skip(monitor.result)
                 if result.undefined?
                   result = result.with_message(%(Undefined step: "#{test_step.text}"))
-                  result = result.with_appended_backtrace(test_step.source.last)
+                  result = result.with_appended_backtrace(test_step)
                 end
                 result
               end

data/lib/cucumber/core/test/step.rb

@@ -1,27 +1,29 @@
 # frozen_string_literal: true
+
 require 'cucumber/core/test/result'
 require 'cucumber/core/test/action'
+require 'cucumber/core/test/empty_multiline_argument'
 
 module Cucumber
   module Core
     module Test
       class Step
-        attr_reader :source
+        attr_reader :text, :location, :multiline_arg
 
-        def initialize(source, action = Test::UndefinedAction.new(source.last.location))
-          raise ArgumentError if source.any?(&:nil?)
-          @source, @action = source, action
+        def initialize(text, location, multiline_arg = Test::EmptyMultilineArgument.new, action = Test::UndefinedAction.new(location))
+          raise ArgumentError if text.nil? || text.empty?
+          @text = text
+          @location = location
+          @multiline_arg = multiline_arg
+          @action = action
         end
 
         def describe_to(visitor, *args)
           visitor.test_step(self, *args)
         end
 
-        def describe_source_to(visitor, *args)
-          source.reverse.each do |node|
-            node.describe_to(visitor, *args)
-          end
-          self
+        def hook?
+          false
         end
 
         def skip(*args)
@@ -32,26 +34,18 @@ module Cucumber
           @action.execute(*args)
         end
 
-        def with_action(location = nil, &block)
-          self.class.new(source, Test::Action.new(location, &block))
+        def with_action(action_location = nil, &block)
+          self.class.new(text, location, multiline_arg, Test::Action.new(action_location, &block))
         end
 
-        def text
-          source.last.text
+        def backtrace_line
+          "#{location}:in `#{text}'"
         end
 
         def to_s
           text
         end
 
-        def location
-          source.last.location
-        end
-
-        def original_location
-          source.last.original_location
-        end
-
         def action_location
           @action.location
         end
@@ -59,25 +53,15 @@ module Cucumber
         def inspect
           "#<#{self.class}: #{location}>"
         end
-
       end
 
-      class IsStepVisitor
-        def initialize(test_step)
-          @is_step = false
-          test_step.describe_to(self)
-        end
-
-        def step?
-          @is_step
-        end
-
-        def test_step(*)
-          @is_step = true
+      class HookStep < Step
+        def initialize(text, location, action)
+          super(text, location, Test::EmptyMultilineArgument.new, action)
         end
 
-        def method_missing(*)
-          self
+        def hook?
+          true
         end
       end
     end

data/lib/cucumber/core/{ast → test}/tag.rb

@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 module Cucumber
   module Core
-    module Ast
+    module Test
       class Tag
         include HasLocation
 

data/lib/cucumber/core/version.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: cucumber-core
 version: !ruby/object:Gem::Version
-  version: 3.2.1
+  version: 4.0.0
 platform: ruby
 authors:
 - Aslak Hellesøy
@@ -12,7 +12,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-09-24 00:00:00.000000000 Z
+date: 2018-09-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: gherkin
@@ -20,14 +20,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '5.0'
+        version: '6.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '5.0'
+        version: '6.0'
 - !ruby/object:Gem::Dependency
   name: cucumber-tag_expressions
   requirement: !ruby/object:Gem::Requirement
@@ -165,32 +165,13 @@ files:
 - LICENSE
 - README.md
 - lib/cucumber/core.rb
-- lib/cucumber/core/ast.rb
-- lib/cucumber/core/ast/background.rb
-- lib/cucumber/core/ast/comment.rb
-- lib/cucumber/core/ast/data_table.rb
-- lib/cucumber/core/ast/describes_itself.rb
-- lib/cucumber/core/ast/doc_string.rb
-- lib/cucumber/core/ast/empty_background.rb
-- lib/cucumber/core/ast/empty_multiline_argument.rb
-- lib/cucumber/core/ast/examples_table.rb
-- lib/cucumber/core/ast/feature.rb
-- lib/cucumber/core/ast/location.rb
-- lib/cucumber/core/ast/names.rb
-- lib/cucumber/core/ast/outline_step.rb
-- lib/cucumber/core/ast/scenario.rb
-- lib/cucumber/core/ast/scenario_outline.rb
-- lib/cucumber/core/ast/step.rb
-- lib/cucumber/core/ast/tag.rb
 - lib/cucumber/core/compiler.rb
 - lib/cucumber/core/event.rb
 - lib/cucumber/core/event_bus.rb
 - lib/cucumber/core/events.rb
 - lib/cucumber/core/filter.rb
-- lib/cucumber/core/gherkin/ast_builder.rb
 - lib/cucumber/core/gherkin/document.rb
 - lib/cucumber/core/gherkin/parser.rb
-- lib/cucumber/core/gherkin/tag_expression.rb
 - lib/cucumber/core/gherkin/writer.rb
 - lib/cucumber/core/gherkin/writer/helpers.rb
 - lib/cucumber/core/platform.rb
@@ -198,14 +179,19 @@ files:
 - lib/cucumber/core/test/action.rb
 - lib/cucumber/core/test/around_hook.rb
 - lib/cucumber/core/test/case.rb
+- lib/cucumber/core/test/data_table.rb
+- lib/cucumber/core/test/doc_string.rb
+- lib/cucumber/core/test/empty_multiline_argument.rb
 - lib/cucumber/core/test/filters.rb
 - lib/cucumber/core/test/filters/activate_steps_for_self_test.rb
 - lib/cucumber/core/test/filters/locations_filter.rb
 - lib/cucumber/core/test/filters/name_filter.rb
 - lib/cucumber/core/test/filters/tag_filter.rb
+- lib/cucumber/core/test/location.rb
 - lib/cucumber/core/test/result.rb
 - lib/cucumber/core/test/runner.rb
 - lib/cucumber/core/test/step.rb
+- lib/cucumber/core/test/tag.rb
 - lib/cucumber/core/test/timer.rb
 - lib/cucumber/core/version.rb
 homepage: https://cucumber.io
@@ -221,7 +207,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '2.1'
+      version: '2.2'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
@@ -229,8 +215,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.5.4
+rubygems_version: 2.7.4
 signing_key: 
 specification_version: 4
-summary: cucumber-core-3.2.1
+summary: cucumber-core-4.0.0
 test_files: []

data/lib/cucumber/core/ast.rb

@@ -1,14 +0,0 @@
-# frozen_string_literal: true
-require 'cucumber/core/ast/comment'
-require 'cucumber/core/ast/tag'
-require 'cucumber/core/ast/feature'
-require 'cucumber/core/ast/empty_background'
-require 'cucumber/core/ast/empty_multiline_argument'
-require 'cucumber/core/ast/background'
-require 'cucumber/core/ast/scenario'
-require 'cucumber/core/ast/step'
-require 'cucumber/core/ast/doc_string'
-require 'cucumber/core/ast/data_table'
-require 'cucumber/core/ast/scenario_outline'
-require 'cucumber/core/ast/outline_step'
-require 'cucumber/core/ast/examples_table'

data/lib/cucumber/core/ast/background.rb

@@ -1,41 +0,0 @@
-# frozen_string_literal: true
-require 'cucumber/core/ast/names'
-require 'cucumber/core/ast/location'
-require 'cucumber/core/ast/describes_itself'
-
-module Cucumber
-  module Core
-    module Ast
-      class Background
-        include Names
-        include HasLocation
-        include DescribesItself
-
-        def initialize(location, comments, keyword, name, description, raw_steps)
-          @location = location
-          @comments = comments
-          @keyword = keyword
-          @name = name
-          @description = description
-          @raw_steps = raw_steps
-        end
-
-        attr_reader :description, :raw_steps
-        private     :raw_steps
-
-        attr_reader :comments, :keyword, :location
-
-        def children
-          raw_steps
-        end
-
-        private
-
-        def description_for_visitors
-          :background
-        end
-
-      end
-    end
-  end
-end