cucumber 0.1.12 → 0.1.13

data/lib/cucumber/version.rb

@@ -2,7 +2,7 @@ module Cucumber #:nodoc:
   class VERSION #:nodoc:
     MAJOR = 0
     MINOR = 1
-    TINY  = 12
+    TINY  = 13
 
     STRING = [MAJOR, MINOR, TINY].join('.')
   end

data/lib/cucumber/world.rb

@@ -0,0 +1 @@
+%w{pending}.each{|f| require "cucumber/world/#{f}"}

data/lib/cucumber/world/pending.rb

@@ -0,0 +1,22 @@
+module Cucumber
+  module World
+    module Pending
+
+      ##
+      # Mark this step as pending
+      def pending(message = "TODO")
+        if block_given?
+          begin
+            yield
+          rescue Exception => e
+            raise Cucumber::ForcedPending.new(message)
+          end
+          raise Cucumber::ForcedPending.new("Expected pending '#{message}' to fail. No Error was raised.")
+        else
+          raise Cucumber::ForcedPending.new(message)
+        end
+      end
+
+    end
+  end
+end

data/rails_generators/cucumber/templates/env.rb

@@ -2,6 +2,7 @@
 ENV["RAILS_ENV"] = "test"
 require File.expand_path(File.dirname(__FILE__) + '/../../config/environment')
 require 'cucumber/rails/world'
+require 'cucumber/formatters/unicode' # Comment out this line if you don't want Cucumber Unicode support
 Cucumber::Rails.use_transactional_fixtures
 
 require 'webrat/rails'

data/rails_generators/feature/feature_generator.rb

@@ -8,9 +8,29 @@ class FeatureGenerator < Rails::Generator::NamedBase
     end
   end
 
-protected
+  class NamedArg
+    attr_reader :name
+
+    def initialize(s)
+      @name, @type = *s.split(':')
+    end
+
+    def value(n)
+      if @type == 'boolean'
+        (n % 2) == 0
+      else
+        "#{@name} #{n}"
+      end
+    end
+  end
+
+  def named_args
+    args.map{|arg| NamedArg.new(arg)}
+  end
+
+  protected
 
   def banner
     "Usage: #{$0} feature ModelName [field:type, field:type]"
   end
-end
+end

data/rails_generators/feature/templates/feature.erb

@@ -6,23 +6,26 @@ Feature: Manage <%= plural_name %>
   Scenario: Register new <%= singular_name %>
     Given I am on the new <%= singular_name %> page
 <% keyword = 'When' -%>
-<% args.each do |arg| -%>
-    <%= keyword %> I fill in "<%= arg.humanize %>" with "My <%= singular_name %> <%= arg %>"
+<% named_args.each do |arg| -%>
+    <%= keyword %> I fill in "<%= arg.name.humanize %>" with "<%= arg.value(1) %>"
 <% keyword = 'And' -%>
 <% end -%>
     And I press "Create"
 <% keyword = 'Then' -%>
-<% args.each do |arg| -%>
-    <%= keyword %> I should see "My <%= singular_name %> <%= arg %>"
+<% named_args.each do |arg| -%>
+    <%= keyword %> I should see "<%= arg.value(1) %>"
 <% keyword = 'And' -%>
 <% end -%>
 
   Scenario: Delete <%= singular_name %>
-    Given there are 4 <%= plural_name %>
-    When I delete the first <%= singular_name %>
-    Then there should be 3 <%= plural_name %> left
-    
-  More Examples:
-    | initial | after |
-    | 100     | 99    |
-    | 1       | 0     |
+    Given the following <%= plural_name %>:
+      |<%= named_args.map(&:name).join('|') %>|
+<% (1..4).each do |n| -%>
+      |<%= named_args.map{|arg| arg.value(n)}.join('|') %>|
+<% end -%>
+    When I delete the 3rd <%= singular_name %>
+    Then I should see the following <%= plural_name %>:
+      |<%= named_args.map(&:name).join('|') %>|
+<% [1,2,4].each do |n| -%>
+      |<%= named_args.map{|arg| arg.value(n)}.join('|') %>|
+<% end -%>

data/rails_generators/feature/templates/steps.erb

@@ -1,22 +1,24 @@
 Given /I am on the new <%= singular_name %> page/ do
-  visits "/<%= plural_name %>/new"
+  visit "/<%= plural_name %>/new"
 end
 
-Given /there are (\d+) <%= plural_name %>/ do |n|
-  <%= class_name %>.transaction do
-    <%= class_name %>.destroy_all
-    n.to_i.times do |n|
-      <%= class_name %>.create! :name => "<%= class_name %> #{n}"
-    end
-  end
+Given /^the following <%= plural_name %>:$/ do |<%= plural_name %>|
+  <%= class_name %>.create!(<%= plural_name %>.hashes)
 end
 
-When /I delete the first <%= singular_name %>/ do
-  visits <%= plural_name %>_url
-  clicks_link "Destroy"
+When /^I delete the (\d+)(?:st|nd|rd|th) <%= singular_name %>$/ do |pos|
+  visit <%= plural_name %>_url
+  within("table > tr:nth-child(#{pos.to_i+1})") do
+    click_link "Destroy"
+  end
 end
 
-Then /there should be (\d+) <%= plural_name %> left/ do |n|
-  <%= class_name %>.count.should == n.to_i
-  response.should have_tag("table tr", n.to_i + 1) # There is a header row too
+Then /^I should see the following <%= plural_name %>:$/ do |<%= plural_name %>|
+  <%= plural_name %>.raw[1..-1].each_with_index do |row, i|
+    row.each_with_index do |cell, j|
+      response.should have_selector("table > tr:nth-child(#{i+2}) > td:nth-child(#{j+1})") { |td|
+        td.inner_text.should == cell
+      }
+    end
+  end
 end

data/spec/cucumber/cli_spec.rb

@@ -17,12 +17,12 @@ module Cucumber
     end
     
     before(:each) do
-      Kernel.stub!(:exit)
+      Kernel.stub!(:exit).and_return(nil)
     end
     
-    def given_cucumber_yml_defined_as(hash)
+    def given_cucumber_yml_defined_as(hash_or_string)
       File.stub!(:exist?).and_return(true)
-      cucumber_yml = hash.to_yaml
+      cucumber_yml = hash_or_string.is_a?(Hash) ? hash_or_string.to_yaml : hash_or_string
       IO.stub!(:read).with('cucumber.yml').and_return(cucumber_yml)
     end
     
@@ -73,6 +73,18 @@ Defined profiles in cucumber.yml:
       error.string.should == "Profiles must be defined as a String.  The 'foo' profile was [1, 2, 3] (Array).\n"
     end
     
+    it "should provide a helpful error message when a specified profile exists but is nil or blank" do
+      [nil, '   '].each do |bad_input|
+        cli = CLI.new(StringIO.new, error = StringIO.new)
+
+        given_cucumber_yml_defined_as({'foo' => bad_input})
+
+        cli.parse_options!(%w{--profile foo})
+
+        error.string.should match(/The 'foo' profile in cucumber.yml was blank.  Please define the command line arguments for the 'foo' profile in cucumber.yml./)
+      end
+    end
+
     it "should provide a helpful error message when no YAML file exists and a profile is specified" do
       cli = CLI.new(StringIO.new, error = StringIO.new)
       
@@ -80,7 +92,32 @@ Defined profiles in cucumber.yml:
     
       cli.parse_options!(%w{--profile i_do_not_exist})
         
-      error.string.should match(/cucumber.yml was not found.  Please define your 'i_do_not_exist' and other profiles in cucumber.yml./)
+      error.string.should match(/cucumber.yml was not found.  Please refer to cucumber's documentaion on defining profiles in cucumber.yml./)
+    end
+
+    it "should provide a helpful error message when cucumber.yml is blank or malformed" do
+        expected_error_message = /cucumber.yml was found, but was blank or malformed. Please refer to cucumber's documentaion on correct profile usage./
+          
+      ['', 'sfsadfs', "--- \n- an\n- array\n", "---dddfd"].each do |bad_input|
+        cli = CLI.new(StringIO.new, error = StringIO.new)
+      
+        given_cucumber_yml_defined_as(bad_input)
+        cli.parse_options!([])
+        
+        error.string.should match(expected_error_message)
+      end
+    end
+    
+    it "should procide a helpful error message when the YAML can not be parsed" do
+        expected_error_message = /cucumber.yml was found, but could not be parsed. Please refer to cucumber's documentaion on correct profile usage./
+      cli = CLI.new(StringIO.new, error = StringIO.new)
+      
+      given_cucumber_yml_defined_as("input that causes an exception in YAML loading")
+      YAML.should_receive(:load).and_raise Exception
+      
+      cli.parse_options!([])
+      
+      error.string.should match(expected_error_message)
     end
 
     it "should accept --no-source option" do
@@ -112,6 +149,21 @@ Defined profiles in cucumber.yml:
       cli.options[:verbose].should be_true
     end
 
+    it "should require files in support paths first" do
+      File.stub!(:directory?).and_return(true)
+      Dir.stub!(:[]).and_return(["/features/step_definitions/foo.rb","/features/support/env.rb"])
+      
+      cli = CLI.new(StringIO.new)
+      cli.parse_options!(%w{--require /features})
+
+      cli.should_receive(:require).twice.with(/treetop_parser/).ordered
+      cli.should_receive(:require).with("/features/support/env.rb").ordered
+      cli.should_receive(:require).with("/features/step_definitions/foo.rb").ordered
+      cli.should_receive(:require).with("spec/expectations/differs/default").ordered
+
+      cli.execute!(stub('step mother'), mock_executor, mock_features)
+    end
+
     describe "verbose mode" do
       
       before(:each) do
@@ -384,6 +436,36 @@ Defined profiles in cucumber.yml:
       cli.execute!(stub('step mother'), mock_executor, stub('features'))
     end
 
+    describe "--backtrace" do
+      before do
+        Exception.cucumber_full_backtrace = false
+      end
+      
+      it "should show full backtrace when --backtrace is present" do
+        cli = CLI.new
+        cli.parse_options!(['--backtrace'])
+        begin
+          "x".should == "y"
+        rescue => e
+          e.cucumber_backtrace[0].should_not == "#{__FILE__}:#{__LINE__ - 2}"
+        end
+      end
+
+      it "should strip gems when --backtrace is absent" do
+        cli = CLI.new
+        cli.parse_options!(['--'])
+        begin
+          "x".should == "y"
+        rescue => e
+          e.cucumber_backtrace[0].should == "#{__FILE__}:#{__LINE__ - 2}"
+        end
+      end
+
+      after do
+        Exception.cucumber_full_backtrace = false
+      end
+    end
+
     describe "example.feature:line file arguments" do
 
       it "should extract line numbers" do
@@ -413,8 +495,7 @@ Defined profiles in cucumber.yml:
       
         cli.options[:lines_for_features].should == {'example.feature' => [11, 12]}
       end
-    
-  end
+    end
 
     it "should search for all features in the specified directory" do
       cli = CLI.new

data/spec/cucumber/executor_spec.rb

@@ -10,10 +10,24 @@ module Cucumber
         :name => 'test', 
         :accept => nil, 
         :steps => [],
-        :pending? => true
+        :pending? => true,
+        :outline? => false,
       }.merge(stubs))
     end
     
+    def parse_features(feature_file)
+      parser = TreetopParser::FeatureParser.new
+      feature = parser.parse_feature(feature_file)
+    end
+
+    before do
+      ::Term::ANSIColor.coloring = false
+    end
+
+    after do
+      ::Term::ANSIColor.coloring = true
+    end
+
     before do # TODO: Way more setup and duplication of lib code. Use lib code!
       @io = StringIO.new
       @step_mother = StepMother.new
@@ -21,9 +35,8 @@ module Cucumber
       @formatters = Broadcaster.new [Formatters::ProgressFormatter.new(@io)]
       @executor.formatters = @formatters
       @feature_file = File.dirname(__FILE__) + '/sell_cucumbers.feature'
-      @parser = TreetopParser::FeatureParser.new
-      @features = Tree::Features.new
-      @feature = @parser.parse_feature(@feature_file)
+      @features = features = Tree::Features.new
+      @feature = parse_features(@feature_file)
       @features << @feature
     end
     
@@ -46,7 +59,7 @@ module Cucumber
 
 1)
 dang
-#{__FILE__}:43:in `Then /I should owe (\\d*) cucumbers/'
+#{__FILE__}:56:in `Then /I should owe (\\d*) cucumbers/'
 #{@feature_file}:9:in `Then I should owe 7 cucumbers'
 })
     end
@@ -75,6 +88,13 @@ dang
         world.doit.should == "dunit"
         world.beatit.should == "beatenit"
       end
+      
+      it "should add support for calling 'pending' from world" do
+        world = @executor.create_world
+      
+        world.should respond_to(:pending)
+      end
+      
     end
 
     describe "visiting feature" do
@@ -162,6 +182,54 @@ dang
       end
       
     end
+    
+    describe "visiting step outline" do
+        
+      it "should trace step" do
+        mock_formatter = mock('formatter')
+        @executor.formatters = mock_formatter
+        mock_step_outline = mock('step outline', :regexp_args_proc => [])
+ 
+        mock_formatter.should_receive(:step_traced)
+        
+        @executor.visit_step_outline(mock_step_outline)
+      end
+      
+    end
+    
+    describe "visit forced pending step" do
+
+      before(:each) do
+        @executor.formatters = mock('formatter', :null_object => true)          
+      end
+
+      it "should store the pending exception with the step" do
+        mock_step = mock("mock step", :regexp_args_proc => nil)
+        pending_exception = ForcedPending.new("implement me")
+        mock_step.stub!(:execute_in).and_raise(pending_exception)
+
+        mock_step.should_receive(:'error=').with(pending_exception)
+        
+        @executor.visit_step(mock_step)
+      end
+      
+      describe "after failed/pending step" do
+        
+        it "should store the pending exception with the step" do
+          mock_step_1 = mock("mock step", :null_object => true)
+          mock_step_2 = mock("mock step", :regexp_args_proc => nil)
+          pending_exception = ForcedPending.new("implement me")
+          mock_step_1.stub!(:execute_in).and_raise(StandardError)
+          mock_step_2.stub!(:execute_in).and_raise(pending_exception)
+
+          mock_step_2.should_receive(:'error=').with(pending_exception)
+
+          @executor.visit_step(mock_step_1)
+          @executor.visit_step(mock_step_2)
+        end
+        
+      end
+    end
               
     describe "visiting row scenarios" do
       
@@ -175,40 +243,44 @@ dang
         }.merge(stubs))
       end
 
-      describe "without having first run the matching regular scenario" do
-      
+      %w{regular_scenario scenario_outline}.each do |regular_or_outline|
+
         before(:each) do
-          @regular_scenario = Tree::Scenario.new(nil, 'test', 1)
+          @scenario = mock("#{regular_or_outline} scenario", :name => 'test', :at_line? => true, :pending? => false, :accept => nil)
+
           @executor.lines_for_features = Hash.new([5])
-          @executor.visit_regular_scenario(@regular_scenario)
+          @executor.send("visit_#{regular_or_outline}".to_sym, @scenario)
         end
+
+        describe "without having first run the matching #{regular_or_outline}" do
         
-        it "should run the regular scenario before the row scenario" do
-          @regular_scenario.should_receive(:accept)
-          row_scenario = mock_row_scenario(:name => 'test', :at_line? => true)
-          row_scenario.should_receive(:accept)
-          @executor.visit_row_scenario(row_scenario)
-        end
+            it "should run the #{regular_or_outline} before the row scenario" do
+              @scenario.should_receive(:accept)
+              row_scenario = mock_row_scenario(:name => 'test', :at_line? => true)
+              row_scenario.should_receive(:accept)
 
-        it "should run the row scenario after running the regular scenario" do
-          row_scenario = mock_row_scenario(:at_line? => true)
-          row_scenario.should_receive(:accept)
-          @executor.visit_row_scenario(row_scenario)
-        end
-      
-      end
+              @executor.visit_row_scenario(row_scenario)
+            end
+
+            it "should run the row scenario after running the #{regular_or_outline}" do
+              row_scenario = mock_row_scenario(:at_line? => true)
+              row_scenario.should_receive(:accept)
+              @scenario.stub!(:accept)
 
-      describe "having run matching regular scenario" do
+              @executor.visit_row_scenario(row_scenario)
+            end
       
-        it "should not run the regular scenario if it has already run" do
-          scenario = Tree::Scenario.new(nil, 'test', 1)
-          @executor.visit_regular_scenario(scenario)
+        end
 
-          scenario.should_not_receive(:accept)
+        describe "having run matching #{regular_or_outline}" do
+      
+          it "should not run the regular scenario if it has already run" do
+            @scenario.should_not_receive(:accept)
 
-          @executor.visit_row_scenario(mock_row_scenario(:name => 'test', :at_line? => true, :accept => nil))
-        end
+            @executor.visit_row_scenario(mock_row_scenario(:name => 'test', :at_line? => true, :accept => nil))
+          end
       
+        end
       end
     end
     
@@ -293,6 +365,6 @@ dang
         @executor.visit_features(@features)
       end
     end
-        
+
   end
 end