From 2def5b6314e1fbbaa789d1311e488ffac498703d Mon Sep 17 00:00:00 2001 From: madlep Date: Sat, 4 Oct 2008 18:13:14 +1000 Subject: [PATCH] Fixed load path for actionmailer and activesupport tests to always load from local lib files. [#983 state:committed] Signed-off-by: Jeremy Kemper --- actionmailer/test/abstract_unit.rb | 2 ++ actionpack/test/abstract_unit.rb | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/actionmailer/test/abstract_unit.rb b/actionmailer/test/abstract_unit.rb index 107b2e8bbe..905f25c9f7 100644 --- a/actionmailer/test/abstract_unit.rb +++ b/actionmailer/test/abstract_unit.rb @@ -1,6 +1,8 @@ require 'test/unit' $:.unshift "#{File.dirname(__FILE__)}/../lib" +$:.unshift "#{File.dirname(__FILE__)}/../../activesupport/lib" +$:.unshift "#{File.dirname(__FILE__)}/../../actionpack/lib" require 'action_mailer' require 'action_mailer/test_case' diff --git a/actionpack/test/abstract_unit.rb b/actionpack/test/abstract_unit.rb index 9db4cddd6a..673efa6af0 100644 --- a/actionpack/test/abstract_unit.rb +++ b/actionpack/test/abstract_unit.rb @@ -1,5 +1,5 @@ $:.unshift(File.dirname(__FILE__) + '/../lib') -$:.unshift(File.dirname(__FILE__) + '/../../activesupport/lib/active_support') +$:.unshift(File.dirname(__FILE__) + '/../../activesupport/lib') $:.unshift(File.dirname(__FILE__) + '/fixtures/helpers') require 'yaml'