cucumber-core 5.0.2 → 9.0.0

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

@@ -126,11 +126,11 @@ module Cucumber
         module HasDescription
           private
           def description
-            options.fetch(:description) { '' }.split("\n").map(&:strip)
+            options.fetch(:description, '').split("\n").map(&:strip)
           end
 
           def description_statement
-            description.map { |s| indent(s,2) } unless description.empty?
+            description.map { |s| indent(s, 2) } unless description.empty?
           end
         end
 

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

@@ -1,8 +1,7 @@
 # frozen_string_literal: true
+require 'cucumber/core/test/location'
 require 'cucumber/core/test/result'
 require 'cucumber/core/test/timer'
-require 'cucumber/core/test/result'
-require 'cucumber/core/test/location'
 
 module Cucumber
   module Core

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

@@ -7,10 +7,11 @@ module Cucumber
   module Core
     module Test
       class Case
-        attr_reader :name, :test_steps, :location, :tags, :language, :around_hooks
+        attr_reader :id, :name, :test_steps, :location, :tags, :language, :around_hooks
 
-        def initialize(name, test_steps, location, tags, language, around_hooks = [])
+        def initialize(id, name, test_steps, location, tags, language, around_hooks = [])
           raise ArgumentError.new("test_steps should be an Array but is a #{test_steps.class}") unless test_steps.is_a?(Array)
+          @id = id
           @name = name
           @test_steps = test_steps
           @location = location
@@ -35,11 +36,11 @@ module Cucumber
         end
 
         def with_steps(test_steps)
-          self.class.new(name, test_steps, location, tags, language, around_hooks)
+          self.class.new(id, name, test_steps, location, tags, language, around_hooks)
         end
 
         def with_around_hooks(around_hooks)
-          self.class.new(name, test_steps, location, tags, language, around_hooks)
+          self.class.new(id, name, test_steps, location, tags, language, around_hooks)
         end
 
         def match_tags?(*expressions)

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

@@ -1,5 +1,4 @@
 # frozen_string_literal: true
-require 'cucumber/core/test/location'
 
 module Cucumber
   module Core
@@ -24,18 +23,15 @@ module Cucumber
       # This will store <tt>[['a', 'b'], ['c', 'd']]</tt> in the <tt>data</tt> variable.
       #
       class DataTable
-        include HasLocation
-
         # Creates a new instance. +raw+ should be an Array of Array of String
         # or an Array of Hash
         # You don't typically create your own DataTable objects - Cucumber will do
         # it internally and pass them to your Step Definitions.
         #
-        def initialize(rows, location)
+        def initialize(rows)
           raw = ensure_array_of_array(rows)
           verify_rows_are_same_length(raw)
           @raw = raw.freeze
-          @location = location
         end
         attr_reader :raw
 
@@ -58,7 +54,7 @@ module Cucumber
         # Creates a copy of this table
         #
         def dup
-          self.class.new(raw.dup, location)
+          self.class.new(raw.dup)
         end
 
         # Returns a new, transposed table. Example:
@@ -73,7 +69,7 @@ module Cucumber
         #   | 4 | 2 |
         #
         def transpose
-          self.class.new(raw.transpose, location)
+          self.class.new(raw.transpose)
         end
 
         def map(&block)
@@ -81,7 +77,7 @@ module Cucumber
             row.map(&block)
           end
 
-          self.class.new(new_raw, location)
+          self.class.new(new_raw)
         end
 
         def ==(other)
@@ -89,7 +85,7 @@ module Cucumber
         end
 
         def inspect
-          %{#<#{self.class} #{raw.inspect} (#{location})>}
+          %{#<#{self.class} #{raw.inspect})>}
         end
 
         private
@@ -108,7 +104,7 @@ module Cucumber
 
         def hashes_to_array(hashes)
           header = hashes[0].keys.sort
-          [header] + hashes.map{|hash| header.map{|key| hash[key]}}
+          [header] + hashes.map {|hash| header.map {|key| hash[key]}}
         end
 
       end

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

@@ -20,14 +20,11 @@ module Cucumber
       # Note how the indentation from the source is stripped away.
       #
       class DocString < SimpleDelegator
-        include HasLocation
-
         attr_reader :content_type, :content
 
-        def initialize(content, content_type, location)
+        def initialize(content, content_type)
           @content = content
           @content_type = content_type
-          @location = location
           super @content
         end
 
@@ -46,7 +43,7 @@ module Cucumber
         def map
           raise ArgumentError, "No block given" unless block_given?
           new_content = yield content
-          self.class.new(new_content, content_type, location)
+          self.class.new(new_content, content_type)
         end
 
         def to_step_definition_arg
@@ -65,7 +62,7 @@ module Cucumber
 
         def inspect
           [
-            %{#<#{self.class} (#{location})},
+            %{#<#{self.class}},
             %{  """#{content_type}},
             %{  #{@content}},
             %{  """>}

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

@@ -33,4 +33,3 @@ module Cucumber
     end
   end
 end
-

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

@@ -9,7 +9,6 @@ module Cucumber
         STRICT_AFFECTED_TYPES = [:flaky, :undefined, :pending].freeze
 
         def self.ok?(type, be_strict = StrictConfiguration.new)
-          private
           class_name = type.to_s.slice(0, 1).capitalize + type.to_s.slice(1..-1)
           const_get(class_name).ok?(be_strict.strict?(type))
         end
@@ -43,6 +42,13 @@ module Cucumber
           def with_filtered_backtrace(filter)
             self
           end
+
+          def to_message
+            Cucumber::Messages::TestStepFinished::TestStepResult.new(
+              status: Cucumber::Messages::TestStepFinished::TestStepResult::Status::UNKNOWN,
+              duration: UnknownDuration.new.to_message_duration
+            )
+          end
         end
 
         class Passed
@@ -68,6 +74,13 @@ module Cucumber
             "✓"
           end
 
+          def to_message
+            Cucumber::Messages::TestStepFinished::TestStepResult.new(
+              status: Cucumber::Messages::TestStepFinished::TestStepResult::Status::PASSED,
+              duration: duration.to_message_duration
+            )
+          end
+
           def ok?(be_strict = nil)
             self.class.ok?
           end
@@ -83,6 +96,7 @@ module Cucumber
 
         class Failed
           include Result.query_methods :failed
+
           attr_reader :duration, :exception
 
           def self.ok?(be_strict = false)
@@ -107,6 +121,20 @@ module Cucumber
             "✗"
           end
 
+          def to_message
+            begin
+              message = exception.backtrace.join("\n")
+            rescue NoMethodError
+              message = ""
+            end
+
+            Cucumber::Messages::TestStepFinished::TestStepResult.new(
+              status: Cucumber::Messages::TestStepFinished::TestStepResult::Status::FAILED,
+              duration: duration.to_message_duration,
+              message: message
+            )
+          end
+
           def ok?(be_strict = nil)
             self.class.ok?
           end
@@ -186,6 +214,13 @@ module Cucumber
           def to_s
             "?"
           end
+
+          def to_message
+            Cucumber::Messages::TestStepFinished::TestStepResult.new(
+              status: Cucumber::Messages::TestStepFinished::TestStepResult::Status::UNDEFINED,
+              duration: duration.to_message_duration
+            )
+          end
         end
 
         class Skipped < Raisable
@@ -204,6 +239,13 @@ module Cucumber
           def to_s
             "-"
           end
+
+          def to_message
+            Cucumber::Messages::TestStepFinished::TestStepResult.new(
+              status: Cucumber::Messages::TestStepFinished::TestStepResult::Status::SKIPPED,
+              duration: duration.to_message_duration
+            )
+          end
         end
 
         class Pending < Raisable
@@ -222,6 +264,13 @@ module Cucumber
           def to_s
             "P"
           end
+
+          def to_message
+            Cucumber::Messages::TestStepFinished::TestStepResult.new(
+              status: Cucumber::Messages::TestStepFinished::TestStepResult::Status::PENDING,
+              duration: duration.to_message_duration
+            )
+          end
         end
 
         # Handles the strict settings for the result types that are
@@ -229,9 +278,9 @@ module Cucumber
         class StrictConfiguration
           attr_accessor :settings
           private :settings
-          
+
           def initialize(strict_types = [])
-            @settings = Hash[STRICT_AFFECTED_TYPES.map { |t| [t, :default] }]
+            @settings = STRICT_AFFECTED_TYPES.map { |t| [t, :default] }.to_h
             strict_types.each do |type|
               set_strict(true, type)
             end
@@ -261,7 +310,7 @@ module Cucumber
           end
 
           def merge!(other)
-            settings.keys.each do |type|
+            settings.each_key do |type|
               set_strict(other.strict?(type), type) if other.set?(type)
             end
             self
@@ -320,7 +369,7 @@ module Cucumber
 
           def total(for_status = nil)
             if for_status
-              @totals.fetch(for_status) { 0 }
+              @totals.fetch(for_status, 0)
             else
               @totals.reduce(0) { |total, status| total += status[1] }
             end
@@ -329,12 +378,12 @@ module Cucumber
           def decrement_failed
             @totals[:failed] -= 1
           end
-          
+
           private
 
           def get_total(method_name)
             status = method_name.to_s.gsub('total_', '').to_sym
-            return @totals.fetch(status) { 0 }
+            return @totals.fetch(status, 0)
           end
 
           def increment_total(status)
@@ -344,14 +393,22 @@ module Cucumber
         end
 
         class Duration
+          include Cucumber::Messages::TimeConversion
+
           attr_reader :nanoseconds
 
           def initialize(nanoseconds)
             @nanoseconds = nanoseconds
           end
+
+          def to_message_duration
+            seconds_to_duration(nanoseconds.to_f / NANOSECONDS_PER_SECOND)
+          end
         end
 
         class UnknownDuration
+          include Cucumber::Messages::TimeConversion
+
           def tap(&block)
             self
           end
@@ -359,6 +416,10 @@ module Cucumber
           def nanoseconds
             raise "#nanoseconds only allowed to be used in #tap block"
           end
+
+          def to_message_duration
+            seconds_to_duration(0)
+          end
         end
       end
     end

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

@@ -8,10 +8,11 @@ module Cucumber
   module Core
     module Test
       class Step
-        attr_reader :text, :location, :multiline_arg
+        attr_reader :id, :text, :location, :multiline_arg
 
-        def initialize(text, location, multiline_arg = Test::EmptyMultilineArgument.new, action = Test::UndefinedAction.new(location))
+        def initialize(id, text, location, multiline_arg = Test::EmptyMultilineArgument.new, action = Test::UndefinedAction.new(location))
           raise ArgumentError if text.nil? || text.empty?
+          @id = id
           @text = text
           @location = location
           @multiline_arg = multiline_arg
@@ -35,7 +36,7 @@ module Cucumber
         end
 
         def with_action(action_location = nil, &block)
-          self.class.new(text, location, multiline_arg, Test::Action.new(action_location, &block))
+          self.class.new(id, text, location, multiline_arg, Test::Action.new(action_location, &block))
         end
 
         def backtrace_line
@@ -56,8 +57,8 @@ module Cucumber
       end
 
       class HookStep < Step
-        def initialize(text, location, action)
-          super(text, location, Test::EmptyMultilineArgument.new, action)
+        def initialize(id, text, location, action)
+          super(id, text, location, Test::EmptyMultilineArgument.new, action)
         end
 
         def hook?

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

@@ -19,7 +19,7 @@ module Cucumber
         end
 
         def sec
-          nsec / 10 ** 9.0
+          nsec / 10**9.0
         end
 
         private
@@ -42,7 +42,7 @@ module Cucumber
           else
             def time_in_nanoseconds
               t = Time.now
-              t.to_i * 10 ** 9 + t.nsec
+              t.to_i * 10**9 + t.nsec
             end
           end
         end

data/lib/cucumber/core/version.rb

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

data/spec/coverage.rb

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+require 'rubygems'
 require 'simplecov'
 formatters = [ SimpleCov::Formatter::HTMLFormatter ]
 

data/spec/cucumber/core/compiler_spec.rb

@@ -31,6 +31,60 @@ module Cucumber::Core
       end
     end
 
+    context "when the event_bus is provided" do
+      let(:event_bus) { double }
+
+      before do
+        allow( event_bus ).to receive(:envelope)
+        allow( event_bus ).to receive(:gherkin_source_parsed).and_return(nil)
+        allow( event_bus ).to receive(:test_case_created).and_return(nil)
+        allow( event_bus ).to receive(:test_step_created).and_return(nil)
+      end
+
+      it "emits a TestCaseCreated event with the created Test::Case and Pickle" do
+        gherkin_documents = [
+          gherkin do
+            feature do
+              scenario do
+                step 'passing'
+              end
+            end
+          end
+        ]
+
+        compile(gherkin_documents, event_bus) do |visitor|
+          allow( visitor ).to receive(:test_case)
+          allow( visitor ).to receive(:test_step)
+          allow( visitor ).to receive(:done)
+          allow( event_bus ).to receive(:envelope)
+
+          expect( event_bus ).to receive(:test_case_created).once
+        end
+      end
+
+      it "emits a TestStepCreated event with the created Test::Step and PickleStep" do
+        gherkin_documents = [
+          gherkin do
+            feature do
+              scenario do
+                step 'passing'
+                step 'passing'
+              end
+            end
+          end
+        ]
+
+        compile(gherkin_documents, event_bus) do |visitor|
+          allow( visitor ).to receive(:test_case)
+          allow( visitor ).to receive(:test_step)
+          allow( visitor ).to receive(:done)
+          allow( event_bus ).to receive(:envelope)
+
+          expect( event_bus ).to receive(:test_step_created).twice
+        end
+      end
+    end
+
     it "compiles a feature with a background" do
       gherkin_documents = [
         gherkin do
@@ -166,13 +220,22 @@ module Cucumber::Core
       end
     end
 
-    def compile(gherkin_documents)
+    def compile(gherkin_documents, event_bus = nil)
       visitor = double
       allow( visitor ).to receive(:test_suite).and_yield(visitor)
       allow( visitor ).to receive(:test_case).and_yield(visitor)
+
+      if event_bus.nil?
+        event_bus = double
+        allow( event_bus ).to receive(:envelope).and_return(nil)
+        allow( event_bus ).to receive(:gherkin_source_parsed).and_return(nil)
+        allow( event_bus ).to receive(:test_case_created).and_return(nil)
+        allow( event_bus ).to receive(:test_step_created).and_return(nil)
+        allow( event_bus ).to receive(:envelope).and_return(nil)
+      end
+
       yield visitor
-      super(gherkin_documents, visitor)
+      super(gherkin_documents, visitor, [], event_bus)
     end
-
   end
 end