cucumber-core 16.2.0 → 18.0.0

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

@@ -0,0 +1,47 @@
+# frozen_string_literal: true
+
+module Cucumber
+  module Core
+    module Gherkin
+      module Writer
+        module HasElements
+          include AcceptsComments
+
+          def self.included(base)
+            base.extend HasElementBuilders
+          end
+
+          def build(source = [])
+            elements.inject(source + statements) { |acc, el| el.build(acc) }
+          end
+
+          private
+
+          def elements
+            @elements ||= []
+          end
+
+          module HasElementBuilders
+            def elements(*names)
+              names.each { |name| element(name) }
+            end
+
+            private
+
+            def element(name)
+              define_method(name) do |*args, &source|
+                factory_name = String(name).split('_').map(&:capitalize).join
+                factory = Writer.const_get(factory_name)
+                factory.new(slurp_comments, *args).tap do |builder|
+                  builder.instance_exec(&source) if source
+                  elements << builder
+                end
+                self
+              end
+            end
+          end
+        end
+      end
+    end
+  end
+end

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

@@ -0,0 +1,58 @@
+# frozen_string_literal: true
+
+module Cucumber
+  module Core
+    module Gherkin
+      module Writer
+        module HasOptionsInitializer
+          def self.included(base)
+            base.extend HasDefaultKeyword
+          end
+
+          attr_reader :name, :options
+          private :name, :options
+
+          def initialize(*args)
+            @comments = args.shift if args.first.is_a?(Array)
+            @comments ||= []
+            @options = args.pop if args.last.is_a?(Hash)
+            @options ||= {}
+            @name = args.first
+          end
+
+          private
+
+          def comments_statement
+            @comments
+          end
+
+          def keyword
+            options.fetch(:keyword) { self.class.keyword }
+          end
+
+          def name_statement
+            "#{keyword}: #{name}".strip
+          end
+
+          def tag_statement
+            tags
+          end
+
+          def tags
+            options[:tags]
+          end
+
+          module HasDefaultKeyword
+            def default_keyword(keyword)
+              @keyword = keyword
+            end
+
+            def keyword
+              @keyword
+            end
+          end
+        end
+      end
+    end
+  end
+end

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

@@ -0,0 +1,43 @@
+# frozen_string_literal: true
+
+module Cucumber
+  module Core
+    module Gherkin
+      module Writer
+        module HasRows
+          def row(*cells)
+            rows << cells
+          end
+
+          def rows
+            @rows ||= []
+          end
+
+          private
+
+          def row_statements(indent = nil)
+            rows.map { |row| indent(table_row(row), indent) }
+          end
+
+          def table_row(row)
+            padded = pad(row)
+            "| #{padded.join(' | ')} |"
+          end
+
+          def pad(row)
+            row.map.with_index { |text, position| justify_cell(text, position) }
+          end
+
+          def column_length(column)
+            lengths = rows.transpose.map { |r| r.map(&:length).max }
+            lengths[column]
+          end
+
+          def justify_cell(cell, position)
+            cell.ljust(column_length(position))
+          end
+        end
+      end
+    end
+  end
+end

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

@@ -1,177 +1,9 @@
 # frozen_string_literal: true
 
-module Cucumber
-  module Core
-    module Gherkin
-      module Writer
-        module HasOptionsInitializer
-          def self.included(base)
-            base.extend HasDefaultKeyword
-          end
+require_relative 'accepts_comments'
 
-          attr_reader :name, :options
-          private :name, :options
-
-          def initialize(*args)
-            @comments = args.shift if args.first.is_a?(Array)
-            @comments ||= []
-            @options = args.pop if args.last.is_a?(Hash)
-            @options ||= {}
-            @name = args.first
-          end
-
-          private
-
-          def comments_statement
-            @comments
-          end
-
-          def keyword
-            options.fetch(:keyword) { self.class.keyword }
-          end
-
-          def name_statement
-            "#{keyword}: #{name}".strip
-          end
-
-          def tag_statement
-            tags
-          end
-
-          def tags
-            options[:tags]
-          end
-
-          module HasDefaultKeyword
-            def default_keyword(keyword)
-              @keyword = keyword
-            end
-
-            def keyword
-              @keyword
-            end
-          end
-        end
-
-        module AcceptsComments
-          def comment(line)
-            comment_lines << "# #{line}"
-          end
-
-          def comment_lines
-            @comment_lines ||= []
-          end
-
-          def slurp_comments
-            comment_lines.tap { @comment_lines = nil }
-          end
-        end
-
-        module HasElements
-          include AcceptsComments
-
-          def self.included(base)
-            base.extend HasElementBuilders
-          end
-
-          def build(source = [])
-            elements.inject(source + statements) { |acc, el| el.build(acc) }
-          end
-
-          private
-
-          def elements
-            @elements ||= []
-          end
-
-          module HasElementBuilders
-            def elements(*names)
-              names.each { |name| element(name) }
-            end
-
-            private
-
-            def element(name)
-              define_method(name) do |*args, &source|
-                factory_name = String(name).split('_').map(&:capitalize).join
-                factory = Writer.const_get(factory_name)
-                factory.new(slurp_comments, *args).tap do |builder|
-                  builder.instance_exec(&source) if source
-                  elements << builder
-                end
-                self
-              end
-            end
-          end
-        end
-
-        module Indentation
-          def self.level(number)
-            Module.new do
-              define_method(:indent) do |string, amount = nil|
-                return string if string.nil? || string.empty?
-
-                amount ||= number
-                "#{' ' * amount}#{string}"
-              end
-
-              define_method(:indent_level) do
-                number
-              end
-
-              define_method(:prepare_statements) do |*statements|
-                statements.flatten.compact.map { |s| indent(s) }
-              end
-            end
-          end
-        end
-
-        module HasDescription
-          private
-
-          def description
-            options.fetch(:description, '').split("\n").map(&:strip)
-          end
-
-          def description_statement
-            description.map { |s| indent(s, 2) } unless description.empty?
-          end
-        end
-
-        module HasRows
-          def row(*cells)
-            rows << cells
-          end
-
-          def rows
-            @rows ||= []
-          end
-
-          private
-
-          def row_statements(indent = nil)
-            rows.map { |row| indent(table_row(row), indent) }
-          end
-
-          def table_row(row)
-            padded = pad(row)
-            "| #{padded.join(' | ')} |"
-          end
-
-          def pad(row)
-            row.map.with_index { |text, position| justify_cell(text, position) }
-          end
-
-          def column_length(column)
-            lengths = rows.transpose.map { |r| r.map(&:length).max }
-            lengths[column]
-          end
-
-          def justify_cell(cell, position)
-            cell.ljust(column_length(position))
-          end
-        end
-      end
-    end
-  end
-end
+require_relative 'has_description'
+require_relative 'has_elements'
+require_relative 'has_options_initializer'
+require_relative 'has_rows'
+require_relative 'indentation'

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

@@ -0,0 +1,40 @@
+# frozen_string_literal: true
+
+module Cucumber
+  module Core
+    module Gherkin
+      module Writer
+        module Indentation
+          def indentation_level(number)
+            create_indent(number)
+            create_indent_level(number)
+            create_prepare_statements
+          end
+
+          private
+
+          def create_indent(number)
+            define_method(:indent) do |string, amount = nil|
+              return string if string.nil? || string.empty?
+
+              amount ||= number
+              "#{' ' * amount}#{string}"
+            end
+          end
+
+          def create_indent_level(number)
+            define_method(:indent_level) do
+              number
+            end
+          end
+
+          def create_prepare_statements
+            define_method(:prepare_statements) do |*statements|
+              statements.flatten.compact.map { |s| indent(s) }
+            end
+          end
+        end
+      end
+    end
+  end
+end

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

@@ -12,7 +12,9 @@ module Cucumber
           include HasElements
           include HasOptionsInitializer
           include HasDescription
-          include Indentation.level 2
+          extend Indentation
+
+          indentation_level 2
 
           default_keyword 'Rule'
 

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

@@ -10,7 +10,9 @@ module Cucumber
           include HasElements
           include HasOptionsInitializer
           include HasDescription
-          include Indentation.level 2
+          extend Indentation
+
+          indentation_level 2
 
           default_keyword 'Scenario'
 

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

@@ -10,7 +10,9 @@ module Cucumber
           include HasElements
           include HasOptionsInitializer
           include HasDescription
-          include Indentation.level 2
+          extend Indentation
+
+          indentation_level 2
 
           default_keyword 'Scenario Outline'
 

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

@@ -11,7 +11,9 @@ module Cucumber
         class Step
           include HasElements
           include HasOptionsInitializer
-          include Indentation.level 4
+          extend Indentation
+
+          indentation_level 4
 
           default_keyword 'Given'
 

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

@@ -7,7 +7,10 @@ module Cucumber
     module Gherkin
       module Writer
         class Table
-          include Indentation.level(6)
+          extend Indentation
+
+          indentation_level 6
+
           include HasRows
 
           def initialize(*); end

data/lib/cucumber/core/report/summary.rb

@@ -13,8 +13,8 @@ module Cucumber
           subscribe_to(event_bus)
         end
 
-        def ok?(strict: Test::Result::StrictConfiguration.new)
-          test_cases.ok?(strict: strict)
+        def ok?
+          test_cases.ok?
         end
 
         private

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

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

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

@@ -1,9 +1,9 @@
 # frozen_string_literal: true
 
-require 'cucumber/core/test/location'
-require 'cucumber/core/test/result'
-require 'cucumber/core/test/timer'
+require_relative 'location'
+require_relative 'result'
+require_relative 'timer'
 
-require 'cucumber/core/test/action/defined'
-require 'cucumber/core/test/action/undefined'
-require 'cucumber/core/test/action/unskippable'
+require_relative 'action/defined'
+require_relative 'action/undefined'
+require_relative 'action/unskippable'

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

@@ -13,10 +13,6 @@ module Cucumber
           visitor.around_hook(self, *, &)
         end
 
-        def hook?
-          true
-        end
-
         def execute(*_args, &continue)
           @timer.start
           @block.call(continue)
@@ -27,6 +23,10 @@ module Cucumber
           failed(e)
         end
 
+        def hook?
+          true
+        end
+
         private
 
         def failed(exception)

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

@@ -1,8 +1,9 @@
 # frozen_string_literal: true
 
-require 'cucumber/core/test/result'
 require 'cucumber/tag_expressions'
 
+require_relative 'result'
+
 module Cucumber
   module Core
     module Test
@@ -22,8 +23,8 @@ module Cucumber
           @around_hooks = around_hooks
         end
 
-        def step_count
-          test_steps.count
+        def ==(other)
+          eql?(other)
         end
 
         def describe_to(visitor, *args)
@@ -37,20 +38,25 @@ module Cucumber
           self
         end
 
-        def with_steps(test_steps)
-          self.class.new(id, name, test_steps, location, parent_locations, tags, language, around_hooks)
+        def eql?(other)
+          other.hash == hash
         end
 
-        def with_around_hooks(around_hooks)
-          self.class.new(id, name, test_steps, location, parent_locations, tags, language, around_hooks)
+        def hash
+          location.hash
         end
 
-        def match_tags?(*expressions)
-          expressions.flatten.all? { |expression| match_single_tag_expression?(expression) }
+        def inspect
+          "#<#{self.class}: #{location}>"
         end
 
-        def match_name?(name_regexp)
-          name =~ name_regexp
+        def matching_locations
+          [
+            parent_locations,
+            location,
+            tags.map(&:location),
+            test_steps.map(&:matching_locations)
+          ].flatten
         end
 
         def match_locations?(queried_locations)
@@ -61,29 +67,24 @@ module Cucumber
           end
         end
 
-        def matching_locations
-          [
-            parent_locations,
-            location,
-            tags.map(&:location),
-            test_steps.map(&:matching_locations)
-          ].flatten
+        def match_name?(name_regexp)
+          name =~ name_regexp
         end
 
-        def inspect
-          "#<#{self.class}: #{location}>"
+        def match_tags?(*expressions)
+          expressions.flatten.all? { |expression| match_single_tag_expression?(expression) }
         end
 
-        def hash
-          location.hash
+        def step_count
+          test_steps.count
         end
 
-        def eql?(other)
-          other.hash == hash
+        def with_around_hooks(around_hooks)
+          self.class.new(id, name, test_steps, location, parent_locations, tags, language, around_hooks)
         end
 
-        def ==(other)
-          eql?(other)
+        def with_steps(test_steps)
+          self.class.new(id, name, test_steps, location, parent_locations, tags, language, around_hooks)
         end
 
         private