diff options
| author | Joshua Peek <josh@joshpeek.com> | 2009-09-13 12:42:13 -0500 |
|---|---|---|
| committer | Joshua Peek <josh@joshpeek.com> | 2009-09-13 12:42:13 -0500 |
| commit | a9f5f4bb451a0e0c666dc694a870371e7cc3ee99 (patch) | |
| tree | d026be7e849a907bd83fda66944ee0232f32f194 /actionpack | |
| parent | f3f2e0b00d8b422fd5921fb709ac7a9570ad2a6a (diff) | |
| download | rails-a9f5f4bb451a0e0c666dc694a870371e7cc3ee99.tar.gz rails-a9f5f4bb451a0e0c666dc694a870371e7cc3ee99.tar.bz2 rails-a9f5f4bb451a0e0c666dc694a870371e7cc3ee99.zip | |
Don't force test suite to use bundler
Diffstat (limited to 'actionpack')
| -rw-r--r-- | actionpack/Rakefile | 2 | ||||
| -rw-r--r-- | actionpack/lib/action_view/helpers/asset_tag_helper.rb | 1 | ||||
| -rw-r--r-- | actionpack/test/abstract_unit.rb | 6 | ||||
| -rw-r--r-- | actionpack/test/new_base/test_helper.rb | 4 |
4 files changed, 10 insertions, 3 deletions
diff --git a/actionpack/Rakefile b/actionpack/Rakefile index 6d98aa3190..b923414cef 100644 --- a/actionpack/Rakefile +++ b/actionpack/Rakefile @@ -17,7 +17,7 @@ RUBY_FORGE_PROJECT = "actionpack" RUBY_FORGE_USER = "webster132" desc "Default Task" -task :default => [ :bundle, :test ] +task :default => :test task :bundle do puts "Checking if the bundled testing requirements are up to date..." diff --git a/actionpack/lib/action_view/helpers/asset_tag_helper.rb b/actionpack/lib/action_view/helpers/asset_tag_helper.rb index 6b00e7afb5..95f00cda39 100644 --- a/actionpack/lib/action_view/helpers/asset_tag_helper.rb +++ b/actionpack/lib/action_view/helpers/asset_tag_helper.rb @@ -1,3 +1,4 @@ +require 'thread' require 'cgi' require 'action_view/helpers/url_helper' require 'action_view/helpers/tag_helper' diff --git a/actionpack/test/abstract_unit.rb b/actionpack/test/abstract_unit.rb index 528180ae32..d88e5cea82 100644 --- a/actionpack/test/abstract_unit.rb +++ b/actionpack/test/abstract_unit.rb @@ -1,9 +1,13 @@ $:.unshift(File.dirname(__FILE__) + '/../lib') +$:.unshift(File.dirname(__FILE__) + '/../../activesupport/lib') +$:.unshift(File.dirname(__FILE__) + '/../../activemodel/lib') + $:.unshift(File.dirname(__FILE__) + '/lib') $:.unshift(File.dirname(__FILE__) + '/fixtures/helpers') $:.unshift(File.dirname(__FILE__) + '/fixtures/alternate_helpers') -require File.join(File.dirname(__FILE__), "..", "vendor", "gems", "environment") +bundler = File.join(File.dirname(__FILE__), '..', 'vendor', 'gems', 'environment') +require bundler if File.exist?("#{bundler}.rb") ENV['TMPDIR'] = File.join(File.dirname(__FILE__), 'tmp') diff --git a/actionpack/test/new_base/test_helper.rb b/actionpack/test/new_base/test_helper.rb index 5a901ab9d8..33ea519e77 100644 --- a/actionpack/test/new_base/test_helper.rb +++ b/actionpack/test/new_base/test_helper.rb @@ -1,7 +1,9 @@ $:.unshift(File.dirname(__FILE__) + '/../../lib') +$:.unshift(File.dirname(__FILE__) + '/../../../activesupport/lib') $:.unshift(File.dirname(__FILE__) + '/../lib') -require File.expand_path(File.join(File.dirname(__FILE__), "..", "..", "vendor", "gems", "environment")) +bundler = File.join(File.dirname(__FILE__), '..', '..', 'vendor', 'gems', 'environment') +require bundler if File.exist?("#{bundler}.rb") require 'test/unit' require 'active_support' |