lib/tasks/rspec.rake script/autospec @@ -1,4 +1,5 @@ #!/usr/bin/env ruby $LOAD_PATH.unshift(File.expand_path(File.dirname(__FILE__) + "/../vendor/plugins/rspec/lib")) +require 'rubygems' require 'spec' exit ::Spec::Runner::CommandLine.run(::Spec::Runner::OptionParser.parse(ARGV, STDERR, STDOUT)) script/spec @@ -1,5 +1,4 @@ #!/usr/bin/env ruby -$LOAD_PATH.unshift File.dirname(__FILE__) + '/../../rspec/lib' # For svn $LOAD_PATH.unshift File.dirname(__FILE__) + '/../vendor/plugins/rspec/lib' # For rspec installed as plugin require 'rubygems' require 'drb/drb' @@ -23,20 +22,29 @@ module Spec active_connections.delete(name) end end - end + end if ActionController.const_defined?(:Dispatcher) dispatcher = ::ActionController::Dispatcher.new($stdout) - dispatcher.cleanup_application(true) + 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, @@ -45,6 +53,12 @@ module Spec ) ) end + + 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 @@ -91,7 +105,7 @@ opts.parse!(ARGV) puts "Ready" exec_server = lambda { trap("USR2") { restart_test_server } if Signal.list.has_key?("USR2") - DRb.start_service("druby://localhost:8989", Spec::Runner::RailsSpecServer.new) + DRb.start_service("druby://127.0.0.1:8989", Spec::Runner::RailsSpecServer.new) DRb.thread.join } script/spec_server @@ -1,6 +1,4 @@ --colour ---format -progress ---loadby -mtime +--format progress +--loadby mtime --reverse spec/spec.opts @@ -28,6 +28,10 @@ Spec::Runner.configure do |config| # If you declare global fixtures, be aware that they will be declared # for all of your examples, even those that don't use them. # + # You can also declare which fixtures to use (for example fixtures for test/fixtures): + # + # config.fixture_path = RAILS_ROOT + '/spec/fixtures/' + # # == Mock Framework # # RSpec uses it's own mocking framework by default. If you prefer to @@ -36,6 +40,10 @@ Spec::Runner.configure do |config| # config.mock_with :mocha # config.mock_with :flexmock # config.mock_with :rr + # + # == Notes + # + # For more information take a look at Spec::Example::Configuration and Spec::Runner end ## spec/spec_helper.rb e5f92f63339a94f2259db7dda8026468d3196c2f Tim Riley tim@openmonkey.com http://github.com/timriley/flickr-portfolio/commit/757fccc3c0ac87c256c44da57348c96903624109 757fccc3c0ac87c256c44da57348c96903624109 2008-12-15T03:12:03-08:00 2008-12-15T03:12:03-08:00 upgrade to newer version of rpsec 91544faad4869e6db97dc015b1d9f88f7cc38e74 Tim Riley tim@openmonkey.com