cucumber-core 0.2.0 → 1.0.0.beta.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 4c30d51fa9f12c4fb7b91a14006a9a308b652cf0
-  data.tar.gz: cb60c3d4d610070a1e8344388900dfb553a10de4
+  metadata.gz: 42d388993761b2490490288cb0af4349a6688985
+  data.tar.gz: 483157a428ced0dfb4bbb69c31b2dba8247bde19
 SHA512:
-  metadata.gz: e34a846062bf14159235cbe27829195e940fc57b465f69b750835fc5b2ffdd41e930e287be8ea2742c300c0ed9ecc093dcb5eca173b1b5da60e1eebd96d21494
-  data.tar.gz: fd76c152cc8183f86482f41262ef858b4efb3df34b946a179c2de3e157a7bca52020fa5adff880c975fb775356f06203a5204ee410e6e58db68fa487f81984b8
+  metadata.gz: 2f676d49732572d9204ee72274dd3d2372a3b4e791281ca83057be310776a9878874d4c7e553ddd472a52c11db93e69eae2b94b87b9fc9a41fb616756ea5f7c5
+  data.tar.gz: 1d0948e3b3701c2bffe59253bd8167794700c20907e569e4dd2c2bcbbf8368ec8ba954067563906e81fbdc43ba1da8833826d1c00cfe5f1af6ac505b40f45159

data/.travis.yml

@@ -1,5 +1,5 @@
 rvm:
-  - 2.1.0
+  - 2.1
   - 2.0.0
   - 1.9.3
   - jruby

data/cucumber-core.gemspec

@@ -18,7 +18,7 @@ Gem::Specification.new do |s|
 
   s.add_development_dependency 'bundler',   '>= 1.3.5'
   s.add_development_dependency 'rake',      '>= 0.9.2'
-  s.add_development_dependency 'rspec',     '>= 2.13'
+  s.add_development_dependency 'rspec',     '~> 3'
   s.add_development_dependency 'unindent',  '>= 1.0'
 
   # For coverage reports

data/lib/cucumber/core.rb

@@ -2,7 +2,7 @@ require 'cucumber/core/gherkin/parser'
 require 'cucumber/core/compiler'
 require 'cucumber/core/test/runner'
 require 'cucumber/core/test/mapper'
-require 'cucumber/core/test/hook_compiler'
+require 'cucumber/core/test/filters/debug_filter'
 
 module Cucumber
   module Core
@@ -17,7 +17,7 @@ module Cucumber
     end
 
     def compile(gherkin_documents, last_receiver, filters = [])
-      first_receiver = filters.reduce(last_receiver) do |receiver, (filter_type, args)|
+      first_receiver = filters.reverse.reduce(last_receiver) do |receiver, (filter_type, args)|
         filter_type.new(*args + [receiver])
       end
       compiler = Compiler.new(first_receiver)
@@ -25,10 +25,10 @@ module Cucumber
       self
     end
 
-    def execute(gherkin_documents, mappings, report, filters = [], run_options = {})
-      receiver = Test::Runner.new(report, run_options)
-      filters << [Test::HookCompiler, [mappings]]
-      filters << [Test::Mapper, [mappings]]
+    def execute(gherkin_documents, mapping_definition, report, filters = [], run_options = {})
+      receiver = Test::Runner.new(report)
+      filters << [Test::Mapper, [mapping_definition]]
+      filters << [Test::DebugFilter, []] if run_options[:debug]
       compile gherkin_documents, receiver, filters
       self
     end

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

@@ -204,6 +204,10 @@ module Cucumber
           columns[col].__send__(:width)
         end
 
+        def each_cell(&proc)
+          cell_matrix.each{ |row| row.each(&proc) }
+        end
+
         def ==(other)
           other.class == self.class && raw == other.raw
         end
@@ -311,6 +315,10 @@ module Cucumber
             @value = "(i) #{value.inspect}"
           end
 
+          def ==(o)
+            value == o.value
+          end
+
           # For testing only
           def to_sexp #:nodoc:
             [:cell, @value]

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

@@ -3,7 +3,7 @@ module Cucumber
     module Ast
       module DescribesItself
         def describe_to(visitor, *args)
-          visitor.send(description_for_visitors, self, *args) do |child_visitor=visitor|
+          visitor.send(description_for_visitors, self, *args) do |child_visitor|
             children.each do |child|
               child.describe_to(child_visitor, *args)
             end

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

@@ -1,21 +1,27 @@
 require 'cucumber/initializer'
 require 'cucumber/core/ast/describes_itself'
 require 'cucumber/core/ast/location'
+require 'cucumber/core/ast/names'
 
 module Cucumber
   module Core
     module Ast
 
       class ExamplesTable
+        include Names
         include HasLocation
         include DescribesItself
 
-        attr_reader :header, :keyword, :name, :tags, :comments
+        attr_reader :header, :keyword, :tags, :comments, :location
 
         include Cucumber.initializer(
-          :location, :comments, :tags, :keyword, :name, :description, :header, :example_rows
+          :location, :comments, :tags, :keyword, :title, :description, :header, :example_rows
         )
 
+        def gherkin_statement(node=nil)
+          @gherkin_statement ||= node
+        end
+
         private
 
         def description_for_visitors

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

@@ -19,11 +19,10 @@ module Cucumber
         include Cucumber.initializer(:location, :background, :comments, :tags, :keyword, :title, :description, :feature_elements)
         def initialize(*)
           super
-          feature_elements.each { |e| e.feature = self }
         end
 
-        def gherkin_statement(statement=nil)
-          @gherkin_statement ||= statement
+        def gherkin_statement(node = nil)
+          @gherkin_statement ||= node
         end
 
         def children

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

@@ -1,4 +1,5 @@
 require 'forwardable'
+require 'cucumber/core/platform'
 module Cucumber
   module Core
     module Ast
@@ -26,6 +27,10 @@ module Cucumber
           [filepath.to_s, lines.to_s].reject { |v| v == WILDCARD.to_s }.join(":")
         end
 
+        def hash
+          self.class.hash ^ to_s.hash
+        end
+
         def to_str
           to_s
         end
@@ -49,14 +54,16 @@ module Cucumber
         end
 
         require 'set'
-        class Lines
+        class Lines < Struct.new(:data)
+          protected :data
           attr_reader :line
+
           def initialize(line)
             if Cucumber::JRUBY && line.is_a?(::Java::GherkinFormatterModel::Range)
               line = Range.new(line.first, line.last)
             end
             @line = line
-            @data = Array(line).to_set
+            super Array(line).to_set
           end
 
           def include?(other)
@@ -68,14 +75,12 @@ module Cucumber
             boundary.join('..')
           end
 
-          def ==(other)
-            other.data == data
+          def inspect
+            "<#{self.class}: #{to_s}>"
           end
 
           protected
 
-          attr_reader :data
-
           def boundary
             first_and_last(value).uniq
           end

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

@@ -2,9 +2,18 @@ module Cucumber
   module Core
     module Ast
       module Names
-        attr_reader :title, :description
+        attr_reader :description
 
         def name
+          title
+        end
+
+        def title
+          warn("deprecated. Use #name")
+          @title
+        end
+
+        def legacy_conflated_name_and_description
           s = @title
           s += "\n#{@description}" if @description != ""
           s

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

@@ -15,14 +15,17 @@ module Cucumber
         def initialize(language, location, keyword, name, multiline_arg)
           @language, @location, @keyword, @name, @multiline_arg = language, location, keyword, name, multiline_arg
           @language || raise("Language is required!")
+          @gherkin_statement = nil
         end
 
-        def gherkin_statement(statement=nil)
-          @gherkin_statement ||= statement
+        def gherkin_statement(node = nil)
+          @gherkin_statement ||= node
         end
 
         def to_step(row)
-          Ast::Step.new(language, location, keyword, row.expand(name), replace_multiline_arg(row))
+          step = Ast::Step.new(language, location, keyword, row.expand(name), replace_multiline_arg(row))
+          step.gherkin_statement(@gherkin_statement)
+          step
         end
 
         private

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

@@ -13,7 +13,6 @@ module Cucumber
         include DescribesItself
 
         attr_reader   :feature_tags
-        attr_accessor :feature
         attr_reader   :comments, :tags, :keyword, :background, :title, :location, :gherkin_statement
 
         include Cucumber.initializer(:gherkin_statement, :language, :location, :background, :comments, :tags, :feature_tags, :keyword, :title, :description, :raw_steps)

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

@@ -13,7 +13,6 @@ module Cucumber
 
         MissingExamples = Class.new(StandardError)
 
-        attr_accessor :feature
         attr_reader :feature_tags
 
         attr_reader :line
@@ -23,8 +22,8 @@ module Cucumber
 
         attr_reader :comments, :tags, :keyword, :background, :location
 
-        def gherkin_statement(node)
-          @gherkin_statement = node
+        def gherkin_statement(node = nil)
+          @gherkin_statement ||= node
         end
 
         private

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

@@ -14,8 +14,8 @@ module Cucumber
           @location, @keyword, @name, @multiline_arg = location, keyword, name, multiline_arg
         end
 
-        def gherkin_statement(statement=nil)
-          @gherkin_statement ||= statement
+        def gherkin_statement(node = nil)
+          @gherkin_statement ||= node
         end
 
         def to_sexp

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

@@ -224,6 +224,7 @@ module Cucumber
 
         class ScenarioOutlineBuilder < Builder
           def result(background, language, feature_tags)
+            raise ParseError.new("Missing Examples section for Scenario Outline at #{location}") if examples_tables.empty?
             scenario_outline = Ast::ScenarioOutline.new(
               language,
               location,
@@ -266,7 +267,7 @@ module Cucumber
           class ExamplesTableBuilder < Builder
 
             def result
-              Ast::ExamplesTable.new(
+              examples_table = Ast::ExamplesTable.new(
                 location,
                 comments,
                 tags,
@@ -276,6 +277,8 @@ module Cucumber
                 header,
                 example_rows
               )
+              examples_table.gherkin_statement(node)
+              examples_table
             end
 
             private

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

@@ -12,8 +12,12 @@ module Cucumber
           super(test_steps, source, around_hooks)
         end
 
+        def step_count
+          test_steps.count
+        end
+
         def describe_to(visitor, *args)
-          visitor.test_case(self, *args) do |child_visitor=visitor|
+          visitor.test_case(self, *args) do |child_visitor|
             compose_around_hooks(child_visitor, *args) do
               test_steps.each do |test_step|
                 test_step.describe_to(child_visitor, *args)
@@ -24,7 +28,7 @@ module Cucumber
         end
 
         def describe_source_to(visitor, *args)
-          source.each do |node|
+          source.reverse.each do |node|
             node.describe_to(visitor, *args)
           end
           self
@@ -101,19 +105,19 @@ module Cucumber
           end
 
           def scenario_outline(outline)
-            @result = "#{outline.keyword}: #{outline.name}"
+            @result = "#{outline.keyword}: #{outline.name}" + @result
             self
           end
 
           def examples_table(table)
             name = table.name.strip
             name = table.keyword if name.length == 0
-            @result << ", #{name}"
+            @result = ", #{name}" + @result
             self
           end
 
           def examples_table_row(row)
-            @result << " (row #{row.number})"
+            @result = " (row #{row.number})"
             self
           end
         end
@@ -128,7 +132,7 @@ module Cucumber
 
           [:feature, :scenario, :scenario_outline, :examples_table].each do |node_name|
             define_method(node_name) do |node|
-              @result += node.tags
+              @result = node.tags + @result
               self
             end
           end

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

@@ -0,0 +1,28 @@
+module Cucumber
+  module Core
+    module Test
+      class DebugFilter
+        def initialize(receiver)
+          @receiver = receiver
+        end
+
+        def test_case(test_case, &descend)
+          p [:test_case, test_case.source.last.class, test_case.location.to_s]
+          descend.call(self)
+          test_case.describe_to @receiver
+          self
+        end
+
+        def test_step(test_step)
+          p [:test_step, test_step.source.last.class, test_step.location.to_s]
+          self
+        end
+
+        def done
+          @receiver.done
+        end
+      end
+    end
+  end
+end
+

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

@@ -49,7 +49,7 @@ module Cucumber
         class TagLimits
           TAG_MATCHER = /^
             (?:~)?                 #The tag negation symbol "~". This is optional and not captured.
-            (?<tag_name>\@[\w\d]+) #Captures the tag name including the "@" symbol.
+            (?<tag_name>\@\w+)     #Captures the tag name including the "@" symbol.
             \:                     #The seperator, ":", between the tag name and the limit.
             (?<limit>\d+)          #Caputres the limit number.
           $/x

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

@@ -0,0 +1,76 @@
+require 'cucumber/initializer'
+
+module Cucumber
+  module Core
+    module Test
+      module Hooks
+
+        class BeforeHook
+          include Cucumber.initializer(:location)
+          public :location
+
+          def name
+            "Before hook"
+          end
+
+          def match_locations?(queried_locations)
+            queried_locations.any? { |other_location| other_location.match?(location) }
+          end
+
+          def describe_to(visitor, *args)
+            visitor.before_hook(self, *args)
+          end
+        end
+
+        class AfterHook
+          include Cucumber.initializer(:location)
+          public :location
+
+          def name
+            "After hook"
+          end
+
+          def match_locations?(queried_locations)
+            queried_locations.any? { |other_location| other_location.match?(location) }
+          end
+
+          def describe_to(visitor, *args)
+            visitor.after_hook(self, *args)
+          end
+        end
+
+        class AroundHook
+          def initialize(&block)
+            @block = block
+          end
+
+          def describe_to(visitor, *args, &continue)
+            visitor.around_hook(self, *args, &continue)
+          end
+
+          def call(continue)
+            @block.call(continue)
+          end
+        end
+
+        class AfterStepHook
+          include Cucumber.initializer(:location)
+          public :location
+
+          def name
+            "AfterStep hook"
+          end
+
+          def match_locations?(queried_locations)
+            queried_locations.any? { |other_location| other_location.match?(location) }
+          end
+
+          def describe_to(visitor, *args)
+            visitor.after_step_hook(self, *args)
+          end
+        end
+
+      end
+    end
+  end
+end