Permalink
Browse files

Don't force test suite to use bundler

  • Loading branch information...
josh committed Sep 13, 2009
1 parent f3f2e0b commit a9f5f4bb451a0e0c666dc694a870371e7cc3ee99
View
@@ -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..."
@@ -1,3 +1,4 @@
+require 'thread'
require 'cgi'
require 'action_view/helpers/url_helper'
require 'action_view/helpers/tag_helper'
@@ -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')
@@ -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'

0 comments on commit a9f5f4b

Please sign in to comment.