diff options
| author | Pratik Naik <pratiknaik@gmail.com> | 2010-03-12 16:00:01 +0000 |
|---|---|---|
| committer | Pratik Naik <pratiknaik@gmail.com> | 2010-03-12 16:00:01 +0000 |
| commit | e68bfaf1fe1a7890a67af6f444281185f507cf9e (patch) | |
| tree | 5e73caccdcdd65d0ac97f9eb92195928f30925f2 /activeresource/test/abstract_unit.rb | |
| parent | ef6462c73003b28c8e060a06120abb9cd67b6d52 (diff) | |
| parent | 16846553b8866eab2aa3b128a2a23a221a25f7e3 (diff) | |
| download | rails-e68bfaf1fe1a7890a67af6f444281185f507cf9e.tar.gz rails-e68bfaf1fe1a7890a67af6f444281185f507cf9e.tar.bz2 rails-e68bfaf1fe1a7890a67af6f444281185f507cf9e.zip | |
Merge remote branch 'mainstream/master'
Conflicts:
activerecord/lib/active_record/base.rb
railties/lib/rails/configuration.rb
railties/lib/rails/log_subscriber.rb
Diffstat (limited to 'activeresource/test/abstract_unit.rb')
| -rw-r--r-- | activeresource/test/abstract_unit.rb | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/activeresource/test/abstract_unit.rb b/activeresource/test/abstract_unit.rb index 1af535e811..fcb770d612 100644 --- a/activeresource/test/abstract_unit.rb +++ b/activeresource/test/abstract_unit.rb @@ -1,12 +1,14 @@ require File.expand_path('../../../load_paths', __FILE__) +lib = File.expand_path("#{File.dirname(__FILE__)}/../lib") +$:.unshift(lib) unless $:.include?('lib') || $:.include?(lib) + require 'rubygems' require 'test/unit' require 'active_resource' require 'active_support' require 'active_support/test_case' -$:.unshift "#{File.dirname(__FILE__)}/../test" require 'setter_trap' require 'logger' |