Permalink
Browse files

Move active_record_unit to shared load path

  • Loading branch information...
1 parent ca72078 commit b7c031f52ecca11558edd494d292ff6b99dd21b7 @jeremy jeremy committed May 22, 2009
Showing with 3 additions and 3 deletions.
  1. +3 −3 actionpack/test/{ → lib}/active_record_unit.rb
@@ -16,7 +16,7 @@ class ActiveRecordTestConnector
else
$stderr.print 'Attempting to load Active Record... '
begin
- PATH_TO_AR = "#{File.dirname(__FILE__)}/../../activerecord/lib"
+ PATH_TO_AR = "#{File.dirname(__FILE__)}/../../../activerecord/lib"
raise LoadError, "#{PATH_TO_AR} doesn't exist" unless File.directory?(PATH_TO_AR)
$LOAD_PATH.unshift PATH_TO_AR
require 'active_record'
@@ -72,13 +72,13 @@ def setup_connection
# Load actionpack sqlite tables
def load_schema
- File.read(File.dirname(__FILE__) + "/fixtures/db_definitions/sqlite.sql").split(';').each do |sql|
+ File.read(File.dirname(__FILE__) + "/../fixtures/db_definitions/sqlite.sql").split(';').each do |sql|
ActiveRecord::Base.connection.execute(sql) unless sql.blank?
end
end
def require_fixture_models
- Dir.glob(File.dirname(__FILE__) + "/fixtures/*.rb").each {|f| require f}
+ Dir.glob(File.dirname(__FILE__) + "/../fixtures/*.rb").each {|f| require f}
end
end
end

0 comments on commit b7c031f

Please sign in to comment.