aslakhellesoy-cucumber 0.3.1 → 0.3.1.1

data/History.txt

@@ -1,3 +1,12 @@
+== 0.3.2 (In Git)
+
+=== Bugfixes
+* Step table with blank cell fails (#308 JohnnyT)
+
+=== New features
+* Summary should report scenarios (#32 Aslak Hellesøy)
+* Examples and the associated tables are indented one level deeper than Scenario Outline. (Aslak Hellesøy)
+
 == 0.3.1 2009-04-26
 
 This release has several minor bug fixes and new features. With the addition of Latvian and Hungarian Cucumber

data/examples/self_test/features/search_sample.feature

@@ -0,0 +1,22 @@
+Feature: search examples
+
+ Background: Hantu Pisang background match
+   Given passing without a table
+
+  Scenario: should match Hantu Pisang
+    Given passing without a table
+
+  Scenario: Ignore me
+    Given failing without a table
+
+  Scenario Outline: Ignore me
+    Given <state> without a table
+    Examples:
+      |state|
+      |failing|
+
+  Scenario Outline: Hantu Pisang match
+    Given <state> without a table
+    Examples:
+      |state|
+      |passing|

data/features/background.feature

@@ -15,8 +15,8 @@ Feature: backgrounds
       Scenario: another passing background
         Then I should have '10' cukes
 
-    1 scenario
-    2 passed steps
+    1 scenario (1 passed)
+    2 steps (2 passed)
     
     """
   
@@ -35,8 +35,8 @@ Feature: backgrounds
       Scenario: another passing background
         Then I should have '10' cukes
 
-    2 scenarios
-    4 passed steps
+    2 scenarios (2 passed)
+    4 steps (4 passed)
     
     """
 
@@ -52,19 +52,19 @@ Feature: backgrounds
       Scenario Outline: passing background
         Then I should have '<count>' cukes
 
-      Examples: 
-        | count |
-        | 10    |
+        Examples: 
+          | count |
+          | 10    |
 
       Scenario Outline: another passing background
         Then I should have '<count>' cukes
 
-      Examples: 
-        | count |
-        | 10    |
+        Examples: 
+          | count |
+          | 10    |
 
-    2 scenarios
-    4 passed steps
+    2 scenarios (2 passed)
+    4 steps (4 passed)
 
     """
 
@@ -89,9 +89,8 @@ Feature: backgrounds
       Scenario: another failing background
         Then I should have '10' cukes
 
-    2 scenarios
-    1 failed step
-    5 skipped steps
+    2 scenarios (1 failed, 1 skipped)
+    6 steps (1 failed, 5 skipped)
 
     """
     And "examples/self_test/tmp/after.txt" should exist
@@ -112,20 +111,19 @@ Feature: backgrounds
       Scenario Outline: failing background
         Then I should have '<count>' cukes
 
-      Examples: 
-        | count |
-        | 10    |
+        Examples: 
+          | count |
+          | 10    |
 
       Scenario Outline: another failing background
         Then I should have '<count>' cukes
 
-      Examples: 
-        | count |
-        | 10    |
+        Examples: 
+          | count |
+          | 10    |
 
-    2 scenarios
-    1 failed step
-    3 skipped steps
+    2 scenarios (1 failed, 1 skipped)
+    4 steps (1 failed, 3 skipped)
 
     """
 
@@ -144,9 +142,8 @@ Feature: backgrounds
       Scenario: another pending background
         Then I should have '10' cukes
 
-    2 scenarios
-    2 skipped steps
-    2 undefined steps
+    2 scenarios (2 undefined)
+    4 steps (2 skipped, 2 undefined)
 
     """
 
@@ -171,10 +168,8 @@ Feature: backgrounds
           features/background/failing_background_after_success.feature:5:in `And '10' global cukes'
         Then I should have '10' global cukes
 
-    2 scenarios
-    1 failed step
-    1 skipped step
-    4 passed steps
+    2 scenarios (1 failed, 1 passed)
+    6 steps (1 failed, 1 skipped, 4 passed)
 
     """
 
@@ -214,8 +209,8 @@ Feature: backgrounds
             I sleep all night and I test all day
           \"\"\"
 
-    2 scenarios
-    8 passed steps
+    2 scenarios (2 passed)
+    8 steps (8 passed)
     
     """
 
@@ -231,8 +226,8 @@ Feature: backgrounds
       Scenario: example
         Then I should have '10' cukes
 
-    1 scenario
-    2 passed steps
+    1 scenario (1 passed)
+    2 steps (2 passed)
     
     """
 

data/features/cucumber_cli.feature

@@ -13,8 +13,8 @@ Feature: Cucumber command line
         Scenario: Missing
           Given missing
 
-      1 scenario
-      1 undefined step
+      1 scenario (1 undefined)
+      1 step (1 undefined)
 
       """
 
@@ -31,8 +31,8 @@ Feature: Cucumber command line
             Undefined step: "missing" (Cucumber::Undefined)
             features/sample.feature:6:in `Given missing'
 
-      1 scenario
-      1 undefined step
+      1 scenario (1 undefined)
+      1 step (1 undefined)
 
       """
 
@@ -49,8 +49,8 @@ Feature: Cucumber command line
           | a | b |
           | c | d |
 
-    1 scenario
-    1 passed step
+    1 scenario (1 passed)
+    1 step (1 passed)
 
     """
 
@@ -76,9 +76,8 @@ Feature: Cucumber command line
             ./features/step_definitions/sample_steps.rb:9:in `/^failing$/'
             features/sample.feature:16:in `Given failing'
 
-      2 scenarios
-      1 failed step
-      1 undefined step
+      2 scenarios (1 failed, 1 undefined)
+      2 steps (1 failed, 1 undefined)
 
       """
 
@@ -93,8 +92,8 @@ Feature: Cucumber command line
         Scenario: Missing
           Given missing
 
-      1 scenario
-      1 passed step
+      1 scenario (1 passed)
+      1 step (1 passed)
 
       """
 
@@ -111,8 +110,8 @@ Feature: Cucumber command line
             | a | b |
             | c | d |
 
-      1 scenario
-      1 passed step
+      1 scenario (1 passed)
+      1 step (1 passed)
 
       """
 
@@ -129,10 +128,8 @@ Feature: Cucumber command line
       ./features/step_definitions/sample_steps.rb:9:in `/^failing$/'
       features/sample.feature:16:in `Given failing'
 
-      3 scenarios
-      1 failed step
-      1 undefined step
-      1 passed step
+      3 scenarios (1 failed, 1 undefined, 1 passed)
+      3 steps (1 failed, 1 undefined, 1 passed)
 
       """
 
@@ -160,8 +157,8 @@ Feature: Cucumber command line
           Når jeg summerer
           Så skal resultatet være 13
 
-      2 scenarios
-      9 passed steps
+      2 scenarios (2 passed)
+      9 steps (9 passed)
 
       """
 
@@ -208,18 +205,18 @@ Feature: Cucumber command line
           yawn
           Given <state> without a table
 
-        Examples: 
-          | state   |
-          | passing |
+          Examples: 
+            | state   |
+            | passing |
     
         Scenario Outline: name
           Given <state> without a table
 
-        Examples: I'm a multiline name
-          which goes on and on and on for three lines
-          yawn
-          | state   |
-          | passing |
+          Examples: I'm a multiline name
+            which goes on and on and on for three lines
+            yawn
+            | state   |
+            | passing |
 
       Feature: Outline Sample
 
@@ -229,15 +226,15 @@ Feature: Cucumber command line
           Given <state> without a table
           Given <other_state> without a table
 
-        Examples: Rainbow colours
-          | state   | other_state |
-          | missing | passing     |
-          | passing | passing     |
-          | failing | passing     |
+          Examples: Rainbow colours
+            | state   | other_state |
+            | missing | passing     |
+            | passing | passing     |
+            | failing | passing     |
 
-        Examples: Only passing
-          | state   | other_state |
-          | passing | passing     |
+          Examples: Only passing
+            | state   | other_state |
+            | passing | passing     |
 
       @one
       Feature: Sample
@@ -273,16 +270,16 @@ Feature: Cucumber command line
         Scenario Outline: Ignore me
           Given <state> without a table
 
-        Examples: 
-          | state   |
-          | failing |
+          Examples: 
+            | state   |
+            | failing |
 
         Scenario Outline: Hantu Pisang match
           Given <state> without a table
 
-        Examples: 
-          | state   |
-          | passing |
+          Examples: 
+            | state   |
+            | passing |
 
       Feature: undefined multiline args
       
@@ -297,9 +294,8 @@ Feature: Cucumber command line
             | table   |
             | example |
 
-      21 scenarios
-      26 skipped steps
-      9 undefined steps
+      21 scenarios (15 skipped, 5 undefined, 1 passed)
+      35 steps (26 skipped, 9 undefined)
 
       """
 
@@ -309,11 +305,11 @@ Feature: Cucumber command line
       """
       UUUUU
 
-      1 scenario
-      5 undefined steps
+      1 scenario (1 undefined)
+      5 steps (5 undefined)
 
       """
-    And "examples/self_test/tmp/pretty.txt" should match
+    And "examples/self_test/tmp/pretty.txt" should contain
       """
       Feature: Lots of undefined
 
@@ -323,9 +319,9 @@ Feature: Cucumber command line
           And it's 40 degrees in Norway
           When I stop procrastinating
           And there is world peace
-
-      1 scenario
-      5 undefined steps
+      
+      1 scenario (1 undefined)
+      5 steps (5 undefined)
 
       """
 
@@ -344,12 +340,12 @@ Feature: Cucumber command line
         Scenario Outline: Hantu Pisang match
           Given <state> without a table
 
-        Examples: 
-          | state   |
-          | passing |
+          Examples: 
+            | state   |
+            | passing |
 
-      2 scenarios
-      4 passed steps
+      2 scenarios (2 passed)
+      4 steps (4 passed)
 
       """
 
@@ -362,8 +358,8 @@ Feature: Cucumber command line
         Background: Hantu Pisang background match
           Given passing without a table
 
-      0 scenarios
-      1 passed step
+      0 scenarios ()
+      1 step (1 passed)
 
       """
 
@@ -385,9 +381,8 @@ Feature: Cucumber command line
             | a | b |
             | c | d |
 
-      2 scenarios
-      1 undefined step
-      1 passed step
+      2 scenarios (1 undefined, 1 passed)
+      2 steps (1 undefined, 1 passed)
 
       """
 
@@ -419,10 +414,8 @@ Feature: Cucumber command line
             ./features/step_definitions/sample_steps.rb:9:in `/^failing$/'
             features/sample.feature:16:in `Given failing'
 
-      3 scenarios
-      1 failed step
-      1 undefined step
-      1 passed step
+      3 scenarios (1 failed, 1 undefined, 1 passed)
+      3 steps (1 failed, 1 undefined, 1 passed)
 
       """
 
@@ -443,9 +436,8 @@ Feature: Cucumber command line
             | a | b |
             | c | d |
 
-      2 scenarios
-      1 skipped step
-      1 undefined step
+      2 scenarios (1 skipped, 1 undefined)
+      2 steps (1 skipped, 1 undefined)
 
       """
 

data/features/cucumber_cli_diff_disabled.feature

@@ -20,8 +20,8 @@ Feature: Cucumber command line
             ./features/step_definitions/sample_steps.rb:63:in `/^failing expectation$/'
             features/failing_expectation.feature:4:in `Given failing expectation'
 
-      1 scenario
-      1 failed step
+      1 scenario (1 failed)
+      1 step (1 failed)
 
       """
 
@@ -38,8 +38,8 @@ Feature: Cucumber command line
             ./features/step_definitions/sample_steps.rb:63:in `/^failing expectation$/'
             features/failing_expectation.feature:4:in `Given failing expectation'
 
-      1 scenario
-      1 failed step
+      1 scenario (1 failed)
+      1 step (1 failed)
 
       """
 

data/features/cucumber_cli_outlines.feature

@@ -12,25 +12,22 @@ Feature: Cucumber command line
           Given <state> without a table
           Given <other_state> without a table
 
-        Examples: Rainbow colours
-          | state   | other_state |
-          | missing | passing     |
-          | passing | passing     |
-          | failing | passing     |
-          FAIL (RuntimeError)
-          ./features/step_definitions/sample_steps.rb:2:in `flunker'
-          ./features/step_definitions/sample_steps.rb:16:in `/^failing without a table$/'
-          features/outline_sample.feature:6:in `Given <state> without a table'
-
-        Examples: Only passing
-          | state   | other_state |
-          | passing | passing     |
-
-      4 scenarios
-      1 failed step
-      2 skipped steps
-      1 undefined step
-      4 passed steps
+          Examples: Rainbow colours
+            | state   | other_state |
+            | missing | passing     |
+            | passing | passing     |
+            | failing | passing     |
+            FAIL (RuntimeError)
+            ./features/step_definitions/sample_steps.rb:2:in `flunker'
+            ./features/step_definitions/sample_steps.rb:16:in `/^failing without a table$/'
+            features/outline_sample.feature:6:in `Given <state> without a table'
+
+          Examples: Only passing
+            | state   | other_state |
+            | passing | passing     |
+
+      4 scenarios (1 failed, 1 undefined, 2 passed)
+      8 steps (1 failed, 2 skipped, 1 undefined, 4 passed)
 
       """
 
@@ -44,25 +41,22 @@ Feature: Cucumber command line
           Given <state> without a table
           Given <other_state> without a table
 
-        Examples: Rainbow colours
-          | state   | other_state |
-          | missing | passing     |
-          | passing | passing     |
-          | failing | passing     |
-          FAIL (RuntimeError)
-          ./features/step_definitions/sample_steps.rb:2:in `flunker'
-          ./features/step_definitions/sample_steps.rb:16:in `/^failing without a table$/'
-          features/outline_sample.feature:6:in `Given <state> without a table'
-
-        Examples: Only passing
-          | state   | other_state |
-          | passing | passing     |
-
-      4 scenarios
-      1 failed step
-      2 skipped steps
-      1 undefined step
-      4 passed steps
+          Examples: Rainbow colours
+            | state   | other_state |
+            | missing | passing     |
+            | passing | passing     |
+            | failing | passing     |
+            FAIL (RuntimeError)
+            ./features/step_definitions/sample_steps.rb:2:in `flunker'
+            ./features/step_definitions/sample_steps.rb:16:in `/^failing without a table$/'
+            features/outline_sample.feature:6:in `Given <state> without a table'
+
+          Examples: Only passing
+            | state   | other_state |
+            | passing | passing     |
+
+      4 scenarios (1 failed, 1 undefined, 2 passed)
+      8 steps (1 failed, 2 skipped, 1 undefined, 4 passed)
 
       """
 
@@ -76,17 +70,16 @@ Feature: Cucumber command line
           Given <state> without a table       # features/step_definitions/sample_steps.rb:15
           Given <other_state> without a table # features/step_definitions/sample_steps.rb:12
 
-        Examples: Rainbow colours
-          | state   | other_state |
-          | failing | passing     |
-          FAIL (RuntimeError)
-          ./features/step_definitions/sample_steps.rb:2:in `flunker'
-          ./features/step_definitions/sample_steps.rb:16:in `/^failing without a table$/'
-          features/outline_sample.feature:6:in `Given <state> without a table'
+          Examples: Rainbow colours
+            | state   | other_state |
+            | failing | passing     |
+            FAIL (RuntimeError)
+            ./features/step_definitions/sample_steps.rb:2:in `flunker'
+            ./features/step_definitions/sample_steps.rb:16:in `/^failing without a table$/'
+            features/outline_sample.feature:6:in `Given <state> without a table'
 
-      1 scenario
-      1 failed step
-      1 skipped step
+      1 scenario (1 failed)
+      2 steps (1 failed, 1 skipped)
 
       """
 
@@ -106,11 +99,8 @@ Feature: Cucumber command line
       ./features/step_definitions/sample_steps.rb:16:in `/^failing without a table$/'
       features/outline_sample.feature:6:in `Given <state> without a table'
 
-      5 scenarios
-      1 failed step
-      2 skipped steps
-      1 undefined step
-      4 passed steps
+      5 scenarios (1 failed, 1 undefined, 3 passed)
+      8 steps (1 failed, 2 skipped, 1 undefined, 4 passed)
 
       """
 

data/features/multiline_names.feature

@@ -24,20 +24,20 @@ Feature: Multiline description names
         yawn
         Given <state> without a table               # features/step_definitions/sample_steps.rb:12
 
-      Examples: 
-        | state   |
-        | passing |
+        Examples: 
+          | state   |
+          | passing |
 
       Scenario Outline: name          # features/multiline_name.feature:21
         Given <state> without a table # features/step_definitions/sample_steps.rb:12
 
-      Examples: I'm a multiline name
-        which goes on and on and on for three lines
-        yawn
-        | state   |
-        | passing |
+        Examples: I'm a multiline name
+          which goes on and on and on for three lines
+          yawn
+          | state   |
+          | passing |
 
-    3 scenarios
-    6 passed steps
+    3 scenarios (3 passed)
+    6 steps (6 passed)
 
     """

data/features/rake_task.feature

@@ -6,127 +6,120 @@ Feature: Rake task
   Background:
     Given a standard Cucumber project directory structure
     And a file named "features/missing_step_definitions.feature" with:
-    """
-    Feature: Sample
+      """
+      Feature: Sample
 
-      Scenario: Wanted
-        Given I want to run this
+        Scenario: Wanted
+          Given I want to run this
 
-      Scenario: Unwanted
-        Given I don't want this ran
-    """
+        Scenario: Unwanted
+          Given I don't want this ran
+      """
 
 
   Scenario: rake task with a defined profile
     Given the following profile is defined:
-    """
-    foo: --quiet --no-color features/missing_step_definitions.feature:3
-    """
+      """
+      foo: --quiet --no-color features/missing_step_definitions.feature:3
+      """
     And a file named "Rakefile" with:
-    """
-    $LOAD_PATH.unshift(CUCUMBER_LIB)
-    require 'cucumber/rake/task'
-
-    Cucumber::Rake::Task.new(:features) do |t|
-      t.profile = "foo"
-    end
-    """
-
+      """
+      $LOAD_PATH.unshift(CUCUMBER_LIB)
+      require 'cucumber/rake/task'
+
+      Cucumber::Rake::Task.new(:features) do |t|
+        t.profile = "foo"
+      end
+      """
     When I run rake features
     Then it should pass
     And the output should contain
-    """
-    Feature: Sample
+      """
+      Feature: Sample
 
-      Scenario: Wanted
-        Given I want to run this
+        Scenario: Wanted
+          Given I want to run this
 
-    1 scenario
-    1 undefined step
-    """
+      1 scenario (1 undefined)
+      1 step (1 undefined)
+      """
 
   Scenario: rake task with a defined profile and cucumber_opts
     Given the following profile is defined:
-    """
-    bar: features/missing_step_definitions.feature:3
-    """
+      """
+      bar: features/missing_step_definitions.feature:3
+      """
     And a file named "Rakefile" with:
-    """
-    $LOAD_PATH.unshift(CUCUMBER_LIB)
-    require 'cucumber/rake/task'
-
-    Cucumber::Rake::Task.new(:features) do |t|
-      t.profile = "bar"
-      t.cucumber_opts = "--quiet --no-color"
-    end
-    """
-
+      """
+      $LOAD_PATH.unshift(CUCUMBER_LIB)
+      require 'cucumber/rake/task'
+
+      Cucumber::Rake::Task.new(:features) do |t|
+        t.profile = "bar"
+        t.cucumber_opts = "--quiet --no-color"
+      end
+      """
     When I run rake features
     Then it should pass
     And the output should contain
-    """
-    Feature: Sample
+      """
+      Feature: Sample
 
-      Scenario: Wanted
-        Given I want to run this
+        Scenario: Wanted
+          Given I want to run this
 
-    1 scenario
-    1 undefined step
-    """
+      1 scenario (1 undefined)
+      1 step (1 undefined)
+      """
 
   Scenario: rake task with a defined profile and feature list
     Given a file named "features/the_one_i_want_to_run.feature" with:
-    """
-    Feature: Desired
-
-      Scenario: Something
-        Given this is missing
-    """
-   Given the following profile is defined:
-    """
-    baz: --quiet --no-color
-    """
-    And a file named "Rakefile" with:
-    """
-    $LOAD_PATH.unshift(CUCUMBER_LIB)
-    require 'cucumber/rake/task'
-
-    Cucumber::Rake::Task.new(:features) do |t|
-      t.profile = "baz"
-      t.feature_list = ['features/the_one_i_want_to_run.feature']
-    end
-    """
+      """
+      Feature: Desired
 
+        Scenario: Something
+          Given this is missing
+      """
+    Given the following profile is defined:
+      """
+      baz: --quiet --no-color
+      """
+    And a file named "Rakefile" with:
+      """
+      $LOAD_PATH.unshift(CUCUMBER_LIB)
+      require 'cucumber/rake/task'
+
+      Cucumber::Rake::Task.new(:features) do |t|
+        t.profile = "baz"
+        t.feature_list = ['features/the_one_i_want_to_run.feature']
+      end
+      """
     When I run rake features
     Then it should pass
     And the output should contain
-    """
-    Feature: Desired
+      """
+      Feature: Desired
 
-      Scenario: Something
-        Given this is missing
+        Scenario: Something
+          Given this is missing
 
-    1 scenario
-    1 undefined step
-    """
+      1 scenario (1 undefined)
+      1 step (1 undefined)
+      """
 
   Scenario: deprecation warnings
     Given a file named "Rakefile" with:
-    """
-    $LOAD_PATH.unshift(CUCUMBER_LIB)
-    require 'cucumber/rake/task'
-
-    Cucumber::Rake::Task.new(:features) do |t|
-      t.feature_list = ['features/missing_step_definitions.feature']
-    end
-    """
+      """
+      $LOAD_PATH.unshift(CUCUMBER_LIB)
+      require 'cucumber/rake/task'
+
+      Cucumber::Rake::Task.new(:features) do |t|
+        t.feature_list = ['features/missing_step_definitions.feature']
+      end
+      """
     When I run rake features
     Then it should pass
     And STDERR should match
-    """
-    Cucumber::Rake::Task#feature_list is deprecated and will be removed in 0.4.0.  Please use profiles for complex settings: http://wiki.github.com/aslakhellesoy/cucumber/using-rake#profiles
-    """
-
-
-
-
+      """
+      Cucumber::Rake::Task#feature_list is deprecated and will be removed in 0.4.0.  Please use profiles for complex settings: http://wiki.github.com/aslakhellesoy/cucumber/using-rake#profiles
+      """

data/features/report_called_undefined_steps.feature

@@ -20,8 +20,8 @@ Feature: Cucumber command line
             ./features/step_definitions/sample_steps.rb:20:in `/^a step definition that calls an undefined step$/'
             features/call_undefined_step_from_step_def.feature:7:in `Given call step "a step definition that calls an undefined step"'
 
-      2 scenarios
-      2 undefined steps
+      2 scenarios (2 undefined)
+      2 steps (2 undefined)
 
       You can implement step definitions for undefined steps with these snippets:
 

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/parser/feature.rb

@@ -1474,7 +1474,6 @@ module Cucumber
       end
 
       module LinesToKeyword0
- 
         def build
           elements.map{|s| s.build}.join("\n")
         end

data/lib/cucumber/parser/feature.tt

@@ -270,10 +270,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/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/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

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

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/ast/visitor_spec.rb

@@ -0,0 +1,27 @@
+require File.dirname(__FILE__) + '/../../spec_helper'
+require 'cucumber/step_mother'
+require 'cucumber/ast'
+
+module Cucumber
+  module Ast
+    describe Visitor do
+      
+      it "should support checking scenario name matches regexps" do
+        visitor = Visitor.new(mock("step mother"))
+        scenario = Scenario.new(background=nil,
+          comment=Comment.new(""),
+          tags=Tags.new(0, []), 
+          line=99,
+          keyword="",
+          name="test name", 
+          steps=[])
+
+        visitor.options = {:name_regexps => [/name/]}
+        
+        visitor.matches_scenario_names?(scenario).should be_true
+      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: aslakhellesoy-cucumber
 version: !ruby/object:Gem::Version 
-  version: 0.3.1
+  version: 0.3.1.1
 platform: ruby
 authors: 
 - "Aslak Helles\xC3\xB8y"
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-04-26 00:00:00 -07:00
+date: 2009-04-28 00:00:00 -07:00
 default_executable: cucumber
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -249,6 +249,7 @@ files:
 - examples/self_test/features/multiline_name.feature
 - examples/self_test/features/outline_sample.feature
 - examples/self_test/features/sample.feature
+- examples/self_test/features/search_sample.feature
 - examples/self_test/features/step_definitions/sample_steps.rb
 - examples/self_test/features/support/env.rb
 - examples/self_test/features/support/tag_count_formatter.rb
@@ -404,6 +405,7 @@ files:
 - spec/cucumber/ast/step_collection_spec.rb
 - spec/cucumber/ast/step_spec.rb
 - spec/cucumber/ast/table_spec.rb
+- spec/cucumber/ast/visitor_spec.rb
 - spec/cucumber/broadcaster_spec.rb
 - spec/cucumber/cli/configuration_spec.rb
 - spec/cucumber/cli/main_spec.rb