diff options
author | José Valim <jose.valim@gmail.com> | 2012-06-29 15:25:47 +0200 |
---|---|---|
committer | José Valim <jose.valim@gmail.com> | 2012-06-29 15:43:16 +0200 |
commit | 0470ddcf0301e537d5151d62177eadba5eae182d (patch) | |
tree | 0e338721443be0cee97735c2bfba65bb10d51412 /railties/test | |
parent | e9e6f63d9c038273136d687e8055d03f43ea2fc1 (diff) | |
download | rails-0470ddcf0301e537d5151d62177eadba5eae182d.tar.gz rails-0470ddcf0301e537d5151d62177eadba5eae182d.tar.bz2 rails-0470ddcf0301e537d5151d62177eadba5eae182d.zip |
Remove unnecessary Railties structure now that plugins are gone
Diffstat (limited to 'railties/test')
-rw-r--r-- | railties/test/isolation/abstract_unit.rb | 16 |
1 files changed, 5 insertions, 11 deletions
diff --git a/railties/test/isolation/abstract_unit.rb b/railties/test/isolation/abstract_unit.rb index 800b1c90f0..6071cd3f39 100644 --- a/railties/test/isolation/abstract_unit.rb +++ b/railties/test/isolation/abstract_unit.rb @@ -273,24 +273,18 @@ end # Create a scope and build a fixture rails app Module.new do extend TestHelpers::Paths + # Build a rails app - if File.exist?(app_template_path) - FileUtils.rm_rf(app_template_path) - end + FileUtils.rm_rf(app_template_path) FileUtils.mkdir(app_template_path) environment = File.expand_path('../../../../load_paths', __FILE__) - if File.exist?("#{environment}.rb") - require_environment = "-r #{environment}" - end + require_environment = "-r #{environment}" `#{Gem.ruby} #{require_environment} #{RAILS_FRAMEWORK_ROOT}/railties/bin/rails new #{app_template_path}` + File.open("#{app_template_path}/config/boot.rb", 'w') do |f| - if require_environment - f.puts "Dir.chdir('#{File.dirname(environment)}') do" - f.puts " require '#{environment}'" - f.puts "end" - end + f.puts "require '#{environment}'" f.puts "require 'rails/all'" end end unless defined?(RAILS_ISOLATED_ENGINE) |