Merged Rails 2.2 branch. Redmine now requires Rails 2.2.2.

git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@2493 e93f8b46-1217-0410-a6f0-8f06a7374b81

1 files changed, 4 insertions, 2 deletions

diff --git a/vendor/plugins/engines/Rakefile b/vendor/plugins/engines/Rakefile
index 904fbb68f..b9640226c 100644
--- a/vendor/plugins/engines/Rakefile
+++ b/vendor/plugins/engines/Rakefile
@@ -92,7 +92,7 @@ namespace :test do
             run ["cd #{vendor_dir}",
                  "mkdir rails",
                  "cd rails",
-                 "curl -s -L http://github.com/rails/rails/tarball/v2.1.0 | tar xzv --strip-components 1"]
+                 "curl -s -L http://github.com/rails/rails/tarball/#{ENV['RAILS']} | tar xzv --strip-components 1"]
           else
             out.puts "    Cloning Rails Tag #{ENV['RAILS']} from GitHub (can be slow - set CURL=true to use curl)"
             run ["cd #{vendor_dir}",
@@ -124,6 +124,8 @@ namespace :test do
           h[env] = {"adapter" => "sqlite3", "database" => "engines_#{env}.sqlite3"} ; h
         end.to_yaml)
       end
+      out.puts "    installing exception_notification plugin"
+      run "cd #{test_app_dir} && ./script/plugin install git://github.com/rails/exception_notification.git"
     end
   end
   
@@ -207,5 +209,5 @@ end
 task :test => "test:mirror_engine_files" do
   puts "> Loading the test application environment and running tests"
   # We use exec here to replace the current running rake process
-  exec("cd #{test_app_dir} && rake")
+  exec("cd #{test_app_dir} && rake db:migrate && rake")
 end