Move fake controllers and models to a common load path

actionpack/Rakefile

@@ -24,9 +24,9 @@ task :default => [ :test ]
 desc "Run all unit tests"
 task :test => [:test_action_pack, :test_active_record_integration, :test_new_base, :test_new_base_on_old_tests]
 
-test_lib_dir = ENV["NEW"] ? "test/new_base" : "test"
+test_lib_dirs = [ENV["NEW"] ? "test/new_base" : "test", "test/lib"]
 Rake::TestTask.new(:test_action_pack) do |t|
-  t.libs << test_lib_dir
+  t.libs.concat test_lib_dirs
 
   # make sure we include the tests in alphabetical order as on some systems
   # this will not happen automatically and the tests (as a whole) will error
@@ -38,27 +38,27 @@ end
 task :isolated_test do
   ruby = File.join(*RbConfig::CONFIG.values_at('bindir', 'RUBY_INSTALL_NAME'))
   Dir.glob("test/{controller,dispatch,template}/**/*_test.rb").all? do |file|
-    system(ruby, "-Ilib:#{test_lib_dir}", file)
+    system(ruby, "-Ilib:#{test_lib_dirs * ':'}", file)
   end or raise "Failures"
 end
 
 desc 'ActiveRecord Integration Tests'
 Rake::TestTask.new(:test_active_record_integration) do |t|
-  t.libs << test_lib_dir
+  t.libs.concat test_lib_dirs
   t.test_files = Dir.glob("test/activerecord/*_test.rb")
   t.verbose = true
 end
 
 desc 'New Controller Tests'
 Rake::TestTask.new(:test_new_base) do |t|
-  t.libs << "test/new_base"
+  t.libs << "test/new_base" << "test/lib"
   t.test_files = Dir.glob("test/{abstract_controller,new_base}/*_test.rb")
   t.verbose = true
 end
 
 desc 'Old Controller Tests on New Base'
 Rake::TestTask.new(:test_new_base_on_old_tests) do |t|
-  t.libs << "test/new_base"
+  t.libs << "test/new_base" << "test/lib"
   # layout
   # Dir.glob( "test/{dispatch,template}/**/*_test.rb" ).sort +
   t.test_files = %w(

actionpack/test/controller/layout_test.rb

@@ -9,7 +9,7 @@
 
 ActionController::Base.view_paths = [ File.dirname(__FILE__) + '/../fixtures/layout_tests/' ]
 
-require "lib/fixture_template"
+require "fixture_template"
 
 class LayoutTest < ActionController::Base
   def self.controller_path; 'views' end