cucumber.yml @@ -1,19 +1,4 @@ gem 'test-unit', '1.2.3' if RUBY_VERSION.to_f >= 1.9 -rspec_gem_dir = nil -Dir["#{RAILS_ROOT}/vendor/gems/*"].each do |subdir| - rspec_gem_dir = subdir if subdir.gsub("#{RAILS_ROOT}/vendor/gems/","") =~ /^(\w+-)?rspec-(\d+)/ && File.exist?("#{subdir}/lib/spec/rake/spectask.rb") -end -rspec_plugin_dir = File.expand_path(File.dirname(__FILE__) + '/../../vendor/plugins/rspec') - -if rspec_gem_dir && (test ?d, rspec_plugin_dir) - raise "\n#{'*'*50}\nYou have rspec installed in both vendor/gems and vendor/plugins\nPlease pick one and dispose of the other.\n#{'*'*50}\n\n" -end - -if rspec_gem_dir - $LOAD_PATH.unshift("#{rspec_gem_dir}/lib") -elsif File.exist?(rspec_plugin_dir) - $LOAD_PATH.unshift("#{rspec_plugin_dir}/lib") -end # Don't load rspec if running "rake gems:*" unless ARGV.any? {|a| a =~ /^gems/} @@ -120,7 +105,6 @@ namespace :spec do ::CodeStatistics::TEST_TYPES << "Helper specs" if File.exist?('spec/helpers') ::CodeStatistics::TEST_TYPES << "Library specs" if File.exist?('spec/lib') ::CodeStatistics::TEST_TYPES << "Routing specs" if File.exist?('spec/routing') - ::STATS_DIRECTORIES.delete_if {|a| a[0] =~ /test/} end namespace :db do lib/tasks/rspec.rake @@ -1,22 +1,10 @@ #!/usr/bin/env ruby -gem 'test-unit', '1.2.3' if RUBY_VERSION.to_f >= 1.9 -rails_root = File.expand_path(File.dirname(__FILE__) + "/..") -rspec_gem_dir = nil -Dir["#{rails_root}/vendor/gems/*"].each do |subdir| - rspec_gem_dir = subdir if subdir.gsub("#{rails_root}/vendor/gems/","") =~ /^(\w+-)?rspec-(\d+)/ && File.exist?("#{subdir}/lib/spec/rake/spectask.rb") +if ARGV.any? {|arg| %w[--drb -X --generate-options -G --help -h --version -v].include?(arg)} + require 'rubygems' unless ENV['NO_RUBYGEMS'] +else + gem 'test-unit', '1.2.3' if RUBY_VERSION.to_f >= 1.9 + ENV["RAILS_ENV"] ||= 'test' + require File.dirname(__FILE__) + "/../config/environment" unless defined?(RAILS_ROOT) end -rspec_plugin_dir = File.expand_path("#{rails_root}/vendor/plugins/rspec") - -if rspec_gem_dir && (test ?d, rspec_plugin_dir) - raise "\n#{'*'*50}\nYou have rspec installed in both vendor/gems and vendor/plugins\nPlease pick one and dispose of the other.\n#{'*'*50}\n\n" -end - -if rspec_gem_dir - $LOAD_PATH.unshift("#{rspec_gem_dir}/lib") -elsif File.exist?(rspec_plugin_dir) - $LOAD_PATH.unshift("#{rspec_plugin_dir}/lib") -end - - require 'spec/autorun' exit ::Spec::Runner::CommandLine.run script/spec @@ -1,52 +1,9 @@ #!/usr/bin/env ruby gem 'test-unit', '1.2.3' if RUBY_VERSION.to_f >= 1.9 -rails_root = File.expand_path(File.dirname(__FILE__) + "/..") -rspec_rails_gem_dir = nil -Dir["#{rails_root}/vendor/gems/*"].each do |subdir| - rspec_rails_gem_dir = subdir if subdir.gsub("#{rails_root}/vendor/gems/","") =~ /^(\w+-)?rspec-rails-(\d+)/ -end -rspec_rails_plugin_dir = File.expand_path("#{rails_root}/vendor/plugins/rspec-rails") -if rspec_rails_gem_dir && (test ?d, rspec_rails_plugin_dir) - raise "\n#{'*'*50}\nYou have rspec installed in both vendor/gems and vendor/plugins\nPlease pick one and dispose of the other.\n#{'*'*50}\n\n" -end - -if rspec_rails_gem_dir - $LOAD_PATH.unshift("#{rspec_rails_gem_dir}/lib") -elsif File.exist?(rspec_rails_plugin_dir) - $LOAD_PATH.unshift("#{rspec_rails_plugin_dir}/lib") -end +puts "Loading Rails environment" +ENV["RAILS_ENV"] ||= 'test' +require File.dirname(__FILE__) + "/../config/environment" unless defined?(RAILS_ROOT) require 'optparse' require 'spec/rails/spec_server' - -puts "Loading Rails environment" - -ENV["RAILS_ENV"] = "test" -require File.expand_path(File.dirname(__FILE__) + "/../config/environment") - -if Rails::VERSION::STRING >= '2.2' && Rails.configuration.cache_classes - warn <<-MESSAGE - -#{'*'*50} - -spec_server won't reload your classes if config.cache_classes -is set to true. Please modify environment/test.rb: - - config.cache_classes = false - -#{'*'*50} -MESSAGE -end - -options = Hash.new -parser = OptionParser.new -parser.on("-d", "--daemon") {|ignore| options[:daemon] = true } -parser.on("-p", "--pid PIDFILE"){|pid| options[:pid] = pid } -parser.parse!(ARGV) - -if options[:daemon] - ::Spec::Rails::SpecServer.daemonize(options[:pid]) -else - ::Spec::Rails::SpecServer.run -end script/spec_server 893cdd09442d7d54fed0c53bf56ca794e31e9c2d Assaf Arkin assaf@labnotes.org http://github.com/intalio/singleshot/commit/6515018abba0efc1d72a149720c1bf9bbd3f649a 6515018abba0efc1d72a149720c1bf9bbd3f649a 2009-03-27T12:44:30-07:00 2009-03-27T12:44:30-07:00 Upgraded to RSpec 1.2.2, added cucumber.yml file a09bf9c0507af11718f9c9db60a4b093d1e7df37 Assaf Arkin assaf@labnotes.org