cucumber 0.2.2 → 0.2.3

data/lib/cucumber/parser/i18n.tt

@@ -22,6 +22,10 @@ module Cucumber
         (<%= keywords('but') %>)
       end
 
+      rule keyword_space
+        <%= keywords('space_after_keyword', true) ? 'space+' : 'space*' %>
+      end
+
       rule examples_keyword
         (<%= keywords('examples') %>) ':'?
       end

data/lib/cucumber/step_definition.rb

@@ -56,23 +56,20 @@ module Cucumber
   #   end
   #
   class StepDefinition
+    PARAM_PATTERN = /"([^\"]*)"/
+    ESCAPED_PARAM_PATTERN = '"([^\\"]*)"'
+    
     def self.snippet_text(step_keyword, step_name)
       escaped = Regexp.escape(step_name).gsub('\ ', ' ').gsub('/', '\/')
-      param_pattern = /"([^\"]*)"/
+      escaped = escaped.gsub(PARAM_PATTERN, ESCAPED_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 = ""
+      n = 0
+      block_args = escaped.scan(ESCAPED_PARAM_PATTERN).map do |a|
+        n += 1
+        "arg#{n}"
       end
+      block_arg_string = block_args.empty? ? "" : " |#{block_args.join(", ")}|"
 
-      escaped = escaped.gsub(param_pattern, '"([^\\"]*)"')
       "#{step_keyword} /^#{escaped}$/ do#{block_arg_string}\n  pending\nend"
     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
@@ -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
 

data/lib/cucumber/version.rb

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

data/rails_generators/cucumber/templates/env.rb

@@ -2,7 +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
+require 'cucumber/formatter/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)

data/rails_generators/cucumber/templates/paths.rb

@@ -8,7 +8,8 @@ module NavigationHelpers
     # Add more page name => path mappings here
     
     else
-      raise "Can't find mapping from \"#{page_name}\" to a path."
+      raise "Can't find mapping from \"#{page_name}\" to a path.\n" +
+        "Now, go and add a mapping in features/support/paths.rb"
     end
   end
 end

data/rails_generators/cucumber/templates/webrat_steps.rb

@@ -113,3 +113,11 @@ Then /^the "([^\"]*)" checkbox should be checked$/ do |label|
   assert field_labeled(label).checked?
 <% end -%>
 end
+
+Then /^I should be on (.+)$/ do |page_name|
+<% if framework == :rspec -%>
+  URI.parse(current_url).path.should == path_to(page_name)
+<% else -%>
+  assert_equal path_to(page_name), URI.parse(current_url).path
+<% end -%>
+end

data/{spec → specs}/cucumber/ast/table_spec.rb

@@ -69,6 +69,27 @@ module Cucumber
           @table.transpose.hashes[0].should == {'one' => '1111', 'two' => '22222'}
         end
       end
+      
+      describe ".rows_hash" do
+                
+        it "should return a hash of the rows" do
+          table = Table.new([
+            %w{one 1111},
+            %w{two 22222}
+          ])
+          table.rows_hash.should == {'one' => '1111', 'two' => '22222'}
+        end
+        
+        it "should fail if the table doesn't have two columns" do
+          faulty_table = Table.new([
+            %w{one 1111 abc},
+            %w{two 22222 def}
+          ])
+          lambda {
+            faulty_table.rows_hash
+          }.should raise_error('The table must have exactly 2 columns')
+        end
+      end
         
       it "should allow renaming columns" do
         table2 = @table.map_headers('one' => :three)

data/{spec → specs}/cucumber/core_ext/proc_spec.rb

@@ -32,6 +32,6 @@ describe Proc do
   
   it "should remove extraneous path info for file" do
     proc = lambda {|a,b|}
-    proc.file_colon_line.should == "spec/cucumber/core_ext/proc_spec.rb:34"
+    proc.file_colon_line.should == "specs/cucumber/core_ext/proc_spec.rb:34"
   end
 end

data/{spec → specs}/cucumber/step_definition_spec.rb

@@ -82,6 +82,14 @@ module Cucumber
       })
     end
 
+    it "should recognise several quoted words in name and make according regexp and args" do
+      StepDefinition.snippet_text('Given', 'A "first" and "second" arg').should == unindented(%{
+        Given /^A "([^\\"]*)" and "([^\\"]*)" arg$/ do |arg1, arg2|
+          pending
+        end
+      })
+    end
+
     it "should not use quote group when there are no quotes" do
       StepDefinition.snippet_text('Given', 'A first arg').should == unindented(%{
         Given /^A first arg$/ do

data/{spec → specs}/cucumber/step_mother_spec.rb

@@ -19,7 +19,7 @@ module Cucumber
       format.should == "it [snows] in [april]"
     end
 
-    it "should raise Ambiguous error when multiple step definitions match" do
+    it "should raise Ambiguous error with guess hint when multiple step definitions match" do
       @step_mother.Given(/Three (.*) mice/) {|disability|}
       @step_mother.Given(/Three blind (.*)/) {|animal|}
 
@@ -27,8 +27,24 @@ module Cucumber
         @step_mother.step_match("Three blind mice")
       end.should raise_error(Ambiguous, %{Ambiguous match of "Three blind mice":
 
-spec/cucumber/step_mother_spec.rb:23:in `/Three (.*) mice/'
-spec/cucumber/step_mother_spec.rb:24:in `/Three blind (.*)/'
+specs/cucumber/step_mother_spec.rb:23:in `/Three (.*) mice/'
+specs/cucumber/step_mother_spec.rb:24:in `/Three blind (.*)/'
+
+You can run again with --guess to make Cucumber be more smart about it
+})
+    end
+
+    it "should not show --guess hint when --guess is used" do
+      @step_mother.options = {:guess => true}
+      @step_mother.Given(/Three (.*) mice/) {|disability|}
+      @step_mother.Given(/Three cute (.*)/) {|animal|}
+
+      lambda do
+        @step_mother.step_match("Three cute mice")
+      end.should raise_error(Ambiguous, %{Ambiguous match of "Three cute mice":
+
+specs/cucumber/step_mother_spec.rb:39:in `/Three (.*) mice/'
+specs/cucumber/step_mother_spec.rb:40:in `/Three cute (.*)/'
 
 })
     end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: cucumber
 version: !ruby/object:Gem::Version 
-  version: 0.2.2
+  version: 0.2.3
 platform: ruby
 authors: 
 - "Aslak Helles\xC3\xB8y"
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-03-25 00:00:00 +01:00
+date: 2009-03-30 00:00:00 +02:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -30,7 +30,7 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        version: 1.2.4
+        version: 1.2.5
     version: 
 - !ruby/object:Gem::Dependency 
   name: polyglot
@@ -40,7 +40,7 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        version: 0.2.4
+        version: 0.2.5
     version: 
 - !ruby/object:Gem::Dependency 
   name: diff-lcs
@@ -70,7 +70,7 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        version: 1.8.3
+        version: 1.11.0
     version: 
 description: Executable Feature scenarios
 email: 
@@ -257,10 +257,12 @@ files:
 - examples/tickets/features/180.feature
 - examples/tickets/features/236.feature
 - examples/tickets/features/241.feature
+- examples/tickets/features/246.feature
 - examples/tickets/features/248.feature
 - examples/tickets/features/lib/eatting_machine.rb
 - examples/tickets/features/lib/pantry.rb
 - examples/tickets/features/scenario_outline.feature
+- examples/tickets/features/step_definitons/246_steps.rb
 - examples/tickets/features/step_definitons/248_steps.rb
 - examples/tickets/features/step_definitons/scenario_outline_steps.rb
 - examples/tickets/features/step_definitons/tickets_steps.rb
@@ -363,53 +365,53 @@ files:
 - rails_generators/feature/feature_generator.rb
 - rails_generators/feature/templates/feature.erb
 - rails_generators/feature/templates/steps.erb
-- spec/cucumber/ast/background_spec.rb
-- spec/cucumber/ast/feature_factory.rb
-- spec/cucumber/ast/feature_spec.rb
-- spec/cucumber/ast/py_string_spec.rb
-- spec/cucumber/ast/scenario_outline_spec.rb
-- spec/cucumber/ast/scenario_spec.rb
-- spec/cucumber/ast/step_collection_spec.rb
-- spec/cucumber/ast/step_spec.rb
-- spec/cucumber/ast/table_spec.rb
-- spec/cucumber/ast/tags_spec.rb
-- spec/cucumber/broadcaster_spec.rb
-- spec/cucumber/cli/configuration_spec.rb
-- spec/cucumber/cli/main_spec.rb
-- spec/cucumber/core_ext/proc_spec.rb
-- spec/cucumber/core_ext/string_spec.rb
-- spec/cucumber/formatter/ansicolor_spec.rb
-- spec/cucumber/formatter/color_io_spec.rb
-- spec/cucumber/formatter/html/cucumber.css
-- spec/cucumber/formatter/html/cucumber.js
-- spec/cucumber/formatter/html/index.html
-- spec/cucumber/formatter/html/jquery-1.3.min.js
-- spec/cucumber/formatter/html/jquery.uitableedit.js
-- spec/cucumber/formatters/profile_formatter_spec.rb
-- spec/cucumber/parser/feature_parser_spec.rb
-- spec/cucumber/parser/table_parser_spec.rb
-- spec/cucumber/rails/stubs/mini_rails.rb
-- spec/cucumber/rails/stubs/test_help.rb
-- spec/cucumber/rails/world_spec.rb
-- spec/cucumber/sell_cucumbers.feature
-- spec/cucumber/step_definition_spec.rb
-- spec/cucumber/step_mother_spec.rb
-- spec/cucumber/treetop_parser/empty_feature.feature
-- spec/cucumber/treetop_parser/empty_scenario.feature
-- spec/cucumber/treetop_parser/empty_scenario_outline.feature
-- spec/cucumber/treetop_parser/fit_scenario.feature
-- spec/cucumber/treetop_parser/given_scenario.feature
-- spec/cucumber/treetop_parser/invalid_scenario_outlines.feature
-- spec/cucumber/treetop_parser/multiline_steps.feature
-- spec/cucumber/treetop_parser/multiple_tables.feature
-- spec/cucumber/treetop_parser/scenario_outline.feature
-- spec/cucumber/treetop_parser/spaces.feature
-- spec/cucumber/treetop_parser/test_dos.feature
-- spec/cucumber/treetop_parser/with_comments.feature
-- spec/cucumber/treetop_parser/with_tags.feature
-- spec/cucumber/world/pending_spec.rb
-- spec/spec.opts
-- spec/spec_helper.rb
+- specs/cucumber/ast/background_spec.rb
+- specs/cucumber/ast/feature_factory.rb
+- specs/cucumber/ast/feature_spec.rb
+- specs/cucumber/ast/py_string_spec.rb
+- specs/cucumber/ast/scenario_outline_spec.rb
+- specs/cucumber/ast/scenario_spec.rb
+- specs/cucumber/ast/step_collection_spec.rb
+- specs/cucumber/ast/step_spec.rb
+- specs/cucumber/ast/table_spec.rb
+- specs/cucumber/ast/tags_spec.rb
+- specs/cucumber/broadcaster_spec.rb
+- specs/cucumber/cli/configuration_spec.rb
+- specs/cucumber/cli/main_spec.rb
+- specs/cucumber/core_ext/proc_spec.rb
+- specs/cucumber/core_ext/string_spec.rb
+- specs/cucumber/formatter/ansicolor_spec.rb
+- specs/cucumber/formatter/color_io_spec.rb
+- specs/cucumber/formatter/html/cucumber.css
+- specs/cucumber/formatter/html/cucumber.js
+- specs/cucumber/formatter/html/index.html
+- specs/cucumber/formatter/html/jquery-1.3.min.js
+- specs/cucumber/formatter/html/jquery.uitableedit.js
+- specs/cucumber/formatters/profile_formatter_spec.rb
+- specs/cucumber/parser/feature_parser_spec.rb
+- specs/cucumber/parser/table_parser_spec.rb
+- specs/cucumber/rails/stubs/mini_rails.rb
+- specs/cucumber/rails/stubs/test_help.rb
+- specs/cucumber/rails/world_spec.rb
+- specs/cucumber/sell_cucumbers.feature
+- specs/cucumber/step_definition_spec.rb
+- specs/cucumber/step_mother_spec.rb
+- specs/cucumber/treetop_parser/empty_feature.feature
+- specs/cucumber/treetop_parser/empty_scenario.feature
+- specs/cucumber/treetop_parser/empty_scenario_outline.feature
+- specs/cucumber/treetop_parser/fit_scenario.feature
+- specs/cucumber/treetop_parser/given_scenario.feature
+- specs/cucumber/treetop_parser/invalid_scenario_outlines.feature
+- specs/cucumber/treetop_parser/multiline_steps.feature
+- specs/cucumber/treetop_parser/multiple_tables.feature
+- specs/cucumber/treetop_parser/scenario_outline.feature
+- specs/cucumber/treetop_parser/spaces.feature
+- specs/cucumber/treetop_parser/test_dos.feature
+- specs/cucumber/treetop_parser/with_comments.feature
+- specs/cucumber/treetop_parser/with_tags.feature
+- specs/cucumber/world/pending_spec.rb
+- specs/spec.opts
+- specs/spec_helper.rb
 has_rdoc: true
 homepage: http://cukes.info
 post_install_message: