Merge remote-tracking branch 'origin/restore-xapian-rake-tasks' into rails-3-develop

1 files changed, 3 insertions, 1 deletions

diff --git a/Rakefile b/Rakefile
index 5fa2a360d..09582dd77 100644
--- a/Rakefile
+++ b/Rakefile
@@ -5,5 +5,7 @@ require File.expand_path('../config/application', __FILE__)
 require 'rake'
 Alaveteli::Application.load_tasks
 if Rails.env == 'test'
-    Dir[File.join(File.dirname(__FILE__),'commonlib','rblib','tests','*.rake')].each { |file| load(file) }
+    Dir[Rails.root.join('commonlib','rblib','tests','*.rake')].each { |file| load(file) }
 end
+# Make sure the the acts_as_xapian tasks are also loaded:
+Dir[Rails.root.join('lib','acts_as_xapian','tasks','*.rake')].each { |file| load(file) }