From c5f60e419a94e4ec61a5cb02f231da0298a291bf Mon Sep 17 00:00:00 2001 From: evanweaver Date: Tue, 15 Jan 2008 17:46:18 +0000 Subject: [PATCH] loud boot.rb git-svn-id: svn://rubyforge.org/var/svn/fauna/has_many_polymorphs/trunk@1342 c1ad287d-65d5-445d-b84c-e64f8492f1e6 --- test/generator/tagging_generator_test.rb | 4 +--- test/integration/app/config/boot.rb | 2 ++ test/integration/server_test.rb | 2 +- test/test_helper.rb | 5 ++++- 4 files changed, 8 insertions(+), 5 deletions(-) diff --git a/test/generator/tagging_generator_test.rb b/test/generator/tagging_generator_test.rb index f9105db..91a5324 100644 --- a/test/generator/tagging_generator_test.rb +++ b/test/generator/tagging_generator_test.rb @@ -21,9 +21,7 @@ class TaggingGeneratorTest < Test::Unit::TestCase # Rebuild database Echoe.silence do - system("rake db:drop") - system("rake db:create") - system("rake db:migrate") + system("ruby #{HERE}/setup.rb") end end end diff --git a/test/integration/app/config/boot.rb b/test/integration/app/config/boot.rb index b71c198..cb9a72d 100644 --- a/test/integration/app/config/boot.rb +++ b/test/integration/app/config/boot.rb @@ -55,8 +55,10 @@ module Rails def load_rails_gem if version = self.class.gem_version + STDERR.puts "Boot.rb loading version #{version}" gem 'rails', version else + STDERR.puts "Boot.rb loading latest available version" gem 'rails' end rescue Gem::LoadError => load_error diff --git a/test/integration/server_test.rb b/test/integration/server_test.rb index ad425e3..aa8322b 100644 --- a/test/integration/server_test.rb +++ b/test/integration/server_test.rb @@ -13,7 +13,7 @@ class ServerTest < Test::Unit::TestCase @pid = Process.fork do Dir.chdir RAILS_ROOT do # print "S" - exec("script/server -p #{PORT} &> /dev/null") + exec("script/server -p #{PORT} > /dev/null") end end sleep(5) diff --git a/test/test_helper.rb b/test/test_helper.rb index 9dac6c2..0b7658c 100644 --- a/test/test_helper.rb +++ b/test/test_helper.rb @@ -4,7 +4,10 @@ require 'rubygems' require 'echoe' require 'test/unit' require 'multi_rails_init' -require 'ruby-debug' + +if defined? MULTIRAILS_GEM_VERSION + ENV['RAILS_GEM_VERSION'] = MULTIRAILS_GEM_VERSION +end HERE = File.expand_path(File.dirname(__FILE__)) $LOAD_PATH << HERE -- 2.11.4.GIT