@@ -21,5 +21,5 @@ config.action_controller.allow_forgery_protection = false # ActionMailer::Base.deliveries array. config.action_mailer.delivery_method = :test -config.gem 'rspec', :lib => 'spec', :version => "1.1.11" -config.gem 'rspec-rails', :lib => 'spec/rails', :version => "1.1.11" +config.gem 'rspec', :lib => 'spec', :version => "1.2.4" +config.gem 'rspec-rails', :lib => 'spec/rails', :version => "1.2.4" config/environments/test.rb @@ -1,12 +1,51 @@ -raise "To avoid rake task loading problems: run 'rake clobber' in vendor/plugins/rspec" if File.directory?(File.join(File.dirname(__FILE__), *%w[.. .. vendor plugins rspec pkg])) -raise "To avoid rake task loading problems: run 'rake clobber' in vendor/plugins/rspec-rails" if File.directory?(File.join(File.dirname(__FILE__), *%w[.. .. vendor plugins rspec-rails pkg])) +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/} + +begin + require 'spec/rake/spectask' +rescue MissingSourceFile + module Spec + module Rake + class SpecTask + def initialize(name) + task name do + # if rspec-rails is a configured gem, this will output helpful material and exit ... + require File.expand_path(File.dirname(__FILE__) + "/../../config/environment") -# In rails 1.2, plugins aren't available in the path until they're loaded. -# Check to see if the rspec plugin is installed first and require -# it if it is. If not, use the gem version. -rspec_base = File.expand_path(File.dirname(__FILE__) + '/../../vendor/plugins/rspec/lib') -$LOAD_PATH.unshift(rspec_base) if File.exist?(rspec_base) -require 'spec/rake/spectask' + # ... otherwise, do this: + raise <<-MSG + +#{"*" * 80} +* You are trying to run an rspec rake task defined in +* #{__FILE__}, +* but rspec can not be found in vendor/gems, vendor/plugins or system gems. +#{"*" * 80} +MSG + end + end + end + end + end +end + +Rake.application.instance_variable_get('@tasks').delete('default') spec_prereq = File.exist?(File.join(RAILS_ROOT, 'config', 'database.yml')) ? "db:test:prepare" : :noop task :noop do @@ -31,33 +70,33 @@ namespace :spec do IO.readlines("#{RAILS_ROOT}/spec/rcov.opts").map {|l| l.chomp.split " "}.flatten end end - + desc "Print Specdoc for all specs (excluding plugin specs)" Spec::Rake::SpecTask.new(:doc) do |t| t.spec_opts = ["--format", "specdoc", "--dry-run"] t.spec_files = FileList['spec/**/*_spec.rb'] end - desc "Print Specdoc for all plugin specs" + desc "Print Specdoc for all plugin examples" Spec::Rake::SpecTask.new(:plugin_doc) do |t| t.spec_opts = ["--format", "specdoc", "--dry-run"] t.spec_files = FileList['vendor/plugins/**/spec/**/*_spec.rb'].exclude('vendor/plugins/rspec/*') end - [:models, :controllers, :views, :helpers, :lib].each do |sub| - desc "Run the specs under spec/#{sub}" + [:models, :controllers, :views, :helpers, :lib, :integration].each do |sub| + desc "Run the code examples in spec/#{sub}" Spec::Rake::SpecTask.new(sub => spec_prereq) do |t| t.spec_opts = ['--options', "\"#{RAILS_ROOT}/spec/spec.opts\""] t.spec_files = FileList["spec/#{sub}/**/*_spec.rb"] end end - - desc "Run the specs under vendor/plugins (except RSpec's own)" + + desc "Run the code examples in vendor/plugins (except RSpec's own)" Spec::Rake::SpecTask.new(:plugins => spec_prereq) do |t| t.spec_opts = ['--options', "\"#{RAILS_ROOT}/spec/spec.opts\""] t.spec_files = FileList['vendor/plugins/**/spec/**/*_spec.rb'].exclude('vendor/plugins/rspec/*').exclude("vendor/plugins/rspec-rails/*") end - + namespace :plugins do desc "Runs the examples for rspec_on_rails" Spec::Rake::SpecTask.new(:rspec_on_rails) do |t| @@ -74,36 +113,43 @@ namespace :spec do ::STATS_DIRECTORIES << %w(Controller\ specs spec/controllers) if File.exist?('spec/controllers') ::STATS_DIRECTORIES << %w(Helper\ specs spec/helpers) if File.exist?('spec/helpers') ::STATS_DIRECTORIES << %w(Library\ specs spec/lib) if File.exist?('spec/lib') + ::STATS_DIRECTORIES << %w(Routing\ specs spec/routing) if File.exist?('spec/routing') + ::STATS_DIRECTORIES << %w(Integration\ specs spec/integration) if File.exist?('spec/integration') ::CodeStatistics::TEST_TYPES << "Model specs" if File.exist?('spec/models') ::CodeStatistics::TEST_TYPES << "View specs" if File.exist?('spec/views') ::CodeStatistics::TEST_TYPES << "Controller specs" if File.exist?('spec/controllers') ::CodeStatistics::TEST_TYPES << "Helper specs" if File.exist?('spec/helpers') ::CodeStatistics::TEST_TYPES << "Library specs" if File.exist?('spec/lib') - ::STATS_DIRECTORIES.delete_if {|a| a[0] =~ /test/} + ::CodeStatistics::TEST_TYPES << "Routing specs" if File.exist?('spec/routing') + ::CodeStatistics::TEST_TYPES << "Integration specs" if File.exist?('spec/integration') end namespace :db do namespace :fixtures do - desc "Load fixtures (from spec/fixtures) into the current environment's database. Load specific fixtures using FIXTURES=x,y" + desc "Load fixtures (from spec/fixtures) into the current environment's database. Load specific fixtures using FIXTURES=x,y. Load from subdirectory in test/fixtures using FIXTURES_DIR=z." task :load => :environment do + ActiveRecord::Base.establish_connection(Rails.env) + base_dir = File.join(Rails.root, 'spec', 'fixtures') + fixtures_dir = ENV['FIXTURES_DIR'] ? File.join(base_dir, ENV['FIXTURES_DIR']) : base_dir + require 'active_record/fixtures' - ActiveRecord::Base.establish_connection(RAILS_ENV.to_sym) - (ENV['FIXTURES'] ? ENV['FIXTURES'].split(/,/) : Dir.glob(File.join(RAILS_ROOT, 'spec', 'fixtures', '*.{yml,csv}'))).each do |fixture_file| - Fixtures.create_fixtures('spec/fixtures', File.basename(fixture_file, '.*')) + (ENV['FIXTURES'] ? ENV['FIXTURES'].split(/,/).map {|f| File.join(fixtures_dir, f) } : Dir.glob(File.join(fixtures_dir, '*.{yml,csv}'))).each do |fixture_file| + Fixtures.create_fixtures(File.dirname(fixture_file), File.basename(fixture_file, '.*')) end end end end namespace :server do - daemonized_server_pid = File.expand_path("spec_server.pid", RAILS_ROOT + "/tmp") + daemonized_server_pid = File.expand_path("#{RAILS_ROOT}/tmp/pids/spec_server.pid") desc "start spec_server." task :start do if File.exist?(daemonized_server_pid) $stderr.puts "spec_server is already running." else - $stderr.puts "Starting up spec server." + $stderr.puts %Q{Starting up spec_server ...} + FileUtils.mkdir_p('tmp/pids') unless test ?d, 'tmp/pids' system("ruby", "script/spec_server", "--daemon", "--pid", daemonized_server_pid) end end @@ -113,20 +159,24 @@ namespace :spec do unless File.exist?(daemonized_server_pid) $stderr.puts "No server running." else - $stderr.puts "Shutting down spec_server." - system("kill", "-s", "TERM", File.read(daemonized_server_pid).strip) && + $stderr.puts "Shutting down spec_server ..." + system("kill", "-s", "TERM", File.read(daemonized_server_pid).strip) && File.delete(daemonized_server_pid) end end - desc "reload spec_server." - task :restart do - unless File.exist?(daemonized_server_pid) - $stderr.puts "No server running." + desc "restart spec_server." + task :restart => [:stop, :start] + + desc "check if spec server is running" + task :status do + if File.exist?(daemonized_server_pid) + $stderr.puts %Q{spec_server is running (PID: #{File.read(daemonized_server_pid).gsub("\n","")})} else - $stderr.puts "Reloading down spec_server." - system("kill", "-s", "USR2", File.read(daemonized_server_pid).strip) + $stderr.puts "No server running." end end end end + +end lib/tasks/rspec.rake @@ -1,3 +1,6 @@ #!/usr/bin/env ruby -ENV['RSPEC'] = 'true' -system 'autotest' \ No newline at end of file +gem 'test-unit', '1.2.3' if RUBY_VERSION.to_f >= 1.9 +ENV['RSPEC'] = 'true' # allows autotest to discover rspec +ENV['AUTOTEST'] = 'true' # allows autotest to run w/ color on linux +system((RUBY_PLATFORM =~ /mswin|mingw/ ? 'autotest.bat' : 'autotest'), *ARGV) || + $stderr.puts("Unable to find autotest. Please install ZenTest or fix your PATH") script/autospec @@ -1,4 +1,10 @@ #!/usr/bin/env ruby -$LOAD_PATH.unshift(File.expand_path(File.dirname(__FILE__) + "/../vendor/plugins/rspec/lib")) -require 'spec' -exit ::Spec::Runner::CommandLine.run(::Spec::Runner::OptionParser.parse(ARGV, STDERR, STDOUT)) +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.expand_path(File.dirname(__FILE__) + "/../config/environment") unless defined?(RAILS_ROOT) +end +require 'spec/autorun' +exit ::Spec::Runner::CommandLine.run script/spec @@ -1,116 +1,9 @@ #!/usr/bin/env ruby -$LOAD_PATH.unshift File.dirname(__FILE__) + '/../vendor/plugins/rspec/lib' # For rspec installed as plugin -require 'rubygems' -require 'drb/drb' -require 'rbconfig' -require 'spec' -require 'optparse' - -# This is based on Florian Weber's TDDMate -module Spec - module Runner - class RailsSpecServer - def run(argv, stderr, stdout) - $stdout = stdout - $stderr = stderr - - base = ActiveRecord::Base - def base.clear_reloadable_connections! - active_connections.each do |name, conn| - if conn.requires_reloading? - conn.disconnect! - active_connections.delete(name) - end - end - end - - if ActionController.const_defined?(:Dispatcher) - dispatcher = ::ActionController::Dispatcher.new($stdout) - dispatcher.cleanup_application - elsif ::Dispatcher.respond_to?(:reset_application!) - ::Dispatcher.reset_application! - else - raise "Application reloading failed" - end - if Object.const_defined?(:Fixtures) && Fixtures.respond_to?(:reset_cache) - Fixtures.reset_cache - end - - ::Dependencies.mechanism = :load - require_dependency('application.rb') unless Object.const_defined?(:ApplicationController) - load File.dirname(__FILE__) + '/../spec/spec_helper.rb' - - if in_memory_database? - load "#{RAILS_ROOT}/db/schema.rb" # use db agnostic schema by default - ActiveRecord::Migrator.up('db/migrate') # use migrations - end - - ::Spec::Runner::CommandLine.run( - ::Spec::Runner::OptionParser.parse( - argv, - $stderr, - $stdout - ) - ) - end +gem 'test-unit', '1.2.3' if RUBY_VERSION.to_f >= 1.9 - def in_memory_database? - ENV["RAILS_ENV"] == "test" and - ::ActiveRecord::Base.connection.class.to_s == "ActiveRecord::ConnectionAdapters::SQLite3Adapter" and - ::Rails::Configuration.new.database_configuration['test']['database'] == ':memory:' - end - end - end -end puts "Loading Rails environment" +ENV["RAILS_ENV"] ||= 'test' +require File.expand_path(File.dirname(__FILE__) + "/../config/environment") unless defined?(RAILS_ROOT) -ENV["RAILS_ENV"] = "test" -require File.expand_path(File.dirname(__FILE__) + "/../config/environment") -require 'dispatcher' - -def restart_test_server - puts "restarting" - config = ::Config::CONFIG - ruby = File::join(config['bindir'], config['ruby_install_name']) + config['EXEEXT'] - command_line = [ruby, $0, ARGV].flatten.join(' ') - exec(command_line) -end - -def daemonize(pid_file = nil) - return yield if $DEBUG - pid = Process.fork{ - Process.setsid - Dir.chdir(RAILS_ROOT) - trap("SIGINT"){ exit! 0 } - trap("SIGTERM"){ exit! 0 } - trap("SIGHUP"){ restart_test_server } - File.open("/dev/null"){|f| - STDERR.reopen f - STDIN.reopen f - STDOUT.reopen f - } - yield - } - puts "spec_server launched. (PID: %d)" % pid - File.open(pid_file,"w"){|f| f.puts pid } if pid_file - exit! 0 -end - -options = Hash.new -opts = OptionParser.new -opts.on("-d", "--daemon"){|v| options[:daemon] = true } -opts.on("-p", "--pid PIDFILE"){|v| options[:pid] = v } -opts.parse!(ARGV) - -puts "Ready" -exec_server = lambda { - trap("USR2") { restart_test_server } if Signal.list.has_key?("USR2") - DRb.start_service("druby://127.0.0.1:8989", Spec::Runner::RailsSpecServer.new) - DRb.thread.join -} - -if options[:daemon] - daemonize(options[:pid], &exec_server) -else - exec_server.call -end +require 'optparse' +require 'spec/rails/spec_server' script/spec_server @@ -1,2 +1,2 @@ ---exclude "spec/*,gems/*" +--exclude "spec/*,gems/*" --rails \ No newline at end of file spec/rcov.opts @@ -1,7 +1,4 @@ --colour ---format -progress ---loadby -mtime +--format progress +--loadby mtime --reverse ---backtrace \ No newline at end of file spec/spec.opts @@ -1,14 +1,16 @@ # This file is copied to ~/spec when you run 'ruby script/generate rspec' # from the project root directory. -ENV["RAILS_ENV"] = "test" -require File.expand_path(File.dirname(__FILE__) + "/../config/environment") -require 'spec' +ENV["RAILS_ENV"] ||= 'test' +require File.dirname(__FILE__) + "/../config/environment" unless defined?(RAILS_ROOT) +require 'spec/autorun' require 'spec/rails' require 'rspec_on_rails_on_crack' require 'model_stubbing' require File.dirname(__FILE__) + "/model_stubs" -#require 'ruby-debug' -#Debugger.start + +# Requires supporting files with custom matchers and macros, etc, +# in ./support/ and its subdirectories. +Dir["#{File.dirname(__FILE__)}/support/**/*.rb"].each {|f| require f} Spec::Runner.configure do |config| include AuthenticatedTestHelper @@ -19,13 +21,5 @@ Spec::Runner.configure do |config| def current_site(site) @controller.stub!(:current_site).and_return(@site = site ? sites(site) : nil) end - - # Sets the current user in the session from the user fixtures. -# def login_as(user) - # controller.stub!(:current_user).and_return(@user = user ? users(user) : nil) - # end - - #def authorize_as(user) - # @request.env["HTTP_AUTHORIZATION"] = user ? "Basic #{Base64.encode64("#{users(user).login}:test")}" : nil - #end + end spec/spec_helper.rb @@ -1,4 +1,4 @@ -module Spec::Extensions::Main +module Spec::DSL::Main def describe_access_for(controller, &block) RspecOnRailsOnCrack::ControllerAccessProxy.new(self, controller).instance_eval(&block) end vendor/plugins/rspec_on_rails_on_crack/lib/rspec_on_rails_on_crack/controller_example_group_methods.rb @@ -1,4 +1,4 @@ -module Spec::Extensions::Main +module Spec::DSL::Main def describe_validations_for(model, attributes, &block) describe model, "(validations)", :type => :model do before :all do vendor/plugins/rspec_on_rails_on_crack/lib/rspec_on_rails_on_crack/model_example_group_methods.rb a1df3095c0019e1f23cc1cf7760b5e62e8846c1b c3 courtenay@entp.com http://github.com/courtenay/altered_beast/commit/0c77eb00809958d674ea180f9714be45615c170b 0c77eb00809958d674ea180f9714be45615c170b 2009-08-04T11:38:00-07:00 2009-08-04T11:38:00-07:00 Upgrade rspec to 1.2.4, fix model stubbing, all tests pass! woot. 090ad8d449045b95a293873117ab0ae5733865c5 c3 courtenay@entp.com