cucumber 0.3.5 → 0.3.6

data/History.txt

@@ -1,3 +1,21 @@
+== 0.3.6
+
+Kanban! With this release you can tag features or scenarios that are work in progress
+with a tag and use the new --wip switch.
+
+Another handy feature in this release is that you can package your own formatters in RubyGems.
+
+=== New features
+* New --wip switch. See http://www.jroller.com/perryn/entry/bdd_on_a_multi_disciplined (Perryn Fowler)
+* Added a AfterStep hook (Luke Melia)
+* New aliases for Vietnamese (Ngoc Dao)
+* Automatic require of custom formatters. --require is no longer needed to load them, and they can be in Ruby gems. (Aslak Hellesøy)
+* Lazy loading of built-in formatters. Should improve startup time a little bit.
+
+=== Bugfixes
+* Gracefully handle exceptions in After block (#330 Matt Wynne)
+* Feature with only Background doesn't run hooks (#314, #329 Aslak Hellesøy)
+
 == 0.3.5 2009-05-14
 
 Let's make a new release today because two annoying bugs are fixed.

data/Manifest.txt

@@ -190,7 +190,6 @@ 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
 examples/self_test/features/tons_of_cukes.feature
 examples/self_test/features/undefined_multiline_args.feature
 examples/sinatra/Rakefile
@@ -238,6 +237,8 @@ examples/watir/Rakefile
 examples/watir/features/search.feature
 examples/watir/features/step_definitons/search_steps.rb
 examples/watir/features/support/env.rb
+features/after_block_exceptions.feature
+features/after_step_block_exceptions.feature
 features/background.feature
 features/cucumber_cli.feature
 features/cucumber_cli_diff_disabled.feature
@@ -253,6 +254,7 @@ features/step_definitions/cucumber_steps.rb
 features/step_definitions/extra_steps.rb
 features/support/env.rb
 features/usage.feature
+features/work_in_progress.feature
 gem_tasks/deployment.rake
 gem_tasks/environment.rake
 gem_tasks/features.rake
@@ -293,7 +295,6 @@ lib/cucumber/core_ext/exception.rb
 lib/cucumber/core_ext/instance_exec.rb
 lib/cucumber/core_ext/proc.rb
 lib/cucumber/core_ext/string.rb
-lib/cucumber/formatter.rb
 lib/cucumber/formatter/ansicolor.rb
 lib/cucumber/formatter/color_io.rb
 lib/cucumber/formatter/console.rb
@@ -305,6 +306,7 @@ lib/cucumber/formatter/pretty.rb
 lib/cucumber/formatter/profile.rb
 lib/cucumber/formatter/progress.rb
 lib/cucumber/formatter/rerun.rb
+lib/cucumber/formatter/tag_cloud.rb
 lib/cucumber/formatter/unicode.rb
 lib/cucumber/formatter/usage.rb
 lib/cucumber/formatters/unicode.rb

data/features/after_block_exceptions.feature

@@ -0,0 +1,97 @@
+Feature: After Block Exceptions
+  In order to use custom assertions at the end of each scenario
+  As a developer
+  I want exceptions raised in After blocks to be handled gracefully and reported by the formatters
+  
+  Background:
+    Given a standard Cucumber project directory structure
+    And a file named "features/step_definitions/steps.rb" with:
+      """
+      Given /^this step does something naughty$/ do
+        @naughty = true
+      end
+
+      Given /^this step works$/ do        
+      end
+      """
+    And a file named "features/support/env.rb" with:
+      """
+      class NaughtyScenarioException < Exception; end
+      After do
+        if @naughty
+          raise NaughtyScenarioException.new("This scenario has been very very naughty")
+        end
+      end
+      """
+
+  Scenario: Handle Exception in standard scenario step and carry on
+    Given a file named "features/naughty_step_in_scenario.feature" with:
+      """
+      Feature: Sample
+
+        Scenario: Naughty Step
+          Given this step does something naughty
+
+        Scenario: Success
+          Given this step works
+      """
+    When I run cucumber features
+    Then it should fail with 
+      """
+      Feature: Sample
+      
+        Scenario: Naughty Step                   # features/naughty_step_in_scenario.feature:3
+          Given this step does something naughty # features/step_definitions/steps.rb:1
+            This scenario has been very very naughty (NaughtyScenarioException)
+            ./features/support/env.rb:4:in `After'
+
+        Scenario: Success       # features/naughty_step_in_scenario.feature:6
+          Given this step works # features/step_definitions/steps.rb:5
+    
+      2 scenarios (1 failed, 1 passed)
+      2 steps (2 passed)
+      
+      """
+  
+  Scenario: Handle Exception in scenario outline table row and carry on
+    Given a file named "features/naughty_step_in_scenario_outline.feature" with:
+      """
+      Feature: Sample
+
+        Scenario Outline: Naughty Step
+          Given this step <Might Work>
+          
+          Examples:
+          | Might Work             |
+          | works                  |
+          | does something naughty |
+          | works                  |
+
+        Scenario: Success
+          Given this step works
+          
+      """
+    When I run cucumber features
+    Then it should fail with 
+      """
+      Feature: Sample
+      
+        Scenario Outline: Naughty Step # features/naughty_step_in_scenario_outline.feature:3
+          Given this step <Might Work> # features/step_definitions/steps.rb:5
+      
+          Examples: 
+            | Might Work             |
+            | works                  |
+            | does something naughty |
+            This scenario has been very very naughty (NaughtyScenarioException)
+            ./features/support/env.rb:4:in `After'
+            | works                  |
+      
+        Scenario: Success       # features/naughty_step_in_scenario_outline.feature:12
+          Given this step works # features/step_definitions/steps.rb:5
+      
+      4 scenarios (1 failed, 3 passed)
+      4 steps (4 passed)
+      
+      """
+  

data/features/after_step_block_exceptions.feature

@@ -0,0 +1,99 @@
+Feature: AfterStep Block Exceptions
+  In order to use custom assertions at the end of each step
+  As a developer
+  I want exceptions raised in AfterStep blocks to be handled gracefully and reported by the formatters
+  
+  Background:
+    Given a standard Cucumber project directory structure
+    And a file named "features/step_definitions/steps.rb" with:
+      """
+      Given /^this step does something naughty$/ do
+        @naughty = true
+      end
+
+      Given /^this step works$/ do        
+      end
+      """
+    And a file named "features/support/env.rb" with:
+      """
+      class NaughtyStepException < Exception; end
+      AfterStep do
+        if @naughty
+          raise NaughtyStepException.new("This step has been very very naughty")
+        end
+      end
+      """
+
+  Scenario: Handle Exception in standard scenario step and carry on
+    Given a file named "features/naughty_step_in_scenario.feature" with:
+      """
+      Feature: Sample
+
+        Scenario: Naughty Step
+          Given this step does something naughty
+
+        Scenario: Success
+          Given this step works
+      """
+    When I run cucumber features
+    Then it should fail with 
+      """
+      Feature: Sample
+      
+        Scenario: Naughty Step                   # features/naughty_step_in_scenario.feature:3
+          Given this step does something naughty # features/step_definitions/steps.rb:1
+            This step has been very very naughty (NaughtyStepException)
+            ./features/support/env.rb:4:in `AfterStep'
+            features/naughty_step_in_scenario.feature:4:in `Given this step does something naughty'
+
+        Scenario: Success       # features/naughty_step_in_scenario.feature:6
+          Given this step works # features/step_definitions/steps.rb:5
+    
+      2 scenarios (1 failed, 1 passed)
+      2 steps (1 failed, 1 passed)
+      
+      """
+  
+   Scenario: Handle Exception in scenario outline table row and carry on
+    Given a file named "features/naughty_step_in_scenario_outline.feature" with:
+      """
+      Feature: Sample
+
+        Scenario Outline: Naughty Step
+          Given this step <Might Work>
+
+          Examples:
+          | Might Work             |
+          | works                  |
+          | does something naughty |
+          | works                  |
+
+        Scenario: Success
+          Given this step works
+
+      """
+    When I run cucumber features
+    Then it should fail with 
+      """
+      Feature: Sample
+
+        Scenario Outline: Naughty Step # features/naughty_step_in_scenario_outline.feature:3
+          Given this step <Might Work> # features/step_definitions/steps.rb:5
+
+          Examples: 
+            | Might Work             |
+            | works                  |
+            | does something naughty |
+            This step has been very very naughty (NaughtyStepException)
+            ./features/support/env.rb:4:in `AfterStep'
+            features/naughty_step_in_scenario_outline.feature:4:in `Given this step <Might Work>'
+            | works                  |
+
+        Scenario: Success       # features/naughty_step_in_scenario_outline.feature:12
+          Given this step works # features/step_definitions/steps.rb:5
+
+      4 scenarios (1 failed, 3 passed)
+      4 steps (1 failed, 3 passed)
+
+      """
+

data/features/background.feature

@@ -253,5 +253,50 @@ Feature: backgrounds
     
     """
 
-  @josephwilk
-  Scenario: run a scenario showing explicit background steps --explicit-background
+  Scenario: https://rspec.lighthouseapp.com/projects/16211/tickets/329
+    Given a standard Cucumber project directory structure
+    And a file named "features/only_background_and_hooks.feature" with:
+      """
+      Feature: woo yeah
+
+        Background:
+          Given whatever
+
+      """
+    And a file named "features/only_background_and_hooks_steps.rb" with:
+      """
+      require 'spec/expectations'
+
+      Before do
+        $before = true
+      end
+
+      After do
+        $after = true
+      end
+
+      Given /^whatever$/ do
+        $before.should == true
+        $step = true
+      end
+
+      at_exit do
+        $before.should == true
+        $step.should == true
+        $after.should == true
+      end
+      """
+    When I run cucumber features/only_background_and_hooks.feature 
+    Then it should pass
+    And the output should be
+      """
+      Feature: woo yeah
+
+        Background:      # features/only_background_and_hooks.feature:3
+          Given whatever # features/only_background_and_hooks_steps.rb:11
+
+      0 scenarios
+      1 step (1 passed)
+      
+      """
+    And STDERR should be empty

data/features/custom_formatter.feature

@@ -1,7 +1,7 @@
 Feature: Custom Formatter
 
   Scenario: count tags
-    When I run cucumber --format Tag::Count features
+    When I run cucumber --format Cucumber::Formatter::TagCloud features
     Then it should fail with
       """
       | after_file | background_tagged_before_on_outline | four | lots | one | three | two |

data/features/step_definitions/cucumber_steps.rb

@@ -62,6 +62,10 @@ Then /^the output should not contain$/ do |text|
   last_stdout.should_not include(text)
 end
 
+Then /^the output should be$/ do |text|
+  last_stdout.should == text
+end
+
 # http://diffxml.sourceforge.net/
 Then /^"(.*)" should contain XML$/ do |file, xml|
   t = Tempfile.new('cucumber-junit')
@@ -86,6 +90,10 @@ Then /^STDERR should match$/ do |text|
   last_stderr.should =~ /#{text}/
 end
 
+Then /^STDERR should be empty$/ do
+  last_stderr.should == ""
+end
+
 Then /^"(.*)" should exist$/ do |file|
   File.exists?(file).should be_true
   FileUtils.rm(file)

data/features/work_in_progress.feature

@@ -0,0 +1,146 @@
+Feature: Cucumber --work-in-progress switch
+  In order to ensure that feature scenarios do not pass until they are expected to
+  Developers should be able to run cucumber in a mode that
+            - will fail if any scenario passes completely
+            - will not fail otherwise
+
+  Background: A passing and a pending feature
+    Given a standard Cucumber project directory structure
+    Given a file named "features/wip.feature" with:
+      """
+      Feature: WIP
+        @failing
+        Scenario: Failing
+          Given a failing step
+
+        @undefined
+        Scenario: Undefined
+          Given an undefined step
+
+        @pending
+        Scenario: Pending
+          Given a pending step
+
+        @passing
+        Scenario: Passing
+          Given a passing step
+      """
+    And a file named "features/passing_outline.feature" with:
+      """
+      Feature: Not WIP
+        Scenario Outline: Passing
+          Given a <what> step
+          
+          Examples:
+            | what    |
+            | passing |
+      """
+    And a file named "features/step_definitions/steps.rb" with:
+      """
+      Given /^a failing step$/ do
+        raise "I fail"
+      end
+
+      Given /^a passing step$/ do
+      end
+
+      Given /^a pending step$/ do
+        pending
+      end
+      """
+
+  Scenario: Pass with Failing Scenarios
+    When I run cucumber -q -w -t @failing features/wip.feature
+    Then it should pass with
+      """
+      Feature: WIP
+
+        @failing
+        Scenario: Failing
+          Given a failing step
+            I fail (RuntimeError)
+            ./features/step_definitions/steps.rb:2:in `/^a failing step$/'
+            features/wip.feature:4:in `Given a failing step'
+
+      1 scenario (1 failed)
+      1 step (1 failed)
+
+      """
+
+  Scenario: Pass with Undefined Scenarios
+    When I run cucumber -q -w -t @undefined features/wip.feature
+    Then it should pass with
+      """
+      Feature: WIP
+
+        @undefined
+        Scenario: Undefined
+          Given an undefined step
+
+      1 scenario (1 undefined)
+      1 step (1 undefined)
+
+      """
+
+  Scenario: Pass with Undefined Scenarios
+    When I run cucumber -q -w -t @pending features/wip.feature
+    Then it should pass with
+      """
+      Feature: WIP
+
+        @pending
+        Scenario: Pending
+          Given a pending step
+            TODO (Cucumber::Pending)
+            ./features/step_definitions/steps.rb:9:in `/^a pending step$/'
+            features/wip.feature:12:in `Given a pending step'
+
+      1 scenario (1 pending)
+      1 step (1 pending)
+
+      """
+
+  Scenario: Fail with Passing Scenarios
+    When I run cucumber -q -w -t @passing features/wip.feature
+    Then it should fail with
+      """
+      Feature: WIP
+
+        @passing
+        Scenario: Passing
+          Given a passing step
+
+      1 scenario (1 passed)
+      1 step (1 passed)
+
+      The --wip switch was used, so I didn't expect anything to pass. These scenarios passed:
+      (::) passed scenarios (::)
+
+      features/wip.feature:15:in `Scenario: Passing'
+
+
+      """
+
+  Scenario: Fail with Passing Scenario Outline
+    When I run cucumber -q -w features/passing_outline.feature
+    Then it should fail with
+      """
+      Feature: Not WIP
+
+        Scenario Outline: Passing
+          Given a <what> step
+      
+          Examples: 
+            | what    |
+            | passing |
+
+      1 scenario (1 passed)
+      1 step (1 passed)
+
+      The --wip switch was used, so I didn't expect anything to pass. These scenarios passed:
+      (::) passed scenarios (::)
+
+      features/passing_outline.feature:7:in `| passing |'
+
+
+      """

data/lib/cucumber.rb

@@ -14,6 +14,7 @@ module Cucumber
   KEYWORD_KEYS = %w{name native encoding feature background scenario scenario_outline examples given when then but}
   
   class << self
+    # The currently active language
     attr_reader :lang
     
     def load_language(lang) #:nodoc:

data/lib/cucumber/ast/background.rb

@@ -28,15 +28,15 @@ module Cucumber
         visitor.step_mother.before(hook_context)
         visitor.visit_steps(@step_invocations)
         @failed = @step_invocations.detect{|step_invocation| step_invocation.exception}
-        visitor.step_mother.after(hook_context) if @failed
+        visitor.step_mother.after(hook_context) if @failed || @feature_elements.empty?
       end
 
       def accept_hook?(hook)
         if hook_context != self
           hook_context.accept_hook?(hook)
         else
-          # We have no scenarios
-          false
+          # We have no scenarios, just ask our feature
+          @feature.accept_hook?(hook)
         end
       end
 

data/lib/cucumber/ast/outline_table.rb

@@ -36,7 +36,9 @@ module Cucumber
       end
 
       class ExampleCells < Cells
+        
         def create_step_invocations!(scenario_outline)
+          @scenario_outline = scenario_outline
           @step_invocations = scenario_outline.step_invocations(self)
         end
         
@@ -62,6 +64,8 @@ module Cucumber
               @cells.each do |cell|
                 visitor.visit_table_cell(cell)
               end
+              
+              visitor.visit_exception(@scenario_exception, :failed) if @scenario_exception
             end
           end
         end
@@ -69,22 +73,36 @@ module Cucumber
         def accept_hook?(hook)
           @table.accept_hook?(hook)
         end
-
+        
+        def exception
+          @exception || @scenario_exception
+        end
+        
+        def fail!(exception)
+          @scenario_exception = exception
+        end
+        
         # Returns true if one or more steps failed
         def failed?
-          @step_invocations.failed?
+          @step_invocations.failed? || !!@scenario_exception
         end
 
         # Returns true if all steps passed
         def passed?
-          @step_invocations.passed?
+          !failed?
         end
 
         # Returns the status
         def status
+          return :failed if @scenario_exception
           @step_invocations.status
         end
 
+        def backtrace_line
+          name = "| #{@cells.collect{|c| c.value }.join(' | ')} |"
+          @scenario_outline.backtrace_line(name, line)
+        end
+
         private
 
         def header?

data/lib/cucumber/ast/scenario.rb

@@ -28,25 +28,31 @@ module Cucumber
         visitor.step_mother.before_and_after(self, skip) do
           visitor.visit_steps(@steps)
         end
+        visitor.visit_exception(@exception, :failed) if @exception
       end
 
       # Returns true if one or more steps failed
       def failed?
-        @steps.failed?
+        @steps.failed? || !!@exception
+      end
+      
+      def fail!(exception)
+        @exception = exception
       end
 
       # Returns true if all steps passed
       def passed?
-        @steps.passed?
+        !failed?
       end
 
       # Returns the first exception (if any)
       def exception
-        @steps.exception
+        @exception || @steps.exception
       end
 
       # Returns the status
       def status
+        return :failed if @exception
         @steps.status
       end
 

data/lib/cucumber/ast/step_invocation.rb

@@ -30,6 +30,7 @@ module Cucumber
           begin
             step_mother.current_world.__cucumber_current_step = self if step_mother.current_world # Nil in Pure Java
             @step_match.invoke(step_mother.current_world, @multiline_arg)
+            step_mother.after_step
             status!(:passed)
           rescue Pending => e
             failed(e, false)

data/lib/cucumber/cli/configuration.rb

@@ -3,7 +3,15 @@ module Cucumber
     class YmlLoadError < StandardError; end
 
     class Configuration
-      FORMATS = %w{pretty profile progress rerun junit}
+      BUILTIN_FORMATS = {
+        'html'     => 'Cucumber::Formatter::Html',
+        'pretty'   => 'Cucumber::Formatter::Pretty',
+        'profile'  => 'Cucumber::Formatter::Profile',
+        'progress' => 'Cucumber::Formatter::Progress',
+        'rerun'    => 'Cucumber::Formatter::Rerun',
+        'usage'    => 'Cucumber::Formatter::Usage',
+        'junit'    => 'Cucumber::Formatter::Junit'
+      }
       DEFAULT_FORMAT = 'pretty'
 
       attr_reader :paths
@@ -57,12 +65,15 @@ module Cucumber
           end
           opts.on("-f FORMAT", "--format FORMAT",
             "How to format features (Default: #{DEFAULT_FORMAT})",
-            "Available formats: #{FORMATS.join(", ")}",
-            "You can also provide your own formatter classes as long",
-            "as they have been previously required using --require or",
-            "if they are in the folder structure such that cucumber",
-            "will require them automatically.",
-            "This option can be specified multiple times.") do |v|
+            "Available formats: #{BUILTIN_FORMATS.keys.sort.join(", ")}",
+            "FORMAT can also be the fully qualified class name of",
+            "your own custom formatter. If the class isn't loaded,",
+            "Cucumber will attempt to require a file with a relative",
+            "file name that is the underscore name of the class name.",
+            "Example: --format Foo::BarZap -> Cucumber will look for",
+            "foo/bar_zap.rb. You can place the file with this relative",
+            "path underneath your features/support directory or anywhere",
+            "on Ruby's LOAD_PATH, for example in a Ruby gem.") do |v|
             @options[:formats][v] = @out_stream
             @active_format = v
           end
@@ -132,6 +143,9 @@ module Cucumber
           opts.on("-S", "--strict", "Fail if there are any undefined steps.") do
             @options[:strict] = true
           end
+          opts.on("-w", "--wip", "Fail if there are any passing scenarios.") do
+            @options[:wip] = true
+          end
           opts.on("-v", "--verbose", "Show the files and features loaded.") do
             @options[:verbose] = true
           end
@@ -156,6 +170,8 @@ module Cucumber
         @options[:snippets] = true if !@quiet && @options[:snippets].nil?
         @options[:source]   = true if !@quiet && @options[:source].nil?
 
+        raise("You can't use both --strict and --wip") if @options[:strict] && @options[:wip]
+
         # Whatever is left after option parsing is the FILE arguments
         @paths += args
       end
@@ -168,6 +184,10 @@ module Cucumber
         @options[:strict]
       end
 
+      def wip?
+        @options[:wip]
+      end
+
       def guess?
         @options[:guess]
       end
@@ -223,14 +243,8 @@ module Cucumber
       end
 
       def formatter_class(format)
-        case format
-          when 'html'     then Formatter::Html
-          when 'pretty'   then Formatter::Pretty
-          when 'profile'  then Formatter::Profile
-          when 'progress' then Formatter::Progress
-          when 'rerun'    then Formatter::Rerun
-          when 'usage'    then Formatter::Usage
-          when 'junit'    then Formatter::JUnit
+        if(builtin = BUILTIN_FORMATS[format])
+          constantize(builtin)
         else
           constantize(format)
         end
@@ -271,14 +285,28 @@ module Cucumber
       end
 
       def constantize(camel_cased_word)
-        names = camel_cased_word.split('::')
-        names.shift if names.empty? || names.first.empty?
+        begin
+          names = camel_cased_word.split('::')
+          names.shift if names.empty? || names.first.empty?
 
-        constant = Object
-        names.each do |name|
-          constant = constant.const_defined?(name) ? constant.const_get(name) : constant.const_missing(name)
+          constant = Object
+          names.each do |name|
+            constant = constant.const_defined?(name) ? constant.const_get(name) : constant.const_missing(name)
+          end
+          constant
+        rescue NameError
+          require underscore(camel_cased_word)
+          retry
         end
-        constant
+      end
+
+      # Snagged from active_support
+      def underscore(camel_cased_word)
+        camel_cased_word.to_s.gsub(/::/, '/').
+          gsub(/([A-Z]+)([A-Z][a-z])/,'\1_\2').
+          gsub(/([a-z\d])([A-Z])/,'\1_\2').
+          tr("-", "_").
+          downcase
       end
 
       def parse_args_from_profile(profile)
@@ -295,10 +323,10 @@ Defined profiles in cucumber.yml:
 
         case(args_from_yml)
           when String
-            raise "The '#{profile}' profile in cucumber.yml was blank.  Please define the command line arguments for the 'foo' profile in cucumber.yml.\n" if args_from_yml =~ /^\s*$/
+            raise "The '#{profile}' profile in cucumber.yml was blank.  Please define the command line arguments for the '#{profile}' profile in cucumber.yml.\n" if args_from_yml =~ /^\s*$/
             args_from_yml = args_from_yml.split(' ')
           when Array
-            raise "The '#{profile}' profile in cucumber.yml was empty.  Please define the command line arguments for the 'foo' profile in cucumber.yml.\n" if args_from_yml.empty?
+            raise "The '#{profile}' profile in cucumber.yml was empty.  Please define the command line arguments for the '#{profile}' profile in cucumber.yml.\n" if args_from_yml.empty?
           else
             raise "The '#{profile}' profile in cucumber.yml was a #{args_from_yml.class}. It must be a String or Array"
         end

data/lib/cucumber/cli/main.rb

@@ -2,7 +2,7 @@ require 'optparse'
 require 'cucumber'
 require 'ostruct'
 require 'cucumber/parser'
-require 'cucumber/formatter'
+require 'cucumber/formatter/color_io'
 require 'cucumber/cli/language_help_formatter'
 require 'cucumber/cli/configuration'
 
@@ -40,8 +40,12 @@ module Cucumber
         step_mother.visitor = visitor # Needed to support World#announce
         visitor.visit_features(features)
 
-        failure = step_mother.steps(:failed).any? || 
+        failure = if configuration.wip?
+          step_mother.scenarios(:passed).any?
+        else
+          step_mother.scenarios(:failed).any? || 
           (configuration.strict? && step_mother.steps(:undefined).any?)
+        end
       end
 
       def load_plain_text_features

data/lib/cucumber/formatter/console.rb

@@ -85,6 +85,15 @@ module Cucumber
         @io.flush
       end
 
+      def print_passing_wip(options)
+        return unless options[:wip]
+        passed = step_mother.scenarios(:passed)
+        if passed.any?
+          @io.puts "\nThe --wip switch was used, so I didn't expect anything to pass. These scenarios passed:"
+          print_elements(passed, :passed, "scenarios")
+        end
+      end
+
       def announce(announcement)
         @io.puts
         @io.puts(format_string(announcement, :tag))

data/lib/cucumber/formatter/junit.rb

@@ -7,7 +7,7 @@ end
 
 module Cucumber
   module Formatter
-    class JUnit < Cucumber::Ast::Visitor
+    class Junit < Cucumber::Ast::Visitor
 
       def initialize(step_mother, io, options)
         super(step_mother)

data/lib/cucumber/formatter/pretty.rb

@@ -177,6 +177,7 @@ module Cucumber
       def print_summary
         print_counts
         print_snippets(@options)
+        print_passing_wip(@options)
       end
 
     end

data/lib/cucumber/formatter/progress.rb

@@ -35,6 +35,7 @@ module Cucumber
         print_steps(:failed)
         print_counts
         print_snippets(@options)
+        print_passing_wip(@options)
       end
 
       CHARS = {

data/lib/cucumber/formatter/tag_cloud.rb

@@ -0,0 +1,27 @@
+module Cucumber
+  module Formatter
+    # Custom formatter that prints a tag cloud
+    class TagCloud < Cucumber::Ast::Visitor
+      def initialize(step_mother, io, options)
+        super(step_mother)
+        @io = io
+        @counts = Hash.new{|h,k| h[k] = 0}
+      end
+
+      def visit_features(features)
+        super
+        print_summary
+      end
+
+      def visit_tag_name(tag_name)
+        @counts[tag_name] += 1
+      end
+  
+      def print_summary
+        matrix = @counts.to_a.sort{|paira, pairb| paira[0] <=> pairb[0]}.transpose
+        table = Cucumber::Ast::Table.new(matrix)
+        Cucumber::Formatter::Pretty.new(@step_mother, @io, {}).visit_multiline_arg(table)
+      end
+    end
+  end
+end

data/lib/cucumber/languages.yml

@@ -43,6 +43,36 @@
   and: و
   but: لكن
   space_after_keyword: true
+"bg":
+  name: Bulgarian
+  native: български
+  encoding: UTF-8
+  feature: Функционалност
+  background: Предистория
+  scenario: Сценарий
+  scenario_outline: Рамка на сценарий
+  examples: Примери
+  given: Дадено
+  when: Когато
+  then: То
+  and: И
+  but: Но
+  space_after_keyword: true
+"cat":
+  name: Catalan
+  native: català
+  encoding: UTF-8
+  background: Rerefons
+  feature: Característica
+  scenario: Escenari
+  scenario_outline: Esquema de l\'escenari
+  examples: Exemples
+  given: Donat
+  when: Quan
+  then: Aleshores
+  and: I
+  but: Però
+  space_after_keyword: true
 "cy":
   name: Welsh
   native: Cymraeg
@@ -161,21 +191,6 @@
   and: Y
   but: Pero
   space_after_keyword: true
-"cat":
-  name: Catalan
-  native: català
-  encoding: UTF-8
-  background: Rerefons
-  feature: Característica
-  scenario: Escenari
-  scenario_outline: Esquema de l\'escenari
-  examples: Exemples
-  given: Donat
-  when: Quan
-  then: Aleshores
-  and: I
-  but: Però
-  space_after_keyword: true
 "et":
   name: Estonian
   native: eesti keel
@@ -296,6 +311,21 @@
   and: かつ
   but: しかし|但し
   space_after_keyword: false
+"ko":
+  name: Korean
+  native: 한국어
+  encoding: UTF-8
+  background: 배경
+  feature: 기능
+  scenario: 시나리오
+  scenario_outline: 시나리오 개요
+  examples: 예
+  given: 조건
+  when: 만일
+  then: 그러면
+  and: 그리고
+  but: 하지만
+  space_after_keyword: false
 "lt":
   name: Lithuanian
   native: lietuvių kalba
@@ -455,6 +485,21 @@
   and: A
   but: Ale
   space_after_keyword: true
+"vi":
+  name: Vietnamese
+  native: Tiếng Việt
+  encoding: UTF-8
+  feature: Tính năng
+  background: Bối cảnh
+  scenario: Tình huống|Kịch bản
+  scenario_outline: Khung tình huống|Khung kịch bản
+  examples: Dữ liệu
+  given: Biết|Cho
+  when: Khi
+  then: Thì
+  and: Và
+  but: Nhưng
+  space_after_keyword: true
 "zh-CN":
   name: Chinese simplified
   native: 简体中文
@@ -485,48 +530,3 @@
   and: 而且|並且
   but: 但是
   space_after_keyword: false
-"ko":
-  name: Korean
-  native: 한국어
-  encoding: UTF-8
-  background: 배경
-  feature: 기능
-  scenario: 시나리오
-  scenario_outline: 시나리오 개요
-  examples: 예
-  given: 조건
-  when: 만일
-  then: 그러면
-  and: 그리고
-  but: 하지만
-  space_after_keyword: false
-"bg":
-  name: Bulgarian
-  native: български
-  encoding: UTF-8
-  feature: Функционалност
-  background: Предистория
-  scenario: Сценарий
-  scenario_outline: Рамка на сценарий
-  examples: Примери
-  given: Дадено
-  when: Когато
-  then: То
-  and: И
-  but: Но
-  space_after_keyword: true
-"vi":
-  name: Vietnamese
-  native: Tiếng Việt
-  encoding: UTF-8
-  feature: Tính năng
-  background: Bối cảnh
-  scenario: Kịch bản
-  scenario_outline: Khung kịch bản
-  examples: Dữ liệu
-  given: Cho
-  when: Khi
-  then: Thì
-  and: Và
-  but: Nhưng
-  space_after_keyword: true

data/lib/cucumber/rails/world.rb

@@ -68,13 +68,26 @@ module Cucumber #:nodoc:
 
     def self.bypass_rescue
       ActionController::Base.class_eval do
+        alias_method :rescue_action_without_bypass, :rescue_action
+
         def rescue_action(exception)
           raise exception
         end
       end
-      ActionController::Dispatcher.class_eval do
-        def self.failsafe_response(output, status, exception = nil)
-          raise exception
+
+      begin
+        ActionController::Failsafe.class_eval do
+          alias_method :failsafe_response_without_bypass, :failsafe_response
+        
+          def failsafe_response(exception)
+            raise exception
+          end
+        end
+      rescue NameError # Failsafe was introduced in Rails 2.3.2
+        ActionController::Dispatcher.class_eval do
+          def self.failsafe_response(output, status, exception = nil)
+            raise exception
+          end
         end
       end
     end

data/lib/cucumber/rake/task.rb

@@ -135,7 +135,8 @@ module Cucumber
       attr_accessor :fork
 
       # Define what profile to be used.  When used with cucumber_opts it is simply appended to it. Will be ignored when CUCUMBER_OPTS is used.
-      def profile=(profile)
+      attr_accessor :profile
+      def profile=(profile) #:nodoc:
         @profile = profile
         unless feature_list
           # TODO: remove once we completely remove these from the rake task.
@@ -143,7 +144,6 @@ module Cucumber
           @feature_list = [] # Don't use accessor to avoid deprecation warning.
         end
       end
-      attr_reader :profile
 
       # Define Cucumber Rake task
       def initialize(task_name = "features", desc = "Run Features with Cucumber")

data/lib/cucumber/step_mother.rb

@@ -78,8 +78,16 @@ module Cucumber
         @tag_names.empty? || (@tag_names & tag_names).any?
       end
 
-      def execute_in(world, scenario, location)
-        world.cucumber_instance_exec(false, location, scenario, &@proc)
+      def execute_in(world, scenario, location, exception_fails_scenario = true)
+        begin
+          world.cucumber_instance_exec(false, location, scenario, &@proc)
+        rescue Exception => exception
+          if exception_fails_scenario
+            scenario.fail!(exception)
+          else
+            raise
+          end
+        end
       end
     end
 
@@ -143,6 +151,10 @@ module Cucumber
       register_hook(:after, tag_names, proc)
     end
 
+    def AfterStep(*tag_names, &proc)
+      register_hook(:after_step, tag_names, proc)
+    end
+
     def register_hook(phase, tags, proc)
       hook = Hook.new(tags, proc)
       hooks[phase] << hook
@@ -233,7 +245,9 @@ module Cucumber
 
     def before_and_after(scenario, skip=false)
       before(scenario) unless skip
-      yield
+      @current_scenario = scenario
+      yield scenario
+      @current_scenario = nil
       after(scenario) unless skip
       scenario_visited(scenario)
     end
@@ -249,7 +263,11 @@ module Cucumber
       execute_after(scenario)
       nil_world!
     end
-
+    
+    def after_step
+      execute_after_step(@current_scenario)
+    end
+    
     private
 
     def max_step_definition_length
@@ -323,6 +341,13 @@ module Cucumber
       end
     end
 
+    def execute_after_step(scenario)
+      return if options[:dry_run]
+      hooks_for(:after_step, scenario).each do |hook|
+        hook.execute_in(@current_world, scenario, 'AfterStep', false)
+      end
+    end
+
     def scenario_visited(scenario)
       scenarios << scenario unless scenarios.index(scenario)
     end

data/lib/cucumber/version.rb

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

data/rails_generators/feature/feature_generator.rb

@@ -1,4 +1,4 @@
-# This generator bootstraps a Rails project for use with Cucumber
+# This generator generates a baic feature.
 class FeatureGenerator < Rails::Generator::NamedBase
   def manifest
     record do |m|

data/spec/cucumber/cli/configuration_spec.rb

@@ -81,11 +81,8 @@ module Cli
           "/features/support/fooz.rb"
         ]
       end
-
-
     end
 
-
     it "should expand args from YAML file" do
       given_cucumber_yml_defined_as({'bongo' => '--require from/yml'})
 

data/spec/cucumber/formatter/color_io_spec.rb

@@ -1,4 +1,5 @@
 require File.dirname(__FILE__) + '/../../spec_helper'
+require 'cucumber/formatter/color_io'
 
 module Cucumber
   module Formatter

data/spec/cucumber/formatter/progress_spec.rb

@@ -1,4 +1,5 @@
 require File.dirname(__FILE__) + '/../../spec_helper'
+require 'cucumber/formatter/progress'
 
 module Cucumber
   module Formatter

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: cucumber
 version: !ruby/object:Gem::Version 
-  version: 0.3.5
+  version: 0.3.6
 platform: ruby
 authors: 
 - "Aslak Helles\xC3\xB8y"
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-05-15 00:00:00 +02:00
+date: 2009-05-20 00:00:00 +02:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -267,7 +267,6 @@ files:
 - 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
 - examples/self_test/features/tons_of_cukes.feature
 - examples/self_test/features/undefined_multiline_args.feature
 - examples/sinatra/Rakefile
@@ -315,6 +314,8 @@ files:
 - examples/watir/features/search.feature
 - examples/watir/features/step_definitons/search_steps.rb
 - examples/watir/features/support/env.rb
+- features/after_block_exceptions.feature
+- features/after_step_block_exceptions.feature
 - features/background.feature
 - features/cucumber_cli.feature
 - features/cucumber_cli_diff_disabled.feature
@@ -330,6 +331,7 @@ files:
 - features/step_definitions/extra_steps.rb
 - features/support/env.rb
 - features/usage.feature
+- features/work_in_progress.feature
 - gem_tasks/deployment.rake
 - gem_tasks/environment.rake
 - gem_tasks/features.rake
@@ -370,7 +372,6 @@ files:
 - lib/cucumber/core_ext/instance_exec.rb
 - lib/cucumber/core_ext/proc.rb
 - lib/cucumber/core_ext/string.rb
-- lib/cucumber/formatter.rb
 - lib/cucumber/formatter/ansicolor.rb
 - lib/cucumber/formatter/color_io.rb
 - lib/cucumber/formatter/console.rb
@@ -382,6 +383,7 @@ files:
 - lib/cucumber/formatter/profile.rb
 - lib/cucumber/formatter/progress.rb
 - lib/cucumber/formatter/rerun.rb
+- lib/cucumber/formatter/tag_cloud.rb
 - lib/cucumber/formatter/unicode.rb
 - lib/cucumber/formatter/usage.rb
 - lib/cucumber/formatters/unicode.rb

data/examples/self_test/features/support/tag_count_formatter.rb

@@ -1,25 +0,0 @@
-module Tag
-  # Custom formatter that reports occurrences of each tag
-  class Count < Cucumber::Ast::Visitor
-    def initialize(step_mother, io, options)
-      super(step_mother)
-      @io = io
-      @counts = Hash.new{|h,k| h[k] = 0}
-    end
-
-    def visit_features(features)
-      super
-      print_summary
-    end
-
-    def visit_tag_name(tag_name)
-      @counts[tag_name] += 1
-    end
-    
-    def print_summary
-      matrix = @counts.to_a.sort{|paira, pairb| paira[0] <=> pairb[0]}.transpose
-      table = Cucumber::Ast::Table.new(matrix)
-      Cucumber::Formatter::Pretty.new(@step_mother, @io, {}).visit_multiline_arg(table)
-    end
-  end
-end

data/lib/cucumber/formatter.rb

@@ -1 +0,0 @@
-%w{color_io pretty progress profile rerun html usage junit}.each{|n| require "cucumber/formatter/#{n}"}