diff options
| author | José Valim <jose.valim@gmail.com> | 2010-02-17 00:48:04 +0100 |
|---|---|---|
| committer | José Valim <jose.valim@gmail.com> | 2010-02-17 00:48:04 +0100 |
| commit | 3f948a0e2951a8bb7f32e98a404fb5ff97cb2896 (patch) | |
| tree | 8528d926c137a3a0f18c21642a8b6be1f334b6df /activerecord | |
| parent | d4e008fd0f9ebac3383a0c3ac093de68db9e2e66 (diff) | |
| parent | 762088a0ef1f69ab09833732cfe8190098303ee6 (diff) | |
| download | rails-3f948a0e2951a8bb7f32e98a404fb5ff97cb2896.tar.gz rails-3f948a0e2951a8bb7f32e98a404fb5ff97cb2896.tar.bz2 rails-3f948a0e2951a8bb7f32e98a404fb5ff97cb2896.zip | |
Merge master.
Diffstat (limited to 'activerecord')
| -rw-r--r-- | activerecord/lib/active_record.rb | 1 | ||||
| -rw-r--r-- | activerecord/test/cases/helper.rb | 5 | ||||
| -rw-r--r-- | activerecord/test/cases/log_subscriber_test.rb | 5 |
3 files changed, 8 insertions, 3 deletions
diff --git a/activerecord/lib/active_record.rb b/activerecord/lib/active_record.rb index b79da4565d..99ff0a19a5 100644 --- a/activerecord/lib/active_record.rb +++ b/activerecord/lib/active_record.rb @@ -21,7 +21,6 @@ # WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. #++ - activesupport_path = File.expand_path('../../../activesupport/lib', __FILE__) $:.unshift(activesupport_path) if File.directory?(activesupport_path) && !$:.include?(activesupport_path) diff --git a/activerecord/test/cases/helper.rb b/activerecord/test/cases/helper.rb index 9e8bfbbee8..3254e7d800 100644 --- a/activerecord/test/cases/helper.rb +++ b/activerecord/test/cases/helper.rb @@ -1,4 +1,7 @@ -require File.expand_path('../../../../load_paths', __FILE__) +require File.expand_path('../../../../bundler', __FILE__) + +lib = File.expand_path("#{File.dirname(__FILE__)}/../../lib") +$:.unshift(lib) unless $:.include?('lib') || $:.include?(lib) require 'config' diff --git a/activerecord/test/cases/log_subscriber_test.rb b/activerecord/test/cases/log_subscriber_test.rb index f0197ddf77..f854499435 100644 --- a/activerecord/test/cases/log_subscriber_test.rb +++ b/activerecord/test/cases/log_subscriber_test.rb @@ -1,3 +1,6 @@ +railties_path = File.expand_path('../../../../railties/lib', __FILE__) +$:.unshift(railties_path) if File.directory?(railties_path) && !$:.include?(railties_path) + require "cases/helper" require "models/developer" require "rails/log_subscriber/test_helper" @@ -39,4 +42,4 @@ class LogSubscriberTest < ActiveSupport::TestCase assert_match /CACHE/, @logger.logged(:debug).last assert_match /SELECT .*?FROM .?developers.?/, @logger.logged(:debug).last end -end
\ No newline at end of file +end |