cucumber 0.3.94 → 0.3.95

data/History.txt

@@ -1,3 +1,28 @@
+== 0.3.95 2009-08-13
+
+This release improves Webrat support for table-like HTML markup. Now you can easily turn the HTML
+elements table, dl, ol and ul elements into a 2D array. This is particularly useful for comparing
+data in your HTML with a Cucumber table using Cucumber::Ast::Table#diff!
+
+This release also fixes several bugs related to --drb (Spork) and profiles (cucumber.yml)
+
+=== Bug Fixes
+* --guess will always prefer the longest regexp with no groups if they exist. 
+* Prevent delays if a NoMethodError is raise in a step definition. Define a light #inspect in World. (#374 Aslak Hellesøy)
+* Restore 'features' as the default feature running path. (#412 Ben Mabey)
+* --drb degrades gracefully when no drb server is running and no formatter is provided. (#410 Ben Mabey)
+* --language picked up from profiles again. (#409 Ben Mabey)
+* Resolved infinite loop problem when --drb was defined in a profile. (#408 Ben Mabey)
+
+=== New Features
+* The object returned by element_at (Webrat::Element) has a #to_table that works for table, dl, ol and ul. (Aslak Hellesøy)
+* An explanation of why failures are ok is printed when --wip is used. (Aslak Hellesøy)
+* Added cucumber alias for cucumber:ok in Rails Rake tasks. (Aslak Hellesøy)
+
+=== Changed features
+* element_at('table').to_table should be used instead of table_at('table').to_a. The old way is deprecated but still works. (Aslak Hellesøy)
+* element_at (and the depracated table_at) no longer takes a DOM id, only CSS selectors. Change "my_id" to "#my_id". (Aslak Hellesøy)
+
 == 0.3.94 2009-08-06
 
 Kanban take II.
@@ -40,7 +65,7 @@ Highlights in this release: Improved profile handling (cucumber.yml) and a fix f
 
 === Bugfixes
 * script/cucumber correctly loads the gem's binary if the plugin isn't installed. 
-* Cucumber hangs waiting for Ctrl+C if an Error is raised (#374 Aslak Hellesøy) 
+* Cucumber hangs waiting for Ctrl+C if an Error is raised. (#374 Aslak Hellesøy) 
 
 == 0.3.92 2009-07-29
 

data/Manifest.txt

@@ -321,6 +321,7 @@ lib/cucumber/cli/language_help_formatter.rb
 lib/cucumber/cli/main.rb
 lib/cucumber/cli/options.rb
 lib/cucumber/cli/profile_loader.rb
+lib/cucumber/cli/rb_step_def_loader.rb
 lib/cucumber/core_ext/exception.rb
 lib/cucumber/core_ext/instance_exec.rb
 lib/cucumber/core_ext/proc.rb
@@ -363,6 +364,7 @@ lib/cucumber/step_definition.rb
 lib/cucumber/step_match.rb
 lib/cucumber/step_mother.rb
 lib/cucumber/version.rb
+lib/cucumber/webrat/element_locator.rb
 lib/cucumber/webrat/table_locator.rb
 lib/cucumber/world.rb
 rails_generators/cucumber/USAGE

data/examples/cs/features/step_definitons/calculator_steps.rb

@@ -1,5 +1,5 @@
 require 'spec/expectations'
-$:.unshift(File.dirname(__FILE__) + '/../../lib') # This line is not needed in your own project
+$:.unshift(File.dirname(__FILE__) + '/../../') # This line is not needed in your own project
 require 'Calculator' # Calculator.dll
 
 Before do

data/features/drb_server_integration.feature

@@ -93,6 +93,11 @@ Feature: DRb Server Integration
       I'm loading all the heavy stuff...
       I'm loading the stuff just for this run...
       """
+    And the output should contain
+      """
+      1 step (1 passed)
+      """
+
 
   Scenario: Feature Run with --drb flag *defined in a profile* with no DRb server running
 

data/features/support/env.rb

@@ -4,9 +4,9 @@ require 'spec/expectations'
 require 'fileutils'
 require 'forwardable'
 begin
-  gem "spork", ">= 0.5.1" # Ensure correct spork version number to avoid false-negatives.
+  require 'spork'
 rescue Gem::LoadError => ex
-  warn "WARNING: #{ex.message} You need to have the spork gem installed to run the DRb feature properly!"
+  gem 'spork', '>= 0.5.7' # Ensure correct spork version number to avoid false-negatives.
 end
 
 class CucumberWorld
@@ -92,8 +92,7 @@ class CucumberWorld
       else
         # STDOUT.close
         # STDERR.close
-        spork = `which spork`.strip
-        cmd = "#{Cucumber::RUBY_BINARY} -I #{Cucumber::LIBDIR} #{spork} cuc"
+        cmd = "#{Cucumber::RUBY_BINARY} -I #{Cucumber::LIBDIR} #{Spork::BINARY} cuc"
         exec cmd
       end
     end

data/features/work_in_progress.feature

@@ -70,6 +70,8 @@ Feature: Cucumber --work-in-progress switch
       1 scenario (1 failed)
       1 step (1 failed)
 
+      The --wip switch was used, so the failures were expected. All is good.
+
       """
 
   Scenario: Pass with Undefined Scenarios
@@ -85,6 +87,8 @@ Feature: Cucumber --work-in-progress switch
       1 scenario (1 undefined)
       1 step (1 undefined)
 
+      The --wip switch was used, so the failures were expected. All is good.
+
       """
 
   @mri186
@@ -104,6 +108,8 @@ Feature: Cucumber --work-in-progress switch
       1 scenario (1 pending)
       1 step (1 pending)
 
+      The --wip switch was used, so the failures were expected. All is good.
+
       """
 
   Scenario: Fail with Passing Scenarios

data/lib/cucumber/cli/configuration.rb

@@ -18,12 +18,12 @@ module Cucumber
       def parse!(args)
         @args = args
         @options.parse!(args)
+        arrange_formats
         raise("You can't use both --strict and --wip") if strict? && wip?
 
         return @args.replace(@options.expanded_args_without_drb) if drb?
 
         set_environment_variables
-        arrange_formats
       end
 
       def verbose?
@@ -50,10 +50,6 @@ module Cucumber
         @options[:drb]
       end
 
-      def paths
-        @options[:paths]
-      end
-
       def build_formatter_broadcaster(step_mother)
         return Formatter::Pretty.new(step_mother, nil, @options) if @options[:autoformat]
         formatters = @options[:formats].map do |format_and_out|
@@ -91,23 +87,23 @@ module Cucumber
         end
       end
 
-      def files_to_require
+      def step_defs_to_load
         requires = @options[:require].empty? ? require_dirs : @options[:require]
         files = requires.map do |path|
           path = path.gsub(/\\/, '/') # In case we're on windows. Globs don't work with backslashes.
           path = path.gsub(/\/$/, '') # Strip trailing slash.
-          File.directory?(path) ? Dir["#{path}/**/*.rb"] : path
+          File.directory?(path) ? Dir["#{path}/**/*"] : path
         end.flatten.uniq
-        sorted_files = files.sort { |a,b| (b =~ %r{/support/} || -1) <=>  (a =~ %r{/support/} || -1) }.reject{|f| f =~ /^http/}
-        env_files = sorted_files.select {|f| f =~ %r{/support/env.rb} }
-        files = env_files + sorted_files.reject {|f| f =~ %r{/support/env.rb} }
+        sorted_files = files.sort { |a,b| (b =~ %r{/support/} || -1) <=> (a =~ %r{/support/} || -1) }.reject{|f| f =~ /^http/}
+        env_files = sorted_files.select {|f| f =~ %r{/support/env\..*} }
+        files = env_files + sorted_files.reject {|f| f =~ %r{/support/env\..*} }
         remove_excluded_files_from(files)
-        files.reject! {|f| f =~ %r{/support/env.rb} } if @options[:dry_run]
+        files.reject! {|f| f =~ %r{/support/env\..*} } if @options[:dry_run]
         files
       end
 
       def feature_files
-        potential_feature_files = @options[:paths].map do |path|
+        potential_feature_files = paths.map do |path|
           path = path.gsub(/\\/, '/') # In case we're on windows. Globs don't work with backslashes.
           path = path.chomp('/')
           File.directory?(path) ? Dir["#{path}/**/*.feature"] : path
@@ -116,8 +112,28 @@ module Cucumber
         potential_feature_files
       end
 
+      def constantize(camel_cased_word)
+        begin
+          names = camel_cased_word.split('::')
+          names.shift if names.empty? || names.first.empty?
+
+          constant = Object
+          names.each do |name|
+            constant = constant.const_defined?(name) ? constant.const_get(name) : constant.const_missing(name)
+          end
+          constant
+        rescue NameError
+          require underscore(camel_cased_word)
+          retry
+        end
+      end
+
     private
 
+      def paths
+        @options[:paths].empty? ? ['features'] : @options[:paths]
+      end
+
       def set_environment_variables
         @options[:env_vars].each do |var, value|
           ENV[var] = value
@@ -144,22 +160,6 @@ module Cucumber
         feature_dirs + Dir['vendor/{gems,plugins}/*/cucumber']
       end
 
-      def constantize(camel_cased_word)
-        begin
-          names = camel_cased_word.split('::')
-          names.shift if names.empty? || names.first.empty?
-
-          constant = Object
-          names.each do |name|
-            constant = constant.const_defined?(name) ? constant.const_get(name) : constant.const_missing(name)
-          end
-          constant
-        rescue NameError
-          require underscore(camel_cased_word)
-          retry
-        end
-      end
-
       # Snagged from active_support
       def underscore(camel_cased_word)
         camel_cased_word.to_s.gsub(/::/, '/').

data/lib/cucumber/cli/main.rb

@@ -51,7 +51,7 @@ module Cucumber
         # features are loaded. If we swap the order, the requires
         # will fail.
         features = load_plain_text_features
-        require_files
+        load_step_defs
         enable_diffing
 
         visitor = configuration.build_formatter_broadcaster(step_mother)
@@ -108,33 +108,56 @@ module Cucumber
         @configuration
       end
 
-      def load_files
-        each_lib{|lib| load(lib)}
+      def verbose_log(string)
+        @out_stream.puts(string) if configuration.verbose?
       end
 
       private
 
-      def require_files
-        each_lib{|lib| require lib}
+      def load_step_defs
+        step_def_files = configuration.step_defs_to_load
+        verbose_log("Step Definitions Files:")
+        step_def_files.each do |step_def_file|
+          load_step_def(step_def_file)
+        end
+      end
+
+      def load_step_def(step_def_file)
+        if loader = step_def_loader_for(step_def_file)
+          verbose_log("  * #{step_def_file}")
+          loader.load_step_def_file(self, step_def_file)
+        end
       end
 
-      def each_lib
-        requires = configuration.files_to_require
-        verbose_log("Ruby files required:")
-        verbose_log(requires.map{|lib| "  * #{lib}"}.join("\n"))
+      def step_def_loader_for(step_def_file)
+        @sted_def_loaders ||= {}
+        if ext = File.extname(step_def_file)[1..-1]
+          loader = @sted_def_loaders[ext]
+          return nil if loader == :missing
+          return loader if loader
+          begin
+            loader_class = configuration.constantize("Cucumber::Cli::#{ext.capitalize}StepDefLoader")
+            return @sted_def_loaders[ext] = loader_class.new
+          rescue LoadError
+            @sted_def_loaders[ext] = :missing
+            nil
+          end
+        end
+        nil
+      end
+
+      def step_def_files
+        main.verbose_log("Ruby files required:")
+        main.verbose_log(requires.map{|lib| "  * #{lib}"}.join("\n"))
         requires.each do |lib|
           begin
-            yield lib
+            require lib
           rescue LoadError => e
             e.message << "\nFailed to load #{lib}"
             raise e
           end
         end
-        verbose_log("\n")
-      end
-
-      def verbose_log(string)
-        @out_stream.puts(string) if configuration.verbose?
+        main.verbose_log("\n")
       end
 
       def enable_diffing

data/lib/cucumber/cli/options.rb

@@ -28,9 +28,10 @@ module Cucumber
       ]
       DRB_FLAG = '--drb'
       PROFILE_SHORT_FLAG = '-p'
+      NO_PROFILE_SHORT_FLAG = '-P'
       PROFILE_LONG_FLAG = '--profile'
+      NO_PROFILE_LONG_FLAG = '--no-profile'
 
-      attr_reader :paths
 
       def self.parse(args, out_stream, error_stream, options = {})
         new(out_stream, error_stream, options).parse!(args)
@@ -56,7 +57,8 @@ module Cucumber
       end
 
       def expanded_args_without_drb
-        @expanded_args_without_drb ||= (
+        return @expanded_args_without_drb  if @expanded_args_without_drb
+        @expanded_args_without_drb = (
           previous_flag_was_profile = false
           @expanded_args.reject do |arg|
             if previous_flag_was_profile
@@ -70,6 +72,9 @@ module Cucumber
             arg == DRB_FLAG || @overridden_paths.include?(arg)
           end
         )
+
+        @expanded_args_without_drb.push("--no-profile") unless @expanded_args_without_drb.include?(NO_PROFILE_LONG_FLAG) || @expanded_args_without_drb.include?(NO_PROFILE_SHORT_FLAG)
+        @expanded_args_without_drb
       end
 
       def parse!(args)
@@ -151,7 +156,7 @@ module Cucumber
               "then only the ones from the command line are used.") do |v|
             @profiles << v
           end
-          opts.on('-P', '--no-profile',
+          opts.on(NO_PROFILE_SHORT_FLAG, NO_PROFILE_LONG_FLAG,
             "Disables all profile laoding to avoid using the 'default' profile.") do |v|
             @disable_profile_loading = true
           end
@@ -230,7 +235,6 @@ module Cucumber
           @options[:source]   = true if @options[:source].nil?
         end
 
-
         extract_environment_variables
         @options[:paths] = @args.dup #whatver is left over
 
@@ -240,8 +244,6 @@ module Cucumber
         self
       end
 
-
-
     protected
 
       attr_reader :options, :profiles, :expanded_args
@@ -354,19 +356,18 @@ module Cucumber
       end
 
       def print_profile_information
-      return if @skip_profile_information || @profiles.empty?
-      profiles_sentence = ''
-      profiles_sentence = @profiles.size == 1 ? @profiles.first :
-        "#{@profiles[0...-1].join(', ')} and #{@profiles.last}"
+        return if @skip_profile_information || @profiles.empty?
+        profiles_sentence = ''
+        profiles_sentence = @profiles.size == 1 ? @profiles.first :
+          "#{@profiles[0...-1].join(', ')} and #{@profiles.last}"
 
-      @out_stream.puts "Using the #{profiles_sentence} profile#{'s' if @profiles.size> 1}..."
+        @out_stream.puts "Using the #{profiles_sentence} profile#{'s' if @profiles.size> 1}..."
       end
 
       def default_options
         {
           :strict       => false,
           :require      => [],
-          :lang         => nil,
           :dry_run      => false,
           :formats      => [],
           :excludes     => [],

data/lib/cucumber/cli/profile_loader.rb

@@ -57,8 +57,6 @@ Defined profiles in cucumber.yml:
         return @cucumber_yml
       end
 
-     
-
     end
   end
 end

data/lib/cucumber/cli/rb_step_def_loader.rb

@@ -0,0 +1,14 @@
+module Cucumber
+  module Cli
+    class RbStepDefLoader
+      def load_step_def_file(main, step_def_file)
+        begin
+          require step_def_file
+        rescue LoadError => e
+          e.message << "\nFailed to load #{step_def_file}"
+          raise e
+        end
+      end
+    end
+  end
+end

data/lib/cucumber/formatter/ansicolor.rb

@@ -101,7 +101,6 @@ module Cucumber
         begin
           gem 'genki-ruby-terminfo'
           require 'terminfo'
-          puts TermInfo.default_object.tigetnum("colors")
           case TermInfo.default_object.tigetnum("colors")
           when 0
             raise "Your terminal doesn't support colours"

data/lib/cucumber/formatter/console.rb

@@ -109,8 +109,10 @@ module Cucumber
         return unless options[:wip]
         passed = step_mother.scenarios(:passed)
         if passed.any?
-          @io.puts "\nThe --wip switch was used, so I didn't expect anything to pass. These scenarios passed:"
+          @io.puts format_string("\nThe --wip switch was used, so I didn't expect anything to pass. These scenarios passed:", :failed)
           print_elements(passed, :passed, "scenarios")
+        else
+          @io.puts format_string("\nThe --wip switch was used, so the failures were expected. All is good.\n", :passed)
         end
       end
 

data/lib/cucumber/step_mother.rb

@@ -230,10 +230,14 @@ module Cucumber
     end
 
     def best_matches(step_name, step_matches)
+      no_groups      = step_matches.select {|step_match| step_match.args.length == 0}
       max_arg_length = step_matches.map {|step_match| step_match.args.length }.max
       top_groups     = step_matches.select {|step_match| step_match.args.length == max_arg_length }
 
-      if top_groups.length > 1
+      if no_groups.any?
+        longest_regexp_length = no_groups.map {|step_match| step_match.text_length }.max
+        no_groups.select {|step_match| step_match.text_length == longest_regexp_length }
+      elsif top_groups.any?
         shortest_capture_length = top_groups.map {|step_match| step_match.args.inject(0) {|sum, c| sum + c.length } }.min
         top_groups.select {|step_match| step_match.args.inject(0) {|sum, c| sum + c.length } == shortest_capture_length }
       else

data/lib/cucumber/version.rb

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

data/lib/cucumber/webrat/element_locator.rb

@@ -0,0 +1,87 @@
+module Webrat
+  class Element
+    # Returns an Array of Array of String where each String is the
+    # a "cell" in the table-like structure represented by this Element.
+    #
+    # Supported elements are table, dl, ol and ul. The return value depends
+    # on the type of the element:
+    #
+    # * table    : Each tr is a row. The innerHTML of each tr or th becomes cells. The number 
+    #              of columns is determined by the number of cells in the first row.
+    # * dl       : Each dt creates a row with 2 cells. The innerHTML of the dt itself and the next dd become cells.
+    # * ul or ol : Each ul creates a row with one cell, the innerHTML of the ul.
+    #
+    def to_table
+      case element.name
+      when 'table'
+        table_from_table
+      when 'dl'
+        table_from_dl
+      when /ul|ol/
+        table_from_list
+      else
+        raise "#to_table not supported for #{element.name} elements"
+      end
+    end
+    
+    def table_from_table #:nodoc:
+      col_count = nil
+      Webrat::XML.css_search(element, 'tr').map do |row|
+        cols = Webrat::XML.css_search(row, 'th,td')
+        col_count ||= cols.length
+        cols[0...col_count].map do |col|
+          col.inner_html
+        end
+      end
+    end
+
+    def table_from_dl #:nodoc:
+      Webrat::XML.css_search(@element, 'dt').map do |dt|
+        next_node = dt.next_sibling
+        while next_node.name != 'dd'
+          next_node = next_node.next_sibling
+        end
+        [dt.inner_html, next_node.inner_html]
+      end
+    end
+
+    def table_from_list #:nodoc:
+      Webrat::XML.css_search(@element, 'li').map do |li|
+        [li.inner_html]
+      end
+    end
+
+    alias to_a to_table # Backwards compatibility with Cucumber
+  end
+  
+  module Locators
+    class ElementLocator < Locator
+      def locate
+        Element.load(@session, table_element)
+      end
+
+      def table_element
+        Webrat::XML.css_search(@dom, @value)[0]
+      end
+
+      def error_message
+        "Could not find anything matching '#{@value}'"
+      end
+    end
+
+    # Returns a Webrat DOM element located by +css_selector+.
+    def element_at(css_selector)
+      ElementLocator.new(@session, dom, css_selector).locate!
+    end
+    
+    alias table_at element_at # Backwards compatibility with Cucumber
+  end
+  
+  module Methods
+    delegate_to_session :element_at, :table_at
+  end
+  
+  class Session
+    def_delegators :current_scope, :element_at, :table_at
+  end
+end

data/lib/cucumber/webrat/table_locator.rb

@@ -1,66 +1 @@
-module Webrat
-  class Table < Element
-    def self.xpath_search
-      ".//table"
-    end
-
-    # Converts this Table element into an Array of Array of String where each cell
-    # represents the inner_html of the <td> and <th> elements. The number of columns is
-    # determined by the number of cells in the first row.
-    def to_a
-      col_count = nil
-      Webrat::XML.css_search(@element, 'tr').map do |row|
-        cols = Webrat::XML.css_search(row, 'th,td')
-        col_count ||= cols.length
-        cols[0...col_count].map do |col|
-          col.inner_html
-        end
-      end
-    end
-  end
-  
-  module Locators
-    class TableLocator < Locator
-      def locate
-        Table.load(@session, table_element)
-      end
-
-      def table_element
-        table_elements.detect do |table_element|
-          matches_id?(table_element) ||
-          matches_css_selector?(table_element)
-        end
-      end
-
-      def matches_id?(table_element)
-        Webrat::XML.attribute(table_element, "id") == @value.to_s
-      end
-
-      def matches_css_selector?(table_element)
-        Webrat::XML.css_at(@dom, @value)
-      end
-
-      def table_elements
-        Webrat::XML.xpath_search(@dom, *Table.xpath_search)
-      end
-
-      def error_message
-        "Could not find table matching '#{@value}'"
-      end
-    end
-
-    # Returns a Table element located by +id_or_selector+, which can
-    # be a DOM id or a CSS selector.
-    def table_at(id_or_selector)
-      TableLocator.new(@session, dom, id_or_selector).locate!
-    end
-  end
-  
-  module Methods
-    delegate_to_session :table_at
-  end
-  
-  class Session
-    def_delegators :current_scope, :table_at
-  end
-end
+require 'cucumber/webrat/element_locator'

data/lib/cucumber/world.rb

@@ -49,5 +49,21 @@ module Cucumber
         raise Pending.new(message)
       end
     end
+
+    # The default implementation of Object#inspect recursively
+    # traverses all instance variables and invokes inspect. 
+    # This can be time consuming if the object graph is large.
+    #
+    # This can cause unnecessary delays when certain exceptions 
+    # occur. For example, MRI internally invokes #inspect on an 
+    # object that raises a NoMethodError. (JRuby does not do this).
+    #
+    # A World object can have many references created by the user
+    # or frameworks (Rails), so to avoid long waiting times on
+    # such errors in World we define it to just return a simple String.
+    #
+    def inspect
+      sprintf("#<%s:0x%x>", self.class, self.object_id)
+    end
   end
 end

data/rails_generators/cucumber/templates/cucumber.rake

@@ -18,8 +18,10 @@ begin
     desc 'Run all features'
     task :all => [:ok, :wip]
   end
+  desc 'Alias for cucumber:ok'
+  task :cucumber => 'cucumber:ok'
 
-  task :features => 'cucumber:ok' do
+  task :features => :cucumber do
     STDERR.puts "*** The 'features' task is deprecated. See rake -T cucumber ***"
   end
 rescue LoadError

data/rails_generators/cucumber/templates/env.rb

@@ -15,7 +15,7 @@ Cucumber::Rails.use_transactional_fixtures
 Cucumber::Rails.bypass_rescue
 
 require 'webrat'
-require 'cucumber/webrat/table_locator' # Lets you do table.diff!(table_at('#my_table').to_a)
+require 'cucumber/webrat/element_locator' # Lets you do table.diff!(element_at('#my_table_or_dl_or_ul_or_ol').to_table)
 
 Webrat.configure do |config|
   config.mode = :rails

data/rails_generators/cucumber/templates/spork_env.rb

@@ -7,7 +7,7 @@ Spork.prefork do
   require File.expand_path(File.dirname(__FILE__) + '/../../config/environment')
  
   require 'webrat'
-  require 'cucumber/webrat/table_locator' # Lets you do table.diff!(table_at('#my_table').to_a)
+  require 'cucumber/webrat/element_locator' # Lets you do table.diff!(element_at('#my_table_or_dl_or_ul_or_ol').to_table)
  
   Webrat.configure do |config|
     config.mode = :rails

data/rails_generators/cucumber/templates/webrat_steps.rb

@@ -167,3 +167,7 @@ Then /^I should be on (.+)$/ do |page_name|
   assert_equal path_to(page_name), URI.parse(current_url).path
 <% end -%>
 end
+
+Then /^show me the page$/ do
+  save_and_open_page
+end

data/spec/cucumber/cli/configuration_spec.rb

@@ -38,7 +38,7 @@ module Cli
 
       config.parse!(%w{--require /features})
 
-      config.files_to_require.should == [
+      config.step_defs_to_load.should == [
         "/features/support/bar.rb",
         "/features/step_definitions/foo.rb"
       ]
@@ -49,7 +49,7 @@ module Cli
 
       config.parse!(%w{--require /features})
 
-      config.files_to_require.should == [
+      config.step_defs_to_load.should == [
         "/features/support/env.rb",
         "/features/support/a_file.rb"
       ]
@@ -60,7 +60,7 @@ module Cli
 
       config.parse!(%w{--require /features --dry-run})
 
-      config.files_to_require.should == [
+      config.step_defs_to_load.should == [
         "/features/support/a_file.rb"
       ]
     end
@@ -71,7 +71,7 @@ module Cli
 
       config.parse!(%w{--require /features})
 
-      config.files_to_require.should == [
+      config.step_defs_to_load.should == [
         "/vendor/plugins/plugin_a/cucumber/foo.rb",
         "/vendor/gems/gem_a/cucumber/bar.rb"
       ]
@@ -84,7 +84,7 @@ module Cli
 
         config.parse!(%w{--require /features --exclude a_file.rb})
 
-        config.files_to_require.should == [
+        config.step_defs_to_load.should == [
           "/features/support/env.rb"
         ]
       end
@@ -96,7 +96,7 @@ module Cli
 
         config.parse!(%w{--require /features --exclude foo[df] --exclude blah})
 
-        config.files_to_require.should == [
+        config.step_defs_to_load.should == [
           "/features/support/bar.rb",
           "/features/support/fooz.rb"
         ]
@@ -114,50 +114,6 @@ module Cli
       end
     end
 
-    context '--drb' do
-      it "removes the --drb flag from the args" do
-        args = %w{features --drb}
-        config.parse!(args)
-        args.should == %w{features}
-      end
-
-      it "keeps all other flags intact" do
-        args = %w{features --drb --format profile}
-        config.parse!(args)
-        args.should == %w{features --format profile}
-      end
-
-    end
-
-    context '--drb in a profile' do
-      it "removes the --drb flag from the args" do
-        given_cucumber_yml_defined_as({'server' => '--drb features'})
-
-        args = %w{--profile server}
-        config.parse!(args)
-        args.should == %w{features}
-      end
-
-      it "keeps all other flags intact from all profiles involved" do
-        given_cucumber_yml_defined_as({'server' => '--drb features --profile nested',
-                                       'nested' => '--verbose'})
-
-        args = %w{--profile server --format profile}
-        config.parse!(args)
-        args.should == %w{--format profile features --verbose}
-      end
-
-    end
-
-    context '--drb in the default profile and no arguments specified' do
-      it "expands the profile's arguments into the args excpet for --drb" do
-        given_cucumber_yml_defined_as({'default' => '--drb features --format pretty'})
-        args = []
-        config.parse!(args)
-        args.should == %w{features --format pretty}
-      end
-    end
-
     it "uses the default profile when no profile is defined" do
       given_cucumber_yml_defined_as({'default' => '--require some_file'})
 
@@ -197,36 +153,10 @@ END_OF_MESSAGE
       end
 
       it "allows profiles to be defined in arrays" do
-        given_cucumber_yml_defined_as({'foo' => [1,2,3]})
+        given_cucumber_yml_defined_as({'foo' => ['-f','progress']})
 
         config.parse!(%w{--profile foo})
-        config.paths.should == [1,2,3]
-      end
-
-      it "notifies the user that an individual profile is being used" do
-        given_cucumber_yml_defined_as({'foo' => [1,2,3]})
-
-        config.parse!(%w{--profile foo})
-        out.string.should =~ /Using the foo profile...\n/
-      end
-
-      it "notifies the user when multiple profiles are being used" do
-        given_cucumber_yml_defined_as({'foo' => [1,2,3], 'bar' => ['v'], 'dog' => ['v']})
-
-        config.parse!(%w{--profile foo --profile bar})
-        out.string.should =~ /Using the foo and bar profiles...\n/
-
-        reset_config
-
-        config.parse!(%w{--profile foo --profile bar --profile dog})
-        out.string.should =~ /Using the foo, bar and dog profiles...\n/
-      end
-
-      it "disregards paths in profiles when other paths are passed in (via cmd line)" do
-        given_cucumber_yml_defined_as({'foo' => %w[-v features]})
-
-        config.parse!(%w{--profile foo features/specific.feature --format pretty})
-        config.paths.should == ['features/specific.feature']
+        config.options[:formats].should == [['progress', out]]
       end
 
       it "disregards default STDOUT formatter defined in profile when another is passed in (via cmd line)" do
@@ -422,17 +352,27 @@ END_OF_MESSAGE
       config.feature_files.should == ["cucumber.feature"]
     end
 
+    it "defaults to the features directory when no feature file are provided" do
+      File.stub!(:directory?).and_return(true)
+      Dir.should_receive(:[]).with("features/**/*.feature").
+        any_number_of_times.and_return(["cucumber.feature"])
+
+      config.parse!(%w{})
+
+      config.feature_files.should == ["cucumber.feature"]
+    end
+
     it "should allow specifying environment variables on the command line" do
       config.parse!(["foo=bar"])
       ENV["foo"].should == "bar"
-      config.feature_files.should == []
+      config.feature_files.should_not include('foo=bar')
     end
 
     it "should allow specifying environment variables in profiles" do
       given_cucumber_yml_defined_as({'selenium' => 'RAILS_ENV=selenium'})
       config.parse!(["--profile", "selenium"])
       ENV["RAILS_ENV"].should == "selenium"
-      config.feature_files.should == []
+      config.feature_files.should_not include('RAILS_ENV=selenium')
     end
 
   end

data/spec/cucumber/cli/main_spec.rb

@@ -14,6 +14,7 @@ module Cucumber
         @err = StringIO.new
         Kernel.stub!(:exit).and_return(nil)
         File.stub!(:exist?).and_return(false) # When Configuration checks for cucumber.yml
+        Dir.stub!(:[]).and_return([]) # to prevent cucumber's features dir to being laoded
       end
 
       describe "verbose mode" do
@@ -22,15 +23,6 @@ module Cucumber
           @empty_feature = Ast::Feature.new(nil, Ast::Comment.new(''), Ast::Tags.new(2, []), "Feature", [])
         end
 
-        it "should show ruby files required" do
-          @cli = Main.new(%w{--verbose --require example.rb}, @out)
-          @cli.stub!(:require)
-
-          @cli.execute!(Object.new.extend(StepMother))
-
-          @out.string.should include('example.rb')
-        end
-
         it "should show feature files parsed" do
           @cli = Main.new(%w{--verbose example.feature}, @out)
           @cli.stub!(:require)

data/spec/cucumber/cli/options_spec.rb

@@ -209,6 +209,10 @@ module Cli
           options[:source].should be_false
         end
 
+        it "uses the language from profile when none is specified on the command line" do
+          given_cucumber_yml_defined_as({'foo' => '--language fr'})
+          after_parsing('-p foo') {options[:lang].should == 'fr'}
+        end
       end
 
       context '-P or --no-profile' do
@@ -278,28 +282,38 @@ module Cli
                                       'baz' => '-r some_file.rb')
         options.parse!(%w[features -p foo --profile bar])
 
-        options.expanded_args_without_drb.should == %w[features -v --wip -r some_file.rb]
+        options.expanded_args_without_drb.should == %w[features -v --wip -r some_file.rb --no-profile]
       end
 
       it "removes the --drb flag so that the args can be safely passed to the drb server" do
         given_cucumber_yml_defined_as('default' => 'features -f pretty --drb')
         options.parse!(%w[--profile default])
 
-        options.expanded_args_without_drb.should == %w[features -f pretty]
+        options.expanded_args_without_drb.should == %w[features -f pretty --no-profile]
       end
 
       it "contains the environment variables" do
         options.parse!(%w[features FOO=bar])
-        options.expanded_args_without_drb.should == %w[features FOO=bar]
+        options.expanded_args_without_drb.should == %w[features FOO=bar --no-profile]
       end
 
       it "ignores the paths from the profiles if one was specified on the command line" do
         given_cucumber_yml_defined_as('foo' => 'features --drb')
         options.parse!(%w[some_feature.feature -p foo])
-        options.expanded_args_without_drb.should == %w[some_feature.feature]
+        options.expanded_args_without_drb.should == %w[some_feature.feature --no-profile]
       end
 
 
+      it "appends the --no-profile flag so that the DRb server doesn't reload the profiles" do
+        given_cucumber_yml_defined_as('foo' => 'features --drb')
+        options.parse!(%w[some_feature.feature -p foo])
+        options.expanded_args_without_drb.should == %w[some_feature.feature --no-profile]
+      end
+
+      it "does not append --no-profile if already present" do
+        options.parse!(%w[some_feature.feature -P])
+        options.expanded_args_without_drb.should == %w[some_feature.feature -P]
+      end
 
 
     end

data/spec/cucumber/step_mother_spec.rb

@@ -72,6 +72,14 @@ spec/cucumber/step_mother_spec.rb:40:in `/Three cute (.*)/'
       wrong = @step_mother.Given(/Three (.*)/) {|animal|}
       @step_mother.step_match("Three blind mice ran far").step_definition.should == right
     end
+
+    it "should pick most specific step definition when --guess is enabled and unequal number of capture groups" do
+      @step_mother.options = {:guess => true}
+      general       = @step_mother.Given(/Three (.*) mice ran (.*)/) {|disability|}
+      specific      = @step_mother.Given(/Three blind mice ran far/) {}
+      more_specific = @step_mother.Given(/^Three blind mice ran far$/) {}
+      @step_mother.step_match("Three blind mice ran far").step_definition.should == more_specific
+    end
     
     it "should raise Undefined error when no step definitions match" do
       lambda do
@@ -101,7 +109,7 @@ spec/cucumber/step_mother_spec.rb:40:in `/Three cute (.*)/'
         raise "Should fail"
       rescue NilWorld => e
         e.message.should == "World procs should never return nil"
-        e.backtrace.should == ["spec/cucumber/step_mother_spec.rb:96:in `World'"]
+        e.backtrace.should == ["spec/cucumber/step_mother_spec.rb:104:in `World'"]
       end
     end
 
@@ -132,8 +140,8 @@ spec/cucumber/step_mother_spec.rb:40:in `/Three cute (.*)/'
       end.should raise_error(MultipleWorld, %{You can only pass a proc to #World once, but it's happening
 in 2 places:
 
-spec/cucumber/step_mother_spec.rb:129:in `World'
-spec/cucumber/step_mother_spec.rb:131:in `World'
+spec/cucumber/step_mother_spec.rb:137:in `World'
+spec/cucumber/step_mother_spec.rb:139:in `World'
 
 Use Ruby modules instead to extend your worlds. See the Cucumber::StepMother#World RDoc
 or http://wiki.github.com/aslakhellesoy/cucumber/a-whole-new-world.

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: cucumber
 version: !ruby/object:Gem::Version 
-  version: 0.3.94
+  version: 0.3.95
 platform: ruby
 authors: 
 - "Aslak Helles\xC3\xB8y"
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-08-06 00:00:00 +02:00
+date: 2009-08-13 00:00:00 +02:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -388,6 +388,7 @@ files:
 - lib/cucumber/cli/main.rb
 - lib/cucumber/cli/options.rb
 - lib/cucumber/cli/profile_loader.rb
+- lib/cucumber/cli/rb_step_def_loader.rb
 - lib/cucumber/core_ext/exception.rb
 - lib/cucumber/core_ext/instance_exec.rb
 - lib/cucumber/core_ext/proc.rb
@@ -430,6 +431,7 @@ files:
 - lib/cucumber/step_match.rb
 - lib/cucumber/step_mother.rb
 - lib/cucumber/version.rb
+- lib/cucumber/webrat/element_locator.rb
 - lib/cucumber/webrat/table_locator.rb
 - lib/cucumber/world.rb
 - rails_generators/cucumber/USAGE