Tweaks to the output

lib/cucumber/formatters/pretty_formatter.rb

@@ -114,8 +114,7 @@ def print_snippets
           prev_keyword = nil
           snippets = @pending.map do |step|
             next if step.row?
-            keyword = step.keyword == Cucumber.language['and'] ? prev_keyword : step.keyword
-            snippet = "#{keyword} /#{step.name}/ do\nend\n\n"
+            snippet = "#{step.actual_keyword} /#{step.name}/ do\nend\n\n"
             prev_keyword = step.keyword
             snippet
           end.compact.uniq

lib/cucumber/rails/world.rb

@@ -49,6 +49,7 @@ def initialize #:nodoc:
   Before do
     ActiveRecord::Base.send :increment_open_transactions
     ActiveRecord::Base.connection.begin_db_transaction
+    ActionMailer::Base.deliveries = [] if defined?(ActionMailer::Base)
   end
 
   After do

lib/cucumber/tree/scenario.rb

@@ -14,6 +14,12 @@ def accept(visitor)
       def at_line?(l)
         line == l || steps.map{|s| s.line}.index(l)
       end
+
+      def previous_step(step)
+        i = steps.index(step)
+        raise "Couldn't find #{step} among #{steps}" if i.nil?
+        steps[i-1]
+      end
     end
 
     class Scenario < BaseScenario

lib/cucumber/tree/step.rb

@@ -88,6 +88,14 @@ def format_error(strip_pos, e)
       def id
         @id ||= self.class.new_id!
       end
+
+      def actual_keyword
+        keyword == Cucumber.language['and'] ? previous_step.actual_keyword : keyword
+      end
+
+      def previous_step
+        @scenario.previous_step(self)
+      end
     end
 
     class Step < BaseStep