From 375aaa9db1bb808f9126e3a057c80fca0c631ba6 Mon Sep 17 00:00:00 2001 From: Emilio Tagua Date: Thu, 18 Nov 2010 16:07:23 -0300 Subject: Enable IdentityMap when generating new apps. --- railties/test/isolation/abstract_unit.rb | 12 ++++++++++++ 1 file changed, 12 insertions(+) (limited to 'railties/test/isolation/abstract_unit.rb') diff --git a/railties/test/isolation/abstract_unit.rb b/railties/test/isolation/abstract_unit.rb index 3b03e4eb3d..3a582f850f 100644 --- a/railties/test/isolation/abstract_unit.rb +++ b/railties/test/isolation/abstract_unit.rb @@ -215,6 +215,17 @@ module TestHelpers end end + def remove_from_config(str) + application_file = "#{app_path}/config/application.rb" + environment = File.read(application_file) + lines = File.readlines(application_file) + if environment =~ /(\n\s*end\s*end\s*)\Z/ + File.open(application_file, 'w') do |f| + lines.each {|line| f.puts(line) unless line =~ /#{str}/ } + end + end + end + def app_file(path, contents) FileUtils.mkdir_p File.dirname("#{app_path}/#{path}") File.open("#{app_path}/#{path}", 'w') do |f| @@ -231,6 +242,7 @@ module TestHelpers :activemodel, :activerecord, :activeresource] - arr + remove_from_config "config.active_record" if to_remove.include? :activerecord $:.reject! {|path| path =~ %r'/(#{to_remove.join('|')})/' } end -- cgit v1.2.3