test suite: don't use Rails 3, avoid deprecation warning with 2.3.9

josei · Sep 9, 2010 · 060e61d · 060e61d
1 parent d2fb846
commit 060e61d
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 3 deletions.
diff --git a/test/boot.rb b/test/boot.rb
@@ -15,7 +15,7 @@
   if version
     gem 'rails', version
   else
-    gem 'actionpack'
-    gem 'activerecord'
+    gem 'actionpack', '< 3.0.0.a'
+    gem 'activerecord', '< 3.0.0.a'
   end
 end
diff --git a/test/lib/activerecord_test_connector.rb b/test/lib/activerecord_test_connector.rb
@@ -28,7 +28,8 @@ def self.setup
 
   def self.add_load_path(path)
     dep = defined?(ActiveSupport::Dependencies) ? ActiveSupport::Dependencies : ::Dependencies
-    dep.load_paths.unshift path
+    autoload_paths = dep.respond_to?(:autoload_paths) ? dep.autoload_paths : dep.load_paths
+    autoload_paths.unshift path
   end
 
   def self.setup_connection