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 /activemodel | |
| 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 'activemodel')
| -rw-r--r-- | activemodel/Gemfile | 12 | ||||
| -rw-r--r-- | activemodel/test/cases/helper.rb | 13 |
2 files changed, 6 insertions, 19 deletions
diff --git a/activemodel/Gemfile b/activemodel/Gemfile deleted file mode 100644 index a192fdaf82..0000000000 --- a/activemodel/Gemfile +++ /dev/null @@ -1,12 +0,0 @@ -rails_root = Pathname.new(File.dirname(__FILE__)).join("..") - -Gem.sources.each { |uri| source uri } - -gem "activesupport", "3.0.pre", :vendored_at => rails_root.join("activesupport") -gem "arel", :git => "git://github.com/rails/arel.git" - -only :test do - gem "sqlite3-ruby" -end - -disable_system_gems diff --git a/activemodel/test/cases/helper.rb b/activemodel/test/cases/helper.rb index e54c85938b..49783c2735 100644 --- a/activemodel/test/cases/helper.rb +++ b/activemodel/test/cases/helper.rb @@ -1,13 +1,12 @@ -bundled = "#{File.dirname(__FILE__)}/../vendor/gems/environment" -if File.exist?("#{bundled}.rb") - require bundled -else - $:.unshift(File.dirname(__FILE__) + '/../../lib') - $:.unshift(File.dirname(__FILE__) + '/../../../activesupport/lib') +root = File.expand_path('../../../..', __FILE__) +begin + require "#{root}/vendor/gems/environment" +rescue LoadError + $:.unshift("#{root}/activesupport/lib") + $:.unshift("#{root}/activemodel/lib") end require 'config' - require 'active_model' # Show backtraces for deprecated behavior for quicker cleanup. |