mirror of https://github.com/rails/rails
Bundle for railties tests too
This commit is contained in:
parent
2767036392
commit
4f6d8ceb04
|
@ -80,7 +80,7 @@ cd "#{root_dir}/railties" do
|
|||
puts
|
||||
puts "[CruiseControl] Building RailTies"
|
||||
puts
|
||||
build_results[:railties] = system 'rake'
|
||||
build_results[:railties] = system 'gem bundle && rake'
|
||||
end
|
||||
|
||||
|
||||
|
|
|
@ -1,14 +1,14 @@
|
|||
ORIG_ARGV = ARGV.dup
|
||||
|
||||
require 'rubygems'
|
||||
gem 'rack', '~> 1.0.0'
|
||||
gem 'rack-test', '~> 0.5.0'
|
||||
bundled = "#{File.dirname(__FILE__)}/../vendor/gems/environment"
|
||||
if File.exist?("#{bundled}.rb")
|
||||
require bundled
|
||||
else
|
||||
%w(activesupport activemodel activerecord actionpack actionmailer activeresource).each do |lib|
|
||||
$LOAD_PATH.unshift "#{File.dirname(__FILE__)}/../../#{lib}/lib"
|
||||
end
|
||||
end
|
||||
|
||||
$:.unshift File.dirname(__FILE__) + "/../../activesupport/lib"
|
||||
$:.unshift File.dirname(__FILE__) + "/../../activerecord/lib"
|
||||
$:.unshift File.dirname(__FILE__) + "/../../actionpack/lib"
|
||||
$:.unshift File.dirname(__FILE__) + "/../../actionmailer/lib"
|
||||
$:.unshift File.dirname(__FILE__) + "/../../activeresource/lib"
|
||||
$:.unshift File.dirname(__FILE__) + "/../lib"
|
||||
$:.unshift File.dirname(__FILE__) + "/../builtin/rails_info"
|
||||
|
||||
|
@ -25,4 +25,4 @@ require 'rails'
|
|||
|
||||
Rails::Initializer.run do |config|
|
||||
config.root = File.dirname(__FILE__)
|
||||
end
|
||||
end
|
||||
|
|
|
@ -114,18 +114,26 @@ module TestHelpers
|
|||
end
|
||||
|
||||
def boot_rails
|
||||
%w(
|
||||
actionmailer/lib
|
||||
actionpack/lib
|
||||
activemodel/lib
|
||||
activerecord/lib
|
||||
activeresource/lib
|
||||
activesupport/lib
|
||||
railties/lib
|
||||
railties
|
||||
).reverse_each do |path|
|
||||
path = File.expand_path("../../../../#{path}", __FILE__)
|
||||
$:.unshift(path)
|
||||
bundled = "#{File.dirname(__FILE__)}/../../vendor/gems/environment"
|
||||
if File.exist?("#{bundled}.rb")
|
||||
require bundled
|
||||
%w(railties railties/lib).each do |path|
|
||||
$LOAD_PATH.unshift File.expand_path("../../../../#{path}", __FILE__)
|
||||
end
|
||||
else
|
||||
%w(
|
||||
actionmailer/lib
|
||||
actionpack/lib
|
||||
activemodel/lib
|
||||
activerecord/lib
|
||||
activeresource/lib
|
||||
activesupport/lib
|
||||
railties/lib
|
||||
railties
|
||||
).reverse_each do |path|
|
||||
path = File.expand_path("../../../../#{path}", __FILE__)
|
||||
$:.unshift(path)
|
||||
end
|
||||
end
|
||||
end
|
||||
end
|
||||
|
|
Loading…
Reference in New Issue