more work on html, some cleanup and added a simple workaround for old…

… skool steps_for

examples/simple/division.story

@@ -0,0 +1,17 @@
+Story: Division
+  As a math genius 
+  I want to be told the division of two floats
+  So that I don't make silly mistakes
+
+  Scenario: 7/2
+    Given I have entered 3
+    And I have entered 2
+    When I divide
+    Then the result should be 2.5
+    And the result class should be Float
+
+  Scenario: 3/0
+    Given I have entered 3
+    And I have entered 2
+    When I divide
+    Then the result should be NaN

examples/simple/steps/addition_steps.rb

@@ -8,7 +8,10 @@ def push(n)
 
   def add
     @args.inject(0){|n,sum| sum+=n}
-    raise "yo"
+  end
+
+  def divide
+    @args[0].to_f / @args[1].to_f
   end
 end
 
@@ -23,8 +26,14 @@ def add
   @calc.push n.to_i
 end
 
-When 'I add' do
-  @result = @calc.add
+steps_for(:old_skool_works_too) do
+  When 'I add' do
+    @result = @calc.add
+  end
+end
+
+When 'I divide' do
+  @result = @calc.divide
 end
 
 Then /the result should be (\d*)/ do |result|

lib/cucumber/executor.rb

@@ -74,6 +74,7 @@ def register_step_proc(key, &proc)
     def visit_stories(stories)
       @formatter.visit_stories(stories) if @formatter.respond_to?(:visit_stories)
       stories.accept(self)
+      @formatter.dump
     end
 
     def visit_story(story)
@@ -87,27 +88,30 @@ def visit_narrative(narrative)
     end
 
     def visit_scenario(scenario)
+      @error = nil
       @context = Object.new
       @before_procs.each{|p| p.call_in(@context, *[])}
       scenario.accept(self)
       @after_procs.each{|p| p.call_in(@context, *[])}
-      @formatter.dump
     end
 
     def visit_step(step)
-      return if @error
-      proc, args = find_step_proc(step.name)
-      begin
-        proc.call_in(@context, *args)
-      rescue ArgCountError => e
-        e.backtrace[0] = proc.backtrace_line
-        strip_pos = e.backtrace.index("#{__FILE__}:#{__LINE__-3}:in `visit_step'")
-        format_error(proc, strip_pos, step, e)
-      rescue => e
-        strip_pos = e.backtrace.index("#{__FILE__}:#{__LINE__-6}:in `visit_step'") - (Pending === e ? 3 : 2)
-        format_error(proc, strip_pos, step, e)
+      if @error.nil?
+        proc, args = find_step_proc(step.name)
+        begin
+          proc.call_in(@context, *args)
+        rescue ArgCountError => e
+          e.backtrace[0] = proc.backtrace_line
+          strip_pos = e.backtrace.index("#{__FILE__}:#{__LINE__-3}:in `visit_step'")
+          format_error(proc, strip_pos, step, e)
+        rescue => e
+          strip_pos = e.backtrace.index("#{__FILE__}:#{__LINE__-6}:in `visit_step'") - (Pending === e ? 3 : 2)
+          format_error(proc, strip_pos, step, e)
+        end
+        @formatter.step_executed(step)
+      else
+        @formatter.step_skipped(step)
       end
-      @formatter.step_executed(step)
     end
 
     def find_step_proc(name)

lib/cucumber/progress_formatter.rb

@@ -19,6 +19,10 @@ def step_executed(step)
       end
     end
 
+    def step_skipped(step)
+      @io.write('~')
+    end
+
     def dump
       @io.puts
       @errors.each_with_index do |error,n|

lib/cucumber/step_methods.rb

@@ -19,5 +19,10 @@ def When(key, &proc)
     def Then(key, &proc)
       $executor.register_step_proc(key, &proc)
     end
+
+    # Simple workaround for old skool steps
+    def steps_for(*_)
+      yield
+    end
   end
 end

spec/cucumber/executor_spec.rb

@@ -6,8 +6,8 @@ module Cucumber
   describe Executor do
     before do # TODO: Way more setup and duplication of lib code. Use lib code!
       @io = StringIO.new
-      f = ProgressFormatter.new(@io)
-      @r = Executor.new(f)
+      @f = ProgressFormatter.new(@io)
+      @r = Executor.new(@f)
       @story_file = File.dirname(__FILE__) + '/sell_cucumbers.story'
       parser = Parser::StoryParser.new
       @story = parser.parse(IO.read(@story_file))
@@ -19,6 +19,7 @@ module Cucumber
       @r.register_step_proc(/I sell (\d*) cucumbers/)        { |n| @n -= n.to_i }
       @r.register_step_proc(/I should owe (\d*) cucumbers/)  { |n| @n.should == -n.to_i }
       @story.accept(@r)
+      @f.dump
       @io.string.should == "...\n"
     end
 
@@ -27,12 +28,13 @@ module Cucumber
       @r.register_step_proc(/I sell (\d*) cucumbers/)        { |n| @n = n }
       @r.register_step_proc(/I should owe (\d*) cucumbers/) { |n| raise "dang" }
       @story.accept(@r)
+      @f.dump
       @io.string.should == <<-STDOUT
 ..F
 
 1)
 dang
-#{__FILE__}:28:in `Then /I should owe (\\d*) cucumbers/'
+#{__FILE__}:29:in `Then /I should owe (\\d*) cucumbers/'
 #{@story_file}:9:in `Then I should owe 7 cucumbers'
 STDOUT
     end

spec/cucumber/sell_cucumbers.story

@@ -1,9 +1,9 @@
-Story: Sell cucumbers
-  As a cucumber farmer 
-  I want to sell cucumbers 
-  So that I buy meat
-
-  Scenario: Sell a dozen
-    Given there are 5 cucumbers
-    When I sell 12 cucumbers
-    Then I should owe 7 cucumbers
+Story: Sell cucumbers
+  As a cucumber farmer
+  I want to sell cucumbers
+  So that I buy meat
+
+  Scenario: Sell a dozen
+    Given there are 5 cucumbers
+    When I sell 12 cucumbers
+    Then I should owe 7 cucumbers

spec/cucumber/visitors/html_formatter_spec.rb

@@ -5,10 +5,11 @@
 module Cucumber
   module Visitors
     describe HtmlFormatter do
+      SIMPLE_DIR = File.dirname(__FILE__) + '/../../../examples/simple'
+
       before do
-        f = File.dirname(__FILE__) + '/../sell_cucumbers.story'
         p = Parser::StoryParser.new
-        @stories = Stories.new([f], p)
+        @stories = Stories.new(Dir["#{SIMPLE_DIR}/*.story"], p)
         @io = StringIO.new
         @formatter = HtmlFormatter.new(@io)
         @executor = Executor.new(@formatter)
@@ -17,7 +18,7 @@ module Visitors
       it "should render HTML" do
         @executor.visit_stories(@stories)
         expected_stories = File.dirname(__FILE__) + '/stories.html'
-        # File.open(expected_stories, 'w') {|io| io.write(@io.string)}
+        File.open(expected_stories, 'w') {|io| io.write(@io.string)}
         @io.string.should == IO.read(expected_stories)
       end
     end