Merge branch 'ar-test-cleanup' of git://git.geeksomnia.com/rails

git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@8681 5ecf4fe2-1ee6-0310-87b1-e25e094e27de

2 files changed, 3 insertions, 3 deletions

diff --git a/activerecord/test/connections/native_sqlite3/connection.rb b/activerecord/test/connections/native_sqlite3/connection.rb
index c0cfaadcfa..c517c2375e 100644
--- a/activerecord/test/connections/native_sqlite3/connection.rb
+++ b/activerecord/test/connections/native_sqlite3/connection.rb
@@ -6,7 +6,7 @@ ActiveRecord::Base.logger = Logger.new("debug.log")
 class SqliteError < StandardError
 end
 
-BASE_DIR = File.expand_path(File.dirname(__FILE__) + '/../../fixtures')
+BASE_DIR = FIXTURES_ROOT
 sqlite_test_db  = "#{BASE_DIR}/fixture_database.sqlite3"
 sqlite_test_db2 = "#{BASE_DIR}/fixture_database_2.sqlite3"
 
diff --git a/activerecord/test/connections/native_sqlite3/in_memory_connection.rb b/activerecord/test/connections/native_sqlite3/in_memory_connection.rb
index 2adf8b37af..6aba9719bb 100644
--- a/activerecord/test/connections/native_sqlite3/in_memory_connection.rb
+++ b/activerecord/test/connections/native_sqlite3/in_memory_connection.rb
@@ -8,11 +8,11 @@ end
 
 def make_connection(clazz, db_definitions_file)
   clazz.establish_connection(:adapter => 'sqlite3', :database  => ':memory:')
-  File.read("#{File.dirname(__FILE__)}/../../schema/#{db_definitions_file}").split(';').each do |command|
+  File.read(SCHEMA_ROOT + "/#{db_definitions_file}").split(';').each do |command|
     clazz.connection.execute(command) unless command.strip.empty?
   end
 end
 
 make_connection(ActiveRecord::Base, 'sqlite.sql')
 make_connection(Course, 'sqlite2.sql')
-load("#{File.dirname(__FILE__)}/../../schema/schema.rb")
+load(SCHEMA_ROOT + "/schema.rb")