@@ -23,5 +23,3 @@ production: cucumber: <<: *TEST -cucumber: - <<: *TEST \ No newline at end of file config/database.yml @@ -59,5 +59,3 @@ Rails::Initializer.run do |config| end Haml::Template.options[:format] = :html5 - -require 'ar-extensions' \ No newline at end of file config/environment.rb @@ -1,4 +1,4 @@ -# IMPORTANT: This file was generated by Cucumber 0.4.2 +# IMPORTANT: This file was generated by Cucumber 0.4.3 # Edit at your own peril - it's recommended to regenerate this file # in the future when you upgrade to a newer version of Cucumber. @@ -19,11 +19,11 @@ config.action_controller.allow_forgery_protection = false # ActionMailer::Base.deliveries array. config.action_mailer.delivery_method = :test -config.gem 'cucumber', :lib => false, :version => '>=0.4.2' unless File.directory?(File.join(Rails.root, 'vendor/plugins/cucumber')) -config.gem 'webrat', :lib => false, :version => '>=0.5.0' unless File.directory?(File.join(Rails.root, 'vendor/plugins/webrat')) -config.gem 'rspec', :lib => false, :version => '>=1.2.8' unless File.directory?(File.join(Rails.root, 'vendor/plugins/rspec')) -config.gem 'rspec-rails', :lib => false, :version => '>=1.2.7.1' unless File.directory?(File.join(Rails.root, 'vendor/plugins/rspec-rails')) +config.gem 'cucumber', :lib => false, :version => '>=0.4.3' unless File.directory?(File.join(Rails.root, 'vendor/plugins/cucumber')) +config.gem 'webrat', :lib => false, :version => '>=0.5.3' unless File.directory?(File.join(Rails.root, 'vendor/plugins/webrat')) +config.gem 'rspec', :lib => false, :version => '>=1.2.9' unless File.directory?(File.join(Rails.root, 'vendor/plugins/rspec')) +config.gem 'rspec-rails', :lib => false, :version => '>=1.2.9' unless File.directory?(File.join(Rails.root, 'vendor/plugins/rspec-rails')) config.gem 'factory_girl', :version => '>= 1.2.3', - :source => 'http://gemcutter.org' \ No newline at end of file + :source => 'http://gemcutter.org' config/environments/cucumber.rb @@ -1,4 +1,4 @@ -# IMPORTANT: This file was generated by Cucumber 0.4.2 +# IMPORTANT: This file was generated by Cucumber 0.4.3 # 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. features/step_definitions/webrat_steps.rb @@ -1,4 +1,4 @@ -# IMPORTANT: This file was generated by Cucumber 0.4.2 +# IMPORTANT: This file was generated by Cucumber 0.4.3 # 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. features/support/env.rb @@ -1,10 +1,12 @@ -if Cucumber::VERSION != '0.4.2' +require 'cucumber/formatter/ansicolor' +extend Cucumber::Formatter::ANSIColor +if Cucumber::VERSION != '0.4.3' warning = <<-WARNING -(::) (::) (::) (::) (::) (::) (::) (::) (::) (::) (::) (::) (::) (::) (::) +#{red_cukes(15)} - (::) R O T T E N C U C U M B E R A L E R T (::) + #{red_cukes(1)} R O T T E N C U C U M B E R A L E R T #{red_cukes(1)} -Your #{__FILE__.gsub(/version_check.rb$/, 'env.rb')} file was generated with Cucumber 0.4.2, +Your #{__FILE__.gsub(/version_check.rb$/, 'env.rb')} file was generated with Cucumber 0.4.3, but you seem to be running Cucumber #{Cucumber::VERSION}. If you're running an older version than #{Cucumber::VERSION}, just upgrade your gem. If you're running a newer version than #{Cucumber::VERSION} you should: @@ -18,11 +20,11 @@ version than #{Cucumber::VERSION} you should: If you get prompted to replace a file, hit 'd' to see the difference. When you're sure you have captured any personal edits, confirm that you want to overwrite #{__FILE__.gsub(/version_check.rb$/, 'env.rb')} by pressing 'y'. Then reapply any -personal changes that may have been overwritten. +personal changes that may have been overwritten, preferably in separate files. This message will then self destruct. -(::) (::) (::) (::) (::) (::) (::) (::) (::) (::) (::) (::) (::) (::) (::) +#{red_cukes(15)} WARNING warn(warning) at_exit {warn(warning)} features/support/version_check.rb @@ -1,8 +1,16 @@ begin require File.join(File.dirname(__FILE__), 'lib', 'haml') # From here rescue LoadError - require 'haml' # From gem + begin + require 'haml' # From gem + rescue LoadError => e + # gems:install may be run to install Haml with the skeleton plugin + # but not the gem itself installed. + # Don't die if this is the case. + raise e unless defined?(Rake) && Rake.application.top_level_tasks.include?('gems:install') + end end -# Load Haml and Sass -Haml.init_rails(binding) +# Load Haml and Sass. +# Haml may be undefined if we're running gems:install. +Haml.init_rails(binding) if defined?(Haml) vendor/plugins/haml/init.rb 10aa497ff36a41d1758bb488898d8e087d0fe82c Rob Holland rob@the-it-refinery.co.uk http://github.com/snl/bookkeeper/commit/753dffd54d0ca1280a02099bd285696d60d96fa1 753dffd54d0ca1280a02099bd285696d60d96fa1 2009-11-13T02:52:15-08:00 2009-11-13T02:52:15-08:00 Cucumber bump. 248209e44bfe0c31b8d7aeff0d0efcff9ff48ce9 Rob Holland rob@the-it-refinery.co.uk