kosmas58-cucumber 0.2.0.1 → 0.2.2.1

data/lib/cucumber/step_definition.rb

@@ -3,6 +3,50 @@ require 'cucumber/core_ext/string'
 require 'cucumber/core_ext/proc'
 
 module Cucumber
+  module StepDefinitionMethods
+    def step_match(name_to_match, name_to_report)
+      if(match = name_to_match.match(regexp))
+        StepMatch.new(self, name_to_match, name_to_report, match.captures)
+      else
+        nil
+      end
+    end
+
+    # Formats the matched arguments of the associated Step. This method
+    # is usually called from visitors, which render output.
+    #
+    # The +format+ can either be a String or a Proc.
+    #
+    # If it is a String it should be a format string according to
+    # <tt>Kernel#sprinf</tt>, for example:
+    #
+    #   '<span class="param">%s</span></tt>'
+    #
+    # If it is a Proc, it should take one argument and return the formatted
+    # argument, for example:
+    #
+    #   lambda { |param| "[#{param}]" }
+    #
+    def format_args(step_name, format)
+      step_name.gzub(regexp, format)
+    end
+
+    def match(step_name)
+      case step_name
+      when String then regexp.match(step_name)
+      when Regexp then regexp == step_name
+      end
+    end
+
+    def backtrace_line
+      "#{file_colon_line}:in `#{regexp.inspect}'"
+    end
+
+    def text_length
+      regexp.inspect.jlength
+    end
+  end
+  
   # A Step Definition holds a Regexp and a Proc, and is created
   # by calling <tt>Given</tt>, <tt>When</tt> or <tt>Then</tt>
   # in the <tt>step_definitions</tt> ruby files - for example:
@@ -14,7 +58,22 @@ module Cucumber
   class StepDefinition
     def self.snippet_text(step_keyword, step_name)
       escaped = Regexp.escape(step_name).gsub('\ ', ' ').gsub('/', '\/')
-      "#{step_keyword} /^#{escaped}$/ do\n  pending\nend"
+      param_pattern = /"([^\"]*)"/
+
+      match = escaped.match(param_pattern)
+      if match
+        n = 0
+        block_args = match.captures.map do |a|
+          n += 1
+          "arg#{n}"
+        end
+        block_arg_string = " |#{block_args.join(", ")}|"
+      else
+        block_arg_string = ""
+      end
+
+      escaped = escaped.gsub(param_pattern, '"([^\\"]*)"')
+      "#{step_keyword} /^#{escaped}$/ do#{block_arg_string}\n  pending\nend"
     end
 
     class MissingProc < StandardError
@@ -23,7 +82,7 @@ module Cucumber
       end
     end
 
-    attr_reader :regexp
+    include StepDefinitionMethods
 
     def initialize(pattern, &proc)
       raise MissingProc if proc.nil?
@@ -34,70 +93,22 @@ module Cucumber
       @regexp, @proc = pattern, proc
     end
 
-    def step_match(name_to_match, name_to_report)
-      if(match = name_to_match.match(@regexp))
-        StepMatch.new(self, name_to_match, name_to_report, match.captures)
-      else
-        nil
-      end
+    def regexp
+      @regexp
     end
 
-    def invoke(world, args, step_name)
+    def invoke(world, args)
       args = args.map{|arg| Ast::PyString === arg ? arg.to_s : arg}
       begin
-        world.cucumber_instance_exec(true, @regexp.inspect, *args, &@proc)
+        world.cucumber_instance_exec(true, regexp.inspect, *args, &@proc)
       rescue Cucumber::ArityMismatchError => e
         e.backtrace.unshift(self.backtrace_line)
         raise e
       end
     end
 
-    #:stopdoc:
-
-    def match(step_name)
-      case step_name
-      when String then @regexp.match(step_name)
-      when Regexp then @regexp == step_name
-      end
-    end
-
-    # Formats the matched arguments of the associated Step. This method
-    # is usually called from visitors, which render output.
-    #
-    # The +format+ can either be a String or a Proc.
-    #
-    # If it is a String it should be a format string according to
-    # <tt>Kernel#sprinf</tt>, for example:
-    #
-    #   '<span class="param">%s</span></tt>'
-    #
-    # If it is a Proc, it should take one argument and return the formatted
-    # argument, for example:
-    #
-    #   lambda { |param| "[#{param}]" }
-    #
-    def format_args(step_name, format)
-      step_name.gzub(@regexp, format)
-    end
-
-    def matched_args(step_name)
-      step_name.match(@regexp).captures
-    end
-
-    def backtrace_line
-      "#{file_colon_line}:in `#{@regexp.inspect}'"
-    end
-
     def file_colon_line
       @proc.file_colon_line
     end
-
-    def text_length
-      @regexp.inspect.jlength
-    end
-
-    def to_s(indent = 0)
-      @regexp.inspect + (' # ').indent(indent) + file_colon_line
-    end
   end
 end

data/lib/cucumber/step_match.rb

@@ -10,10 +10,10 @@ module Cucumber
     def invoke(world, multiline_arg)
       all_args = @args.dup
       all_args << multiline_arg if multiline_arg
-      @step_definition.invoke(world, all_args, @step_name)
+      @step_definition.invoke(world, all_args)
     end
 
-    def format_args(format)
+    def format_args(format = lambda{|a| a})
       @formatted_step_name || @step_definition.format_args(@step_name, format)
     end
     
@@ -24,6 +24,10 @@ module Cucumber
     def backtrace_line
       @step_definition.backtrace_line
     end
+
+    def text_length
+      @step_definition.text_length
+    end
   end
   
   class NoStepMatch
@@ -45,5 +49,9 @@ module Cucumber
     def backtrace_line
       @step.backtrace_line
     end
+
+    def text_length
+      @step.text_length
+    end
   end
 end

data/lib/cucumber/step_mother.rb

@@ -26,10 +26,11 @@ module Cucumber
 
   # Raised when a step matches 2 or more StepDefinition
   class Ambiguous < StandardError
-    def initialize(step_name, step_definitions)
+    def initialize(step_name, step_definitions, used_guess)
       message = "Ambiguous match of \"#{step_name}\":\n\n"
       message << step_definitions.map{|sd| sd.backtrace_line}.join("\n")
       message << "\n\n"
+      message << "You can run again with --guess to make Cucumber be more smart about it\n" unless used_guess
       super(message)
     end
   end
@@ -101,7 +102,7 @@ module Cucumber
     end
 
     def After(&proc)
-      (@after_procs ||= []) << proc
+      (@after_procs ||= []).unshift(proc)
     end
 
     # Registers a World proc. You can call this method as many times as you
@@ -118,7 +119,7 @@ module Cucumber
       matches = step_definitions.map { |d| d.step_match(step_name, formatted_step_name) }.compact
       raise Undefined.new(step_name) if matches.empty?
       matches = best_matches(step_name, matches) if matches.size > 1 && options[:guess]
-      raise Ambiguous.new(step_name, matches) if matches.size > 1
+      raise Ambiguous.new(step_name, matches, options[:guess]) if matches.size > 1
       matches[0]
     end
 
@@ -141,13 +142,6 @@ module Cucumber
     def snippet_text(step_keyword, step_name)
       @snippet_generator.snippet_text(step_keyword, step_name)
     end
-    
-    def print_step_definitions(out)
-      step_definitions.each do |step_definition|
-        indent = max_step_definition_length - step_definition.text_length
-        out.puts(step_definition.to_s(indent))
-      end
-    end
 
     def before_and_after(scenario, skip=false)
       unless current_world || skip

data/lib/cucumber/version.rb

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

data/rails_generators/cucumber/templates/env.rb

@@ -4,6 +4,8 @@ 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
+Cucumber::Rails.bypass_rescue # Comment out this line if you want Rails own error handling 
+                              # (e.g. rescue_action_in_public / rescue_responses / rescue_from)
 
 require 'webrat'
 

data/rails_generators/feature/templates/steps.erb

@@ -10,7 +10,7 @@ When /^I delete the (\d+)(?:st|nd|rd|th) <%= singular_name %>$/ do |pos|
 end
 
 Then /^I should see the following <%= plural_name %>:$/ do |<%= plural_name %>|
-  <%= plural_name %>.raw[1..-1].each_with_index do |row, i|
+  <%= plural_name %>.rows.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

data/spec/cucumber/ast/feature_spec.rb

@@ -9,7 +9,8 @@ module Cucumber
       it "should convert to sexp" do
         feature = create_feature(Object.new)
         feature.to_sexp.should == 
-        [:feature, 
+        [:feature,
+          "features/pretty_printing.feature",
           "Pretty printing", 
           [:comment, "# My feature comment\n"], 
           [:tag, "one"], 

data/spec/cucumber/cli/configuration_spec.rb

@@ -18,7 +18,7 @@ module Cli
     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/bar.rb"])
-      
+
       config = Configuration.new(StringIO.new)
       config.parse!(%w{--require /features})
 
@@ -31,7 +31,7 @@ module Cli
     it "should require env.rb files first" do
       File.stub!(:directory?).and_return(true)
       Dir.stub!(:[]).and_return(["/features/support/a_file.rb","/features/support/env.rb"])
-      
+
       config = Configuration.new(StringIO.new)
       config.parse!(%w{--require /features})
 
@@ -40,7 +40,19 @@ module Cli
         "/features/support/a_file.rb"
       ]
     end
-    
+
+    it "should not require env.rb files when --dry-run" do
+      File.stub!(:directory?).and_return(true)
+      Dir.stub!(:[]).and_return(["/features/support/a_file.rb","/features/support/env.rb"])
+
+      config = Configuration.new(StringIO.new)
+      config.parse!(%w{--require /features --dry-run})
+
+      config.files_to_require.should == [
+        "/features/support/a_file.rb"
+      ]
+    end
+
     it "should expand args from YAML file" do
       given_cucumber_yml_defined_as({'bongo' => '--require from/yml'})
 
@@ -101,11 +113,11 @@ END_OF_MESSAGE
       config = Configuration.new(StringIO.new, error = StringIO.new)
       config.parse!(%w{--profile i_do_not_exist})
 
-      error.string.should match(/cucumber.yml was not found.  Please refer to cucumber's documentaion on defining profiles in cucumber.yml./)
+      error.string.should match(/cucumber.yml was not found.  Please refer to cucumber's documentation 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./
+        expected_error_message = /cucumber.yml was found, but was blank or malformed. Please refer to cucumber's documentation on correct profile usage./
 
       ['', 'sfsadfs', "--- \n- an\n- array\n", "---dddfd"].each do |bad_input|
         given_cucumber_yml_defined_as(bad_input)
@@ -118,7 +130,7 @@ END_OF_MESSAGE
     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./
+      expected_error_message = /cucumber.yml was found, but could not be parsed. Please refer to cucumber's documentation on correct profile usage./
 
       given_cucumber_yml_defined_as("input that causes an exception in YAML loading")
       YAML.should_receive(:load).and_raise Exception

data/spec/cucumber/cli/main_spec.rb

@@ -1,5 +1,4 @@
 require File.dirname(__FILE__) + '/../../spec_helper'
-require 'spec/expectations/differs/default'
 require 'yaml'
 require 'spec/expectations/differs/default'
 
@@ -11,18 +10,6 @@ module Cli
       Kernel.stub!(:exit).and_return(nil)
     end
 
-    it "should print step definitions" do
-      step_mother = Object.new.extend(StepMother)
-      step_mother.Given(/Bonjour/) {}
-      step_mother.Given(/Monde/) {}
-      @cli = Main.new(%w{-S}, @out)
-      @cli.execute!(step_mother)
-      @out.string.should == %{
-/Bonjour/ # spec/cucumber/cli/main_spec.rb:16
-/Monde/   # spec/cucumber/cli/main_spec.rb:17
-}.lstrip
-    end
-
     describe "verbose mode" do
       
       before(:each) do
@@ -55,7 +42,7 @@ module Cli
     describe "diffing" do
 
       before :each do
-        @configuration = mock('Configuration', :null_object => true, :print_step_definitions? => nil)
+        @configuration = mock('Configuration', :null_object => true)
         Configuration.should_receive(:new).and_return(@configuration)
         
         @step_mother = mock('StepMother', :null_object => true)

data/spec/cucumber/parser/feature_parser_spec.rb

@@ -33,7 +33,7 @@ with blurb
           parse(%{# My comment
 Feature: hi
 }).to_sexp.should ==
-          [:feature, "Feature: hi\n",
+          [:feature, nil, "Feature: hi\n",
             [:comment, "# My comment\n"]]
         end
         
@@ -45,7 +45,7 @@ Feature: hi
     # When bar
     Then baz
 }).to_sexp.should == 
-          [:feature, "Feature: Hi", 
+          [:feature, nil, "Feature: Hi", 
             [:scenario, 2, "Scenario:", "Hello", 
               [:step, 3, "Given", "foo"],
               [:comment, "# When bar\n"], 
@@ -59,18 +59,18 @@ Feature: hi
 # World
 Feature: hi
 }).to_sexp.should ==
-          [:feature, "Feature: hi\n",
+          [:feature, nil, "Feature: hi\n",
             [:comment, "# Hello\n# World\n"]]
         end
 
         it "should parse a file with no comments" do
           parse("Feature: hi\n").to_sexp.should ==
-          [:feature, "Feature: hi\n"]
+          [:feature, nil, "Feature: hi\n"]
         end
 
         it "should parse a file with only a multiline comment with newlines" do
           parse("# Hello\n\n# World\n").to_sexp.should == 
-          [:feature, "", 
+          [:feature, nil, "", 
             [:comment, "# Hello\n\n# World\n"]]
         end
       end
@@ -78,7 +78,7 @@ Feature: hi
       describe "Tags" do
         it "should parse a file with tags on a feature" do
           parse("# My comment\n@hello @world Feature: hi\n").to_sexp.should ==
-          [:feature, "Feature: hi\n",
+          [:feature, nil, "Feature: hi\n",
             [:comment, "# My comment\n"],
             [:tag, "hello"],
             [:tag, "world"]]
@@ -96,7 +96,7 @@ Feature: hi
 @st3 
    @st4    @ST5  @#^%&ST6**!
   Scenario: Second}).to_sexp.should ==
-          [:feature, "Feature: hi",
+          [:feature, nil, "Feature: hi",
             [:comment, "# FC\n  "],
             [:tag, "ft"],
             [:scenario, 6, 'Scenario:', 'First',
@@ -111,7 +111,7 @@ Feature: hi
       describe "Background" do
         it "should have steps" do
           parse("Feature: Hi\nBackground:\nGiven I am a step\n").to_sexp.should ==
-          [:feature, "Feature: Hi",
+          [:feature, nil, "Feature: Hi",
             [:background, 2, "Background:",
               [:step, 3, "Given", "I am a step"]]]
         end
@@ -120,7 +120,7 @@ Feature: hi
       describe "Scenarios" do
         it "can be empty" do
           parse("Feature: Hi\n\nScenario: Hello\n").to_sexp.should ==
-          [:feature, "Feature: Hi",
+          [:feature, nil, "Feature: Hi",
             [:scenario, 3, "Scenario:", "Hello"]]
         end
 
@@ -134,7 +134,7 @@ Scenario: bar
             
         it "should have steps" do
           parse("Feature: Hi\nScenario: Hello\nGiven I am a step\n").to_sexp.should ==
-          [:feature, "Feature: Hi",
+          [:feature, nil, "Feature: Hi",
             [:scenario, 2, "Scenario:", "Hello",
               [:step_invocation, 3, "Given", "I am a step"]]]
         end
@@ -145,7 +145,7 @@ Scenario: Hello
 Given I have a table
 |a|b|
 }).to_sexp.should ==
-          [:feature, "Feature: Hi",
+          [:feature, nil, "Feature: Hi",
             [:scenario, 2, "Scenario:", "Hello",
               [:step_invocation, 3, "Given", "I have a table",
                 [:table,
@@ -166,7 +166,7 @@ Given I have a string
   """
 
 }).to_sexp.should ==
-          [:feature, "Feature: Hi",
+          [:feature, nil, "Feature: Hi",
             [:scenario, 2, "Scenario:", "Hello",
               [:step_invocation, 3, "Given", "I have a string",
                 [:py_string, "hello\nworld"]]]]
@@ -182,7 +182,7 @@ Examples:
 |what|
 |green|
 }).to_sexp.should ==
-          [:feature, "Feature: Hi",
+          [:feature, nil, "Feature: Hi",
             [:scenario_outline, "Scenario Outline:", "Hello",
               [:step, 3, "Given", "a <what> cucumber"],
               [:examples, "Examples:", "",
@@ -203,7 +203,7 @@ Examples:
 |a|b|
 |c|d|
 }).to_sexp.should ==
-          [:feature, "Feature: Hi",
+          [:feature, nil, "Feature: Hi",
             [:scenario_outline, "Scenario Outline:", "Hello",
               [:step, 4, "Given", "I have a table",
                 [:table, 
@@ -233,7 +233,7 @@ Examples:
 |5|6|
 
 ").to_sexp.should ==
-          [:feature, "Feature: Hi",
+          [:feature, nil, "Feature: Hi",
             [:scenario_outline, "Scenario Outline:", "Hello",
               [:step, 5, "Given", "I have a table",
                 [:table,