cucumber 0.3.1 → 0.3.2

data/lib/cucumber/ast/outline_table.rb

@@ -80,6 +80,11 @@ module Cucumber
           @step_invocations.passed?
         end
 
+        # Returns the status
+        def status
+          @step_invocations.status
+        end
+
         private
 
         def header?

data/lib/cucumber/ast/scenario.rb

@@ -45,6 +45,11 @@ module Cucumber
         @steps.exception
       end
 
+      # Returns the status
+      def status
+        @steps.status
+      end
+
       def skip_invoke!
         @steps.each{|step_invocation| step_invocation.skip_invoke!}
         @feature.next_feature_element(self) do |next_one|

data/lib/cucumber/ast/step_collection.rb

@@ -55,11 +55,16 @@ module Cucumber
       end
 
       def failed?
-        @steps.detect{|step_invocation| step_invocation.status == :failed}
+        status == :failed
       end
 
       def passed?
-        @steps.detect{|step_invocation| step_invocation.status != :passed}.nil?
+        status == :passed
+      end
+      
+      def status
+        @steps.each{|step_invocation| return step_invocation.status if step_invocation.status != :passed}
+        :passed
       end
 
       def to_sexp

data/lib/cucumber/ast/table.rb

@@ -192,7 +192,7 @@ module Cucumber
       end
 
       def has_text?(text)
-        raw.flatten.detect{|cell_value| cell_value.index(text)}
+        raw.flatten.compact.detect{|cell_value| cell_value.index(text)}
       end
 
       def cells_rows

data/lib/cucumber/formatter/console.rb

@@ -51,17 +51,15 @@ module Cucumber
       end
 
       def print_counts
-        @io.puts dump_count(step_mother.scenarios.length, "scenario")
+        @io.print dump_count(step_mother.scenarios.length, "scenario")
+        print_status_counts{|status| step_mother.scenarios(status)}
 
-        [:failed, :skipped, :undefined, :pending, :passed].each do |status|
-          if step_mother.steps(status).any?
-            count_string = dump_count(step_mother.steps(status).length, "step", status.to_s)
-            @io.puts format_string(count_string, status)
-            @io.flush
-          end
-        end
-      end
+        @io.print dump_count(step_mother.steps.length, "step")
+        print_status_counts{|status| step_mother.steps(status)}
 
+        @io.flush
+      end
+      
       def print_exception(e, status, indent)
         if @options[:strict] || !(Undefined === e) || e.nested?
           @io.puts(format_string("#{e.message} (#{e.class})\n#{e.backtrace.join("\n")}".indent(indent), status))
@@ -95,6 +93,14 @@ module Cucumber
 
     private
 
+      def print_status_counts
+        counts = [:failed, :skipped, :undefined, :pending, :passed].map do |status|
+          elements = yield status
+          elements.any? ? format_string("#{elements.length} #{status.to_s}", status) : nil
+        end
+        @io.puts(" (#{counts.compact.join(', ')})")
+      end
+
       def dump_count(count, what, state=nil)
         [count, state, "#{what}#{count == 1 ? '' : 's'}"].compact.join(" ")
       end

data/lib/cucumber/formatter/pretty.rb

@@ -96,10 +96,10 @@ module Cucumber
 
       def visit_examples_name(keyword, name)
         names = name.empty? ? [name] : name.split("\n")
-        @io.puts("\n  #{keyword} #{names[0]}")
-        names[1..-1].each {|s| @io.puts "    #{s}" }
+        @io.puts("\n    #{keyword} #{names[0]}")
+        names[1..-1].each {|s| @io.puts "      #{s}" }
         @io.flush
-        @indent = 4
+        @indent = 6
       end
 
       def visit_scenario_name(keyword, name, file_colon_line, source_indent)

data/lib/cucumber/formatter/progress.rb

@@ -18,18 +18,14 @@ module Cucumber
         print_summary
       end
 
-      def visit_multiline_arg(multiline_arg)
-        @multiline_arg = true
-        super
-        @multiline_arg = false
-      end
-
-      def visit_step_name(keyword, step_match, status, source_indent, background)
-        progress(status) unless status == :outline
+      def visit_step_result(keyword, step_match, multiline_arg, status, exception, source_indent, background)
+        progress(status)
+        @status = status
       end
 
       def visit_table_cell_value(value, width, status)
-        progress(status) if (status != :thead) && !@multiline_arg
+        status ||= @status
+        progress(status) unless table_header_cell?(status)
       end
 
       private
@@ -55,6 +51,9 @@ module Cucumber
         @io.flush
       end
       
+      def table_header_cell?(status)
+        status == :skipped_param
+      end
     end
   end
 end

data/lib/cucumber/languages.yml

@@ -206,6 +206,21 @@
   and: Et
   but: Mais
   space_after_keyword: true
+"he":
+  name: Hebrew
+  native: עברית
+  encoding: UTF-8
+  feature: תכונה
+  background: רקע
+  scenario: תרחיש
+  scenario_outline: תבנית תרחיש
+  examples: דוגמאות
+  given: בהינתן
+  when: כאשר
+  then: אז|אזי
+  and: וגם
+  but: אבל
+  space_after_keyword: true
 "hu":
   name: Hungarian
   native: magyar
@@ -482,4 +497,4 @@
   then: То
   and: И
   but: Но
-  space_after_keyword: true  
+  space_after_keyword: true

data/lib/cucumber/parser/feature.rb

@@ -827,6 +827,10 @@ module Cucumber
         end
 
         def matches_name?(regexp_to_match)
+          outline_matches_name?(regexp_to_match) || examples_sections.matches_name?(regexp_to_match)
+        end
+
+        def outline_matches_name?(regexp_to_match)
           name.build =~ regexp_to_match
         end
 
@@ -1088,9 +1092,13 @@ module Cucumber
           elements.detect { |e| e.at_line?(line) }
         end
 
+        def matches_name?(regexp_to_match)
+          elements.detect { |e| e.matches_name?(regexp_to_match) }
+        end
+
         def build(filter, scenario_outline)
           elements.map do |e|
-            if(filter.nil? || filter.accept?(e) || filter.outline_at_line?(scenario_outline))
+            if(filter.nil? || filter.accept_example?(e, scenario_outline))
               e.build(filter, scenario_outline)
             end
           end.compact
@@ -1474,7 +1482,6 @@ module Cucumber
       end
 
       module LinesToKeyword0
- 
         def build
           elements.map{|s| s.build}.join("\n")
         end

data/lib/cucumber/parser/feature.tt

@@ -165,6 +165,10 @@ module Cucumber
           end
 
           def matches_name?(regexp_to_match)
+            outline_matches_name?(regexp_to_match) || examples_sections.matches_name?(regexp_to_match)
+          end
+
+          def outline_matches_name?(regexp_to_match)
             name.build =~ regexp_to_match
           end
 
@@ -218,9 +222,13 @@ module Cucumber
             elements.detect { |e| e.at_line?(line) }
           end
 
+          def matches_name?(regexp_to_match)
+            elements.detect { |e| e.matches_name?(regexp_to_match) }
+          end
+
           def build(filter, scenario_outline)
             elements.map do |e|
-              if(filter.nil? || filter.accept?(e) || filter.outline_at_line?(scenario_outline))
+              if(filter.nil? || filter.accept_example?(e, scenario_outline))
                 e.build(filter, scenario_outline)
               end
             end.compact
@@ -270,10 +278,10 @@ module Cucumber
       end
       
       rule lines_to_keyword
-        (line_to_keyword)* { 
-        def build
-          elements.map{|s| s.build}.join("\n")
-        end
+        line_to_keyword* {
+          def build
+            elements.map{|s| s.build}.join("\n")
+          end
         }
       end
 

data/lib/cucumber/parser/treetop_ext.rb

@@ -26,6 +26,11 @@ module Cucumber
         matches_names?(syntax_node)
       end
 
+      def accept_example?(syntax_node, outline)
+        (at_line?(syntax_node) || outline_at_line?(outline)) && 
+        (matches_names?(syntax_node) || outline_matches_names?(outline))
+      end
+      
       def at_line?(syntax_node)
         @lines.nil? || @lines.empty? || @lines.detect{|line| syntax_node.at_line?(line)}
       end
@@ -47,6 +52,10 @@ module Cucumber
         @exclude_tags.any? && syntax_node.has_tags?(@exclude_tags)
       end
       
+      def outline_matches_names?(syntax_node)
+        @name_regexps.nil? || @name_regexps.empty? || @name_regexps.detect{|name_regexp| syntax_node.outline_matches_name?(name_regexp)}
+      end
+      
       def matches_names?(syntax_node)
         @name_regexps.nil? || @name_regexps.empty? || @name_regexps.detect{|name_regexp| syntax_node.matches_name?(name_regexp)}
       end

data/lib/cucumber/rails/world.rb

@@ -7,8 +7,14 @@ else
   require 'action_controller/test_process'
   require 'action_controller/integration'
 end
-require 'test/unit/testresult'
 
+begin
+  require 'test/unit/testresult'
+rescue LoadError => e
+  e.message << "\nYou must gem install test-unit. For more info see https://rspec.lighthouseapp.com/projects/16211/tickets/292"
+  e.message << "\nAlso make sure you have rack 1.0.0 or higher."
+  raise e
+end
 
 # So that Test::Unit doesn't launch at the end - makes it think it has already been run.
 Test::Unit.run = true if Test::Unit.respond_to?(:run=)

data/lib/cucumber/rake/task.rb

@@ -62,6 +62,8 @@ module Cucumber
       def profile=(profile)
         @profile = profile
         unless feature_list
+          # TODO: remove once we completely remove these from the rake task.
+          @step_list = []
           @feature_list = [] # Don't use accessor to avoid deprecation warning.
         end
       end

data/lib/cucumber/step_mother.rb

@@ -105,8 +105,13 @@ module Cucumber
       end
     end
 
-    def scenarios
+    def scenarios(status = nil)
       @scenarios ||= []
+      if(status)
+        @scenarios.select{|scenario| scenario.status == status}
+      else
+        @scenarios
+      end
     end
 
     # Registers a new StepDefinition. This method is aliased

data/lib/cucumber/version.rb

@@ -2,7 +2,7 @@ module Cucumber #:nodoc:
   class VERSION #:nodoc:
     MAJOR = 0
     MINOR = 3
-    TINY  = 1
+    TINY  = 2
     PATCH = nil # Set to nil for official release
 
     STRING = [MAJOR, MINOR, TINY, PATCH].compact.join('.')

data/spec/cucumber/ast/table_spec.rb

@@ -129,7 +129,7 @@ module Cucumber
         it "should recognise when just a subset of a cell is delimited" do
           table = Table.new([
             %w{qty book},
-            ['<qty>', "This is <who>'s book"]
+            [nil, "This is <who>'s book"]
           ])
           table.should have_text('<who>')
         end

data/spec/cucumber/formatter/progress_spec.rb

@@ -0,0 +1,35 @@
+require File.dirname(__FILE__) + '/../../spec_helper'
+
+module Cucumber
+  module Formatter
+    describe Progress do
+
+      before(:all) do
+        Term::ANSIColor.coloring = false
+      end
+
+      before(:each) do
+        @out = StringIO.new
+        @progress = Progress.new(mock("step mother"), @out, {})
+      end
+
+      describe "visiting a table cell value without a status" do
+        it "should take the status from the last run step" do
+          @progress.visit_step_result('', '', nil, :failed, nil, 10, nil)
+          @progress.visit_table_cell_value('value', 10, nil)
+
+          @out.string.should == "FF"
+        end
+      end
+
+      describe "visiting a table cell which is a table header" do
+        it "should not output anything" do
+          @progress.visit_table_cell_value('value', 10, :skipped_param)
+
+          @out.string.should == ""
+        end
+      end
+
+    end
+  end
+end

data/spec/cucumber/parser/feature_parser_spec.rb

@@ -304,6 +304,18 @@ Examples: I'm a multiline name
                   [:row, 8,
                     [:cell, "5"]]]]]]
         end
+
+        it "should allow Examples to have multiline names" do
+          pending('https://rspec.lighthouseapp.com/projects/16211/tickets/307-031-step-mother-parses-scenario-titles') do
+            parse(%{Feature: Hi
+Scenario: When I have when in scenario
+Given I am a step
+}).to_sexp.should ==
+            [:feature, nil, "Feature: Hi",
+              [:scenario, 2, "Scenario:", "When I have when in scenario",
+                [:step, 3, "Given", "I am a step"]]]
+          end
+        end
       end
 
       describe "Syntax" do

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: cucumber
 version: !ruby/object:Gem::Version 
-  version: 0.3.1
+  version: 0.3.2
 platform: ruby
 authors: 
 - "Aslak Helles\xC3\xB8y"
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-04-26 00:00:00 +02:00
+date: 2009-05-03 00:00:00 -07:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -144,6 +144,11 @@ files:
 - examples/i18n/fr/features/addition.feature
 - examples/i18n/fr/features/step_definitions/calculatrice_steps.rb
 - examples/i18n/fr/lib/calculatrice.rb
+- examples/i18n/he/Rakefile
+- examples/i18n/he/features/addition.feature
+- examples/i18n/he/features/division.feature
+- examples/i18n/he/features/step_definitons/calculator_steps.rb
+- examples/i18n/he/lib/calculator.rb
 - examples/i18n/hu/Rakefile
 - examples/i18n/hu/features/addition.feature
 - examples/i18n/hu/features/division.feature
@@ -418,6 +423,7 @@ files:
 - spec/cucumber/formatter/html/index.html
 - spec/cucumber/formatter/html/jquery-1.3.min.js
 - spec/cucumber/formatter/html/jquery.uitableedit.js
+- spec/cucumber/formatter/progress_spec.rb
 - spec/cucumber/parser/feature_parser_spec.rb
 - spec/cucumber/parser/table_parser_spec.rb
 - spec/cucumber/rails/stubs/mini_rails.rb