diff options
| author | Yehuda Katz + Carl Lerche <ykatz+clerche@engineyard.com> | 2009-10-20 16:33:54 -0700 |
|---|---|---|
| committer | Yehuda Katz + Carl Lerche <ykatz+clerche@engineyard.com> | 2009-10-20 16:34:44 -0700 |
| commit | 4f6d6f7031a88b647814fc0154e6b69b636dc912 (patch) | |
| tree | 9752430c715e0b5d32713882c267d41554710246 /activesupport/lib | |
| parent | a5c82a9dfb6d63bf90a3378da0b71d6ea592d7e3 (diff) | |
| download | rails-4f6d6f7031a88b647814fc0154e6b69b636dc912.tar.gz rails-4f6d6f7031a88b647814fc0154e6b69b636dc912.tar.bz2 rails-4f6d6f7031a88b647814fc0154e6b69b636dc912.zip | |
Have all the tests running off a single Gemfile
Diffstat (limited to 'activesupport/lib')
| -rw-r--r-- | activesupport/lib/active_support/testing/isolation.rb | 2 | ||||
| -rw-r--r-- | activesupport/lib/active_support/vendor.rb | 5 |
2 files changed, 4 insertions, 3 deletions
diff --git a/activesupport/lib/active_support/testing/isolation.rb b/activesupport/lib/active_support/testing/isolation.rb index 8f7d1c29a9..c75b59c284 100644 --- a/activesupport/lib/active_support/testing/isolation.rb +++ b/activesupport/lib/active_support/testing/isolation.rb @@ -1,5 +1,3 @@ -require "active_support/core_ext/load_error" - module ActiveSupport module Testing class ProxyTestResult diff --git a/activesupport/lib/active_support/vendor.rb b/activesupport/lib/active_support/vendor.rb index 9f464c8246..0f9b0c7554 100644 --- a/activesupport/lib/active_support/vendor.rb +++ b/activesupport/lib/active_support/vendor.rb @@ -1,3 +1,5 @@ +require 'pathname' + def ActiveSupport.requirable?(file) $LOAD_PATH.any? { |p| Dir.glob("#{p}/#{file}.*").any? } end @@ -10,7 +12,8 @@ end gem lib, "~> #{version}" # Use the vendored lib if the gem's missing or we aren't using RubyGems. rescue LoadError, NoMethodError - $LOAD_PATH.unshift File.expand_path("#{File.dirname(__FILE__)}/vendor/#{lib}-#{version}/lib") + # There could be symlinks + $LOAD_PATH.unshift Pathname.new(__FILE__).dirname.join("vendor/#{lib}-#{version}/lib").realpath.to_s end end end |