7 files changed, 63 insertions, 8 deletions
diff --git a/railties/test/application/middleware_test.rb b/railties/test/application/middleware_test.rb
index 27374dcb28..d08f04bddb 100644
--- a/railties/test/application/middleware_test.rb
+++ b/railties/test/application/middleware_test.rb
@@ -20,20 +20,21 @@ module ApplicationTests
       assert_equal [
         "ActionDispatch::Static",
         "Rack::Lock",
+        "ActiveSupport::Cache::Strategy::LocalCache",
         "Rack::Runtime",
         "Rails::Rack::Logger",
         "ActionDispatch::ShowExceptions",
         "ActionDispatch::RemoteIp",
         "Rack::Sendfile",
         "ActionDispatch::Callbacks",
+        "ActiveRecord::ConnectionAdapters::ConnectionManagement",
+        "ActiveRecord::QueryCache",
         "ActionDispatch::Cookies",
         "ActionDispatch::Session::CookieStore",
         "ActionDispatch::Flash",
         "ActionDispatch::ParamsParser",
         "Rack::MethodOverride",
-        "ActionDispatch::Head",
-        "ActiveRecord::ConnectionAdapters::ConnectionManagement",
-        "ActiveRecord::QueryCache"
+        "ActionDispatch::Head"
       ], middleware
     end
 
diff --git a/railties/test/application/model_initialization_test.rb b/railties/test/application/model_initialization_test.rb
new file mode 100644
index 0000000000..6a22f8d8df
--- /dev/null
+++ b/railties/test/application/model_initialization_test.rb
@@ -0,0 +1,33 @@
+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/paths_test.rb b/railties/test/application/paths_test.rb
index 5ab558c026..978d677efc 100644
--- a/railties/test/application/paths_test.rb
+++ b/railties/test/application/paths_test.rb
@@ -48,7 +48,8 @@ module ApplicationTests
       assert_path @paths.tmp.cache, "tmp", "cache"
       assert_path @paths.config, "config"
       assert_path @paths.config.locales, "config", "locales", "en.yml"
-      assert_path @paths.config.environment, "config", "environments", "development.rb"
+      assert_path @paths.config.environment, "config", "environment.rb"
+      assert_path @paths.config.environments, "config", "environments", "development.rb"
 
       assert_equal root("app", "controllers"), @paths.app.controllers.to_a.first
     end
@@ -61,7 +62,7 @@ module ApplicationTests
     end
 
     test "environments has a glob equal to the current environment" do
-      assert_equal "#{Rails.env}.rb", @paths.config.environment.glob
+      assert_equal "#{Rails.env}.rb", @paths.config.environments.glob
     end
 
     test "load path includes each of the paths in config.paths as long as the directories exist" do
diff --git a/railties/test/application/rake_test.rb b/railties/test/application/rake_test.rb
index bf2da866f4..6b7a471494 100644
--- a/railties/test/application/rake_test.rb
+++ b/railties/test/application/rake_test.rb
@@ -19,5 +19,19 @@ module ApplicationTests
       ::Rails.application.load_tasks
       assert $task_loaded
     end
+
+    def test_environment_is_required_in_rake_tasks
+      app_file "config/environment.rb", <<-RUBY
+        SuperMiddleware = Struct.new(:app)
+
+        Rails::Application.configure do
+          config.middleware.use SuperMiddleware
+        end
+
+        Rails::Application.initialize!
+      RUBY
+
+      assert_match "SuperMiddleware", Dir.chdir(app_path){ `rake middleware` }
+    end
   end
 end
 \ No newline at end of file
diff --git a/railties/test/generators/actions_test.rb b/railties/test/generators/actions_test.rb
index 44e0640552..e6fab93a87 100644
--- a/railties/test/generators/actions_test.rb
+++ b/railties/test/generators/actions_test.rb
@@ -209,7 +209,7 @@ class ActionsTest < Rails::Generators::TestCase
 
   def test_readme
     run_generator
-    Rails::Generators::AppGenerator.expects(:source_root).returns(destination_root)
+    Rails::Generators::AppGenerator.expects(:source_root).times(2).returns(destination_root)
     assert_match(/Welcome to Rails/, action(:readme, "README"))
   end
 
diff --git a/railties/test/generators/app_generator_test.rb b/railties/test/generators/app_generator_test.rb
index 24e6d541c2..2e402c4f3a 100644
--- a/railties/test/generators/app_generator_test.rb
+++ b/railties/test/generators/app_generator_test.rb
@@ -58,6 +58,11 @@ class AppGeneratorTest < Rails::Generators::TestCase
     assert_no_file "public/stylesheets/application.css"
   end
 
+  def test_options_before_application_name_raises_an_error
+    content = capture(:stderr){ run_generator(["--skip-activerecord", destination_root]) }
+    assert_equal "Options should be given after the application name. For details run: rails --help\n", content
+  end
+  
   def test_name_collision_raises_an_error
     content = capture(:stderr){ run_generator [File.join(destination_root, "generate")] }
     assert_equal "Invalid application name generate. Please give a name which does not match one of the reserved rails words.\n", content
@@ -152,7 +157,7 @@ class AppGeneratorTest < Rails::Generators::TestCase
     template = %{ say "It works!" }
     template.instance_eval "def read; self; end" # Make the string respond to read
 
-    generator([destination_root], :template => path).expects(:open).with(path).returns(template)
+    generator([destination_root], :template => path).expects(:open).with(path, 'Accept' => 'application/x-thor-template').returns(template)
     assert_match /It works!/, silence(:stdout){ generator.invoke }
   end
 
diff --git a/railties/test/generators/mailer_generator_test.rb b/railties/test/generators/mailer_generator_test.rb
index 81d6afa221..850b45ff74 100644
--- a/railties/test/generators/mailer_generator_test.rb
+++ b/railties/test/generators/mailer_generator_test.rb
@@ -1,5 +1,6 @@
 require 'generators/generators_test_helper'
-require 'rails/generators/rails/mailer/mailer_generator'
+require 'rails/generators/mailer/mailer_generator'
+
 
 class MailerGeneratorTest < Rails::Generators::TestCase
   include GeneratorsTestHelper