cucumber 0.3.104 → 0.4.0.rc1

data/lib/cucumber/rake/task.rb

@@ -84,37 +84,12 @@ module Cucumber
 
       LIB = File.expand_path(File.dirname(__FILE__) + '/../..') #:nodoc:
 
-      # TODO: remove depreated accessors for 0.4.0
-      def self.deprecate_accessor(attribute) #:nodoc:
-        attr_reader attribute
-        class_eval <<-EOF, __FILE__, __LINE__ + 1
-          def #{attribute}=(value)
-            @#{attribute} = value
-            warn("\nWARNING: Cucumber::Rake::Task##{attribute} is deprecated and will be removed in 0.4.0.  Please use profiles for complex settings: http://wiki.github.com/aslakhellesoy/cucumber/using-rake#profiles\n")
-          end
-        EOF
-      end
-
       # Directories to add to the Ruby $LOAD_PATH
       attr_accessor :libs
 
       # Name of the cucumber binary to use for running features. Defaults to Cucumber::BINARY
       attr_accessor :binary
 
-      # Array of paths to specific step definition files to use
-      deprecate_accessor :step_list
-
-      # File pattern for finding step definitions. Defaults to 
-      # 'features/**/*.rb'.
-      deprecate_accessor :step_pattern
-
-      # Array of paths to specific features to run. 
-      deprecate_accessor :feature_list
-
-      # File pattern for finding features to run. Defaults to 
-      # 'features/**/*.feature'. Can be overridden by the FEATURE environment variable.
-      deprecate_accessor :feature_pattern
-
       # Extra options to pass to the cucumber binary. Can be overridden by the CUCUMBER_OPTS environment variable.
       # It's recommended to pass an Array, but if it's a String it will be #split by ' '.
       attr_accessor :cucumber_opts
@@ -138,16 +113,9 @@ module Cucumber
       # your load path and gems.
       attr_accessor :fork
 
-      # Define what profile to be used.  When used with cucumber_opts it is simply appended to it. Will be ignored when CUCUMBER_OPTS is used.
+      # Define what profile to be used.  When used with cucumber_opts it is simply appended 
+      # to it. Will be ignored when CUCUMBER_OPTS is used.
       attr_accessor :profile
-      def profile=(profile) #:nodoc:
-        @profile = profile
-        unless feature_list
-          # TODO: remove once we completely remove these from the rake task.
-          @step_list = []
-          @feature_list = [] # Don't use accessor to avoid deprecation warning.
-        end
-      end
 
       # Define Cucumber Rake task
       def initialize(task_name = "cucumber", desc = "Run Cucumber features")
@@ -158,9 +126,6 @@ module Cucumber
 
         yield self if block_given?
 
-        @feature_pattern = "features/**/*.feature" if feature_pattern.nil? && feature_list.nil?
-        @step_pattern    = "features/**/*.rb"      if step_pattern.nil? && step_list.nil?
-
         @binary = binary.nil? ? Cucumber::BINARY : File.expand_path(binary)
         @libs.insert(0, LIB) if binary == Cucumber::BINARY
 
@@ -177,11 +142,11 @@ module Cucumber
       def runner(task_args = nil) #:nodoc:
         cucumber_opts = [(ENV['CUCUMBER_OPTS'] ? ENV['CUCUMBER_OPTS'].split(/\s+/) : nil) || cucumber_opts_with_profile]
         if(@rcov)
-          RCovCucumberRunner.new(libs, binary, cucumber_opts, feature_files(task_args), rcov_opts)
+          RCovCucumberRunner.new(libs, binary, cucumber_opts, feature_files, rcov_opts)
         elsif(@fork)
-          ForkedCucumberRunner.new(libs, binary, cucumber_opts, feature_files(task_args))
+          ForkedCucumberRunner.new(libs, binary, cucumber_opts, feature_files)
         else
-          InProcessCucumberRunner.new(libs, cucumber_opts, feature_files(task_args))
+          InProcessCucumberRunner.new(libs, cucumber_opts, feature_files)
         end
       end
 
@@ -189,53 +154,13 @@ module Cucumber
         @profile ? [cucumber_opts, '--profile', @profile] : cucumber_opts
       end
 
-      def feature_files(task_args = nil) #:nodoc:
-        if ENV['FEATURE']
-          FileList[ ENV['FEATURE'] ]
-        else
-          result = []
-          result += feature_list.to_a if feature_list
-          result += FileList[feature_pattern].to_a if feature_pattern
-          result = make_command_line_safe(result)
-          FileList[result]
-        end
-      end
-
-      def step_files(task_args = nil) #:nodoc:
-        if ENV['STEPS']
-          FileList[ ENV['STEPS'] ]
-        else
-          result = []
-          result += Array(step_list) if step_list
-          result += Array(FileList[step_pattern]) if step_pattern
-          FileList[result]
-        end
+      def feature_files #:nodoc:
+        make_command_line_safe(FileList[ ENV['FEATURE'] || [] ])
       end
 
-      private
       def make_command_line_safe(list)
         list.map{|string| string.gsub(' ', '\ ')}
       end
     end
-
-    class FeatureTask < Task
-
-      def initialize(task_name = "feature", desc = "Run a specified feature with Cucumber.  #{task_name}[feature_name]")
-        super(task_name, desc)
-      end
-
-      def define_task #:nodoc:
-        desc @desc
-        task @task_name, :feature_name do |t, args|
-          runner(args).run
-        end
-      end
-
-      def feature_files(task_arguments) #:nodoc:
-        FileList[File.join("features", "**", "#{task_arguments[:feature_name]}.feature")]
-      end
-
-    end
-
   end
 end

data/lib/cucumber/rb_support/rb_language.rb

@@ -67,10 +67,6 @@ module Cucumber
         @regexp_argument_matcher.arguments_from(regexp, step_name)
       end
 
-      def unmatched_step_definitions
-        @step_definitions.select{|step_definition| !step_definition.matched?}
-      end
-
       def snippet_text(step_keyword, step_name, multiline_arg_class = nil)
         escaped = Regexp.escape(step_name).gsub('\ ', ' ').gsub('/', '\/')
         escaped = escaped.gsub(PARAM_PATTERN, ESCAPED_PARAM_PATTERN)

data/lib/cucumber/rb_support/rb_step_definition.rb

@@ -27,10 +27,12 @@ module Cucumber
       def initialize(rb_language, regexp, proc)
         raise MissingProc if proc.nil?
         if String === regexp
-          p = regexp.gsub(/\$\w+/, '(.*)') # Replace $var with (.*)
+          p = Regexp.escape(regexp)
+          p = p.gsub(/\\\$\w+/, '(.*)') # Replace $var with (.*)
           regexp = Regexp.new("^#{p}$") 
         end
         @rb_language, @regexp, @proc = rb_language, regexp, proc
+        @rb_language.available_step_definition(regexp_source, file_colon_line)
       end
 
       def regexp_source
@@ -43,7 +45,7 @@ module Cucumber
 
       def arguments_from(step_name)
         args = RegexpArgumentMatcher.arguments_from(@regexp, step_name)
-        @matched = true if args
+        @rb_language.invoked_step_definition(regexp_source, file_colon_line) if args
         args
       end
 
@@ -58,10 +60,6 @@ module Cucumber
         end
       end
 
-      def matched?
-        @matched
-      end
-
       def file_colon_line
         @proc.file_colon_line
       end

data/lib/cucumber/rb_support/rb_transform.rb

@@ -17,18 +17,20 @@ module Cucumber
         end
       end
 
-      attr_reader :proc, :regexp
-      
       def initialize(rb_language, pattern, proc)
         raise MissingProc if proc.nil? || proc.arity < 1
-        @rb_language, @regexp, @proc = rb_language, Regexp.new(pattern), proc        
+        @rb_language, @regexp, @proc = rb_language, Regexp.new(pattern), proc
+      end
+
+      def match(arg)
+        arg.match(@regexp)
       end
 
       def invoke(arg)
-        if matched = regexp.match(arg)
-          args = Array(matched.captures.empty? ? arg : matched.captures)
-          @rb_language.current_world.cucumber_instance_exec(true, regexp.inspect, *args, &@proc)
-        end        
+        if matched = match(arg)
+          args = matched.captures.empty? ? [arg] : matched.captures
+          @rb_language.current_world.cucumber_instance_exec(true, @regexp.inspect, *args, &@proc)
+        end
       end
     end
   end

data/lib/cucumber/step_definition_light.rb

@@ -0,0 +1,20 @@
+module Cucumber
+  # Only used for keeping track of available and invoked step definitions
+  # in a way that also works for other programming languages (i.e. cuke4duke)
+  # Used for reporting purposes only (usage formatter).
+  class StepDefinitionLight
+    attr_reader :regexp_source, :file_colon_line
+    
+    def initialize(regexp_source, file_colon_line)
+      @regexp_source, @file_colon_line = regexp_source, file_colon_line
+    end
+    
+    def eql?(o)
+      regexp_source == o.regexp_source && file_colon_line == o.file_colon_line
+    end
+    
+    def hash
+      regexp_source.hash + 31*file_colon_line.hash
+    end
+  end
+end

data/lib/cucumber/step_match.rb

@@ -16,7 +16,7 @@ module Cucumber
 
     def invoke(multiline_arg)
       all_args = args
-      all_args << multiline_arg if multiline_arg
+      all_args << multiline_arg.dup if multiline_arg
       @step_definition.invoke(all_args)
     end
 

data/lib/cucumber/step_mother.rb

@@ -3,6 +3,7 @@ require 'cucumber/core_ext/instance_exec'
 require 'cucumber/parser/natural_language'
 require 'cucumber/language_support/language_methods'
 require 'cucumber/language_support/step_definition_methods'
+require 'cucumber/formatter/duration'
 
 module Cucumber
   # Raised when there is no matching StepDefinition for a step.
@@ -41,6 +42,7 @@ module Cucumber
   # This is the meaty part of Cucumber that ties everything together.
   class StepMother
     include Constantize
+    include Formatter::Duration
     attr_writer :options, :visitor, :log
 
     def initialize
@@ -53,6 +55,7 @@ module Cucumber
     def load_plain_text_features(feature_files)
       features = Ast::Features.new
 
+      start = Time.new
       log.debug("Features:\n")
       feature_files.each do |f|
         feature_file = FeatureFile.new(f)
@@ -62,7 +65,8 @@ module Cucumber
           log.debug("  * #{f}\n")
         end
       end
-      log.debug("\n")
+      duration = Time.now - start
+      log.debug("Parsing feature files took #{format_duration(duration)}\n\n")
       features
     end
 

data/lib/cucumber/version.rb

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

data/lib/cucumber/webrat/element_locator.rb

@@ -1,3 +1,5 @@
+require 'webrat'
+
 module Webrat
   class Element
     # Returns an Array of Array of String where each String is a

data/rails_generators/cucumber/cucumber_generator.rb

@@ -11,27 +11,26 @@ class CucumberGenerator < Rails::Generator::Base
   def manifest
     record do |m|
       m.directory 'features/step_definitions'
-      m.template  'webrat_steps.rb', 'features/step_definitions/webrat_steps.rb'
-      m.template  'cucumber_environment.rb', 'config/environments/cucumber.rb',
+      m.template 'webrat_steps.rb', 'features/step_definitions/webrat_steps.rb'
+      m.template'cucumber_environment.rb', 'config/environments/cucumber.rb',
         :assigns => { :cucumber_version => ::Cucumber::VERSION::STRING }
 
       m.gsub_file 'config/database.yml', /test:.*\n/, "test: &TEST\n"
       m.gsub_file 'config/database.yml', /\z/, "\ncucumber:\n  <<: *TEST"
 
       m.directory 'features/support'
-
       if spork?
-        m.template  'spork_env.rb',     'features/support/env.rb'
+        m.template'spork_env.rb', 'features/support/env.rb'
       else
-        m.template  'env.rb',           'features/support/env.rb'
+        m.template 'env.rb', 'features/support/env.rb'
       end
-
-      m.file      'paths.rb',         'features/support/paths.rb'
+      m.template 'paths.rb', 'features/support/paths.rb'
+      m.template 'version_check.rb', 'features/support/version_check.rb'
 
       m.directory 'lib/tasks'
-      m.template  'cucumber.rake',    'lib/tasks/cucumber.rake'
+      m.template'cucumber.rake', 'lib/tasks/cucumber.rake'
 
-      m.file      'cucumber',         'script/cucumber', {
+      m.file 'cucumber', 'script/cucumber', {
         :chmod => 0755, :shebang => options[:shebang] == DEFAULT_SHEBANG ? nil : options[:shebang]
       }
     end

data/rails_generators/cucumber/templates/cucumber

@@ -1,9 +1,17 @@
 #!/usr/bin/env ruby
-begin
-  load File.expand_path(File.dirname(__FILE__) + "/../vendor/plugins/cucumber/bin/cucumber")
-rescue LoadError => e
-  raise unless e.to_s =~ /cucumber/  
-  require 'rubygems'
+
+vendored_cucumber_binary = Dir[File.join(File.dirname(__FILE__),
+                                         '..',
+                                         'vendor',
+                                         '{gems,plugins}',
+                                         'cucumber*',
+                                         'bin',
+                                         'cucumber')].first
+
+if vendored_cucumber_binary
+  load File.expand_path(vendored_cucumber_binary)
+else
+  require 'rubygems' unless ENV['NO_RUBYGEMS']
   require 'cucumber'
   load Cucumber::BINARY
-end
+end

data/rails_generators/cucumber/templates/cucumber.rake

@@ -1,16 +1,24 @@
+# This file was generated by 
 $LOAD_PATH.unshift(RAILS_ROOT + '/vendor/plugins/cucumber/lib') if File.directory?(RAILS_ROOT + '/vendor/plugins/cucumber/lib')
 
 unless ARGV.any? {|a| a =~ /^gems/}
 
 begin
   require 'cucumber/rake/task'
+
+  # Use vendored cucumber binary if possible. If it's not vendored,
+  # Cucumber::Rake::Task will automatically use installed gem's cucumber binary
+  vendored_cucumber_binary = Dir["#{RAILS_ROOT}/vendor/{gems,plugins}/cucumber*/bin/cucumber"].first
+
   namespace :cucumber do
     Cucumber::Rake::Task.new({:ok => 'db:test:prepare'}, 'Run features that should pass') do |t|
+      t.binary = vendored_cucumber_binary
       t.fork = true # You may get faster startup if you set this to false
       t.cucumber_opts = "--color --tags ~@wip --strict --format #{ENV['CUCUMBER_FORMAT'] || 'pretty'}<%= spork? ? ' --drb' : '' %>"
     end
 
     Cucumber::Rake::Task.new({:wip => 'db:test:prepare'}, 'Run features that are being worked on') do |t|
+      t.binary = vendored_cucumber_binary
       t.fork = true # You may get faster startup if you set this to false
       t.cucumber_opts = "--color --tags @wip:2 --wip --format #{ENV['CUCUMBER_FORMAT'] || 'pretty'}<%= spork? ? ' --drb' : '' %>"
     end
@@ -33,4 +41,4 @@ rescue LoadError
   end
 end
 
-end
+end

data/rails_generators/cucumber/templates/cucumber_environment.rb

@@ -1,3 +1,7 @@
+# IMPORTANT: This file was generated by Cucumber <%= Cucumber::VERSION::STRING %>
+# Edit at your own peril - it's recommended to regenerate this file
+# in the future when you upgrade to a newer version of Cucumber.
+
 config.cache_classes = true # This must be true for Cucumber to operate correctly!
 
 # Log error messages when you accidentally call methods on nil.
@@ -22,5 +26,5 @@ config.gem 'rspec',       :lib => false,        :version => '>=1.2.8' unless Fil
 config.gem 'rspec-rails', :lib => false,        :version => '>=1.2.7.1' unless File.directory?(File.join(Rails.root, 'vendor/plugins/rspec-rails'))
 <% end %>
 <% if spork? -%>
-config.gem 'spork',       :lib => false,        :version => '>=0.5.9' unless File.directory?(File.join(Rails.root, 'vendor/plugins/spork'))
+config.gem 'spork',       :lib => false,        :version => '>=0.7.2' unless File.directory?(File.join(Rails.root, 'vendor/plugins/spork'))
 <% end %>

data/rails_generators/cucumber/templates/env.rb

@@ -1,34 +1,49 @@
+# IMPORTANT: This file was generated by Cucumber <%= Cucumber::VERSION::STRING %>
+# Edit at your own peril - it's recommended to regenerate this file
+# in the future when you upgrade to a newer version of Cucumber.
+# Consider adding your own code to a new file instead of editing this one.
+
 # Sets up the Rails environment for Cucumber
 ENV["RAILS_ENV"] ||= "cucumber"
 require File.expand_path(File.dirname(__FILE__) + '/../../config/environment')
 require 'cucumber/rails/world'
 
-# Whether or not to run each scenario within a database transaction.
+# If you set this to true, each scenario will run in a database transaction.
+# You can still turn off transactions on a per-scenario basis, simply tagging 
+# a feature or scenario with the @no-txn tag. 
+#
+# If you set this to false, transactions will be off for all scenarios,
+# regardless of whether you use @no-txn or not.
 #
-# If you leave this to true, you can turn off traqnsactions on a
-# per-scenario basis, simply tagging it with @no-txn
+# Beware that turning transactions off will leave data in your database 
+# after each scenario, which can lead to hard-to-debug failures in 
+# subsequent scenarios. If you do this, we recommend you create a Before
+# block that will explicitly put your database in a known state.
 Cucumber::Rails::World.use_transactional_fixtures = true
 
-# Whether or not to allow Rails to rescue errors and render them on
-# an error page. Default is false, which will cause an error to be
-# raised.
+# If you set this to false, any error raised from within your app will bubble 
+# up to your step definition and out to cucumber unless you catch it somewhere
+# on the way. You can make Rails rescue errors and render error pages on a
+# per-scenario basis by tagging a scenario or feature with the @allow-rescue tag.
 #
-# If you leave this to false, you can turn on Rails rescuing on a
-# per-scenario basis, simply tagging it with @allow-rescue
+# If you set this to true, Rails will rescue all errors and render error
+# pages, more or less in the same way your application would behave in the
+# default production environment. It's not recommended to do this for all
+# of your scenarios, as this makes it hard to discover errors in your application.
 ActionController::Base.allow_rescue = false
 
+require 'cucumber'
 # Comment out the next line if you don't want Cucumber Unicode support
 require 'cucumber/formatter/unicode'
-
-require 'webrat'
 require 'cucumber/webrat/element_locator' # Lets you do table.diff!(element_at('#my_table_or_dl_or_ul_or_ol').to_table)
+<% if framework == :rspec -%>
+require 'cucumber/rails/rspec'
+<% end -%>
 
+require 'webrat'
+require 'webrat/core/matchers' 
 Webrat.configure do |config|
   config.mode = :rails
   config.open_error_files = false # Set to true if you want error pages to pop up in the browser
 end
-<% if framework == :rspec -%>
 
-require 'cucumber/rails/rspec'
-require 'webrat/core/matchers'
-<% end -%>