4 files changed, 75 insertions, 35 deletions
diff --git a/railties/test/application/initializers/load_path_test.rb b/railties/test/application/initializers/load_path_test.rb
index d31915e129..714d62311d 100644
--- a/railties/test/application/initializers/load_path_test.rb
+++ b/railties/test/application/initializers/load_path_test.rb
@@ -19,7 +19,7 @@ module ApplicationTests
       assert $:.include?("#{app_path}/app/models")
     end
 
-    test "initializing an application adds lib path on inheritance hook" do
+    test "initializing an application allows to load code on lib path inside application class definitation" do
       app_file "lib/foo.rb", <<-RUBY
         module Foo; end
       RUBY
diff --git a/railties/test/application/loading_test.rb b/railties/test/application/loading_test.rb
new file mode 100644
index 0000000000..b337d3fc6e
--- /dev/null
+++ b/railties/test/application/loading_test.rb
@@ -0,0 +1,73 @@
+require 'isolation/abstract_unit'
+
+class LoadingTest < Test::Unit::TestCase
+  include ActiveSupport::Testing::Isolation
+
+  def setup
+    build_app
+    boot_rails
+  end
+
+  def app
+    @app ||= Rails.application
+  end
+
+  def test_load_should_load_constants
+    app_file "app/models/post.rb", <<-MODEL
+      class Post < ActiveRecord::Base
+        validates_acceptance_of :title, :accept => "omg"
+      end
+    MODEL
+  
+    require "#{rails_root}/config/environment"
+    setup_ar!
+  
+    p = Post.create(:title => 'omg')
+    assert_equal 1, Post.count
+    assert_equal 'omg', p.title
+    p = Post.first
+    assert_equal 'omg', p.title
+  end
+
+  def test_descendants_are_cleaned_on_each_request_without_cache_classes
+    add_to_config <<-RUBY
+      config.cache_classes = false
+    RUBY
+
+    app_file "app/models/post.rb", <<-MODEL
+      class Post < ActiveRecord::Base
+      end
+    MODEL
+
+    app_file 'config/routes.rb', <<-RUBY
+      AppTemplate::Application.routes.draw do |map|
+        match '/load',   :to => lambda { |env| [200, {}, Post.all] }
+        match '/unload', :to => lambda { |env| [200, {}, []] }
+      end
+    RUBY
+
+    require 'rack/test'
+    extend Rack::Test::Methods
+
+    require "#{rails_root}/config/environment"
+    setup_ar!
+
+    assert_equal [], ActiveRecord::Base.descendants
+    get "/load"
+    assert_equal [Post], ActiveRecord::Base.descendants
+    get "/unload"
+    assert_equal [], ActiveRecord::Base.descendants
+  end
+
+  protected
+  
+  def setup_ar!
+    ActiveRecord::Base.establish_connection(:adapter => "sqlite3", :database => ":memory:")
+    ActiveRecord::Migration.verbose = false
+    ActiveRecord::Schema.define(:version => 1) do
+      create_table :posts do |t|
+        t.string :title
+      end
+    end
+  end
+end
diff --git a/railties/test/application/model_initialization_test.rb b/railties/test/application/model_initialization_test.rb
deleted file mode 100644
index 6a22f8d8df..0000000000
--- a/railties/test/application/model_initialization_test.rb
+++ /dev/null
@@ -1,33 +0,0 @@
-require 'isolation/abstract_unit'
-
-class PostTest < Test::Unit::TestCase
-  include ActiveSupport::Testing::Isolation
-
-  def setup
-    build_app
-    boot_rails
-  end
-
-  def test_reload_should_reload_constants
-    app_file "app/models/post.rb", <<-MODEL
-      class Post < ActiveRecord::Base
-        validates_acceptance_of :title, :accept => "omg"
-      end
-    MODEL
-
-    require "#{rails_root}/config/environment"
-    ActiveRecord::Base.establish_connection(:adapter => "sqlite3", :database => ":memory:")
-    ActiveRecord::Migration.verbose = false
-    ActiveRecord::Schema.define(:version => 1) do
-      create_table :posts do |t|
-        t.string :title
-      end
-    end
-
-    p = Post.create(:title => 'omg')
-    assert_equal 1, Post.count
-    assert_equal 'omg', p.title
-    p = Post.first
-    assert_equal 'omg', p.title
-  end
-end
diff --git a/railties/test/application/rake_test.rb b/railties/test/application/rake_test.rb
index 6b7a471494..40fb446b16 100644
--- a/railties/test/application/rake_test.rb
+++ b/railties/test/application/rake_test.rb
@@ -9,7 +9,7 @@ module ApplicationTests
       boot_rails
       FileUtils.rm_rf("#{app_path}/config/environments")
     end
-    
+
     def test_gems_tasks_are_loaded_first_than_application_ones
       app_file "lib/tasks/app.rake", <<-RUBY
         $task_loaded = Rake::Task.task_defined?("db:create:all")