diff options
Diffstat (limited to 'actionpack')
| -rw-r--r-- | actionpack/test/lib/active_record_unit.rb (renamed from actionpack/test/active_record_unit.rb) | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/actionpack/test/active_record_unit.rb b/actionpack/test/lib/active_record_unit.rb index 9e0c66055d..1ba308e9d7 100644 --- a/actionpack/test/active_record_unit.rb +++ b/actionpack/test/lib/active_record_unit.rb @@ -16,7 +16,7 @@ if defined?(ActiveRecord) && defined?(Fixtures) 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 @@ class ActiveRecordTestConnector # 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 |