Merge Mail with latest Rails and move mail gem to Gemfile.

5 files changed, 150 insertions, 138 deletions

diff --git a/railties/test/application/configuration_test.rb b/railties/test/application/configuration_test.rb
index 89337b7f66..4d9da525d7 100644
--- a/railties/test/application/configuration_test.rb
+++ b/railties/test/application/configuration_test.rb
@@ -4,7 +4,16 @@ module ApplicationTests
   class InitializerTest < Test::Unit::TestCase
     include ActiveSupport::Testing::Isolation
 
+    def new_app
+      File.expand_path("#{app_path}/../new_app")
+    end
+
+    def copy_app
+      FileUtils.cp_r(app_path, new_app)
+    end
+
     def setup
+      FileUtils.rm_rf(new_app) if File.directory?(new_app)
       build_app
       boot_rails
     end
@@ -15,42 +24,42 @@ module ApplicationTests
     end
 
     test "the application root can be set" do
-      FileUtils.mkdir_p("#{app_path}/hello")
+      copy_app
       add_to_config <<-RUBY
-        config.frameworks = []
-        config.root = '#{app_path}/hello'
+        config.root = '#{new_app}'
       RUBY
-      require "#{app_path}/config/environment"
-      assert_equal Pathname.new("#{app_path}/hello"), Rails.application.root
-    end
 
-    test "the application root is detected as where config.ru is located" do
-      add_to_config <<-RUBY
-        config.frameworks = []
-      RUBY
-      FileUtils.mv "#{app_path}/config.ru", "#{app_path}/config/config.ru"
+      use_frameworks []
+
       require "#{app_path}/config/environment"
-      assert_equal Pathname.new("#{app_path}/config"), Rails.application.root
+      assert_equal Pathname.new(new_app), Rails.application.root
     end
 
     test "the application root is Dir.pwd if there is no config.ru" do
       File.delete("#{app_path}/config.ru")
-      add_to_config <<-RUBY
-        config.frameworks = []
-      RUBY
 
-      Dir.chdir("#{app_path}/app") do
+      use_frameworks []
+
+      Dir.chdir("#{app_path}") do
         require "#{app_path}/config/environment"
-        assert_equal Pathname.new("#{app_path}/app"), Rails.application.root
+        assert_equal Pathname.new("#{app_path}"), Rails.application.root
       end
     end
 
+    test "if there's no config.active_support.bare, all of ActiveSupport is required" do
+      use_frameworks []
+      require "#{app_path}/config/environment"
+      assert_nothing_raised { [1,2,3].rand }
+    end
+
     test "config.active_support.bare does not require all of ActiveSupport" do
-      add_to_config "config.frameworks = []; config.active_support.bare = true"
+      add_to_config "config.active_support.bare = true"
+
+      use_frameworks []
 
       Dir.chdir("#{app_path}/app") do
         require "#{app_path}/config/environment"
-        assert_raises(NoMethodError) { 1.day }
+        assert_raises(NoMethodError) { [1,2,3].rand }
       end
     end
 
@@ -60,7 +69,7 @@ module ApplicationTests
       RUBY
 
       require "#{app_path}/config/application"
-      assert AppTemplate.configuration.action_controller.allow_concurrency
+      assert AppTemplate::Application.config.action_controller.allow_concurrency
     end
 
     test "the application can be marked as threadsafe when there are no frameworks" do
diff --git a/railties/test/application/generators_test.rb b/railties/test/application/generators_test.rb
index 2ed49d1057..7b27c780aa 100644
--- a/railties/test/application/generators_test.rb
+++ b/railties/test/application/generators_test.rb
@@ -7,8 +7,6 @@ module ApplicationTests
     def setup
       build_app
       boot_rails
-      require "rails"
-      require "rails/generators"
     end
 
     def app_const
@@ -16,6 +14,8 @@ module ApplicationTests
     end
 
     def with_config
+      require "rails"
+      require "rails/generators"
       yield app_const.config
     end
 
@@ -46,14 +46,15 @@ module ApplicationTests
     end
 
     test "generators aliases and options on initialization" do
-      application = with_config do |c|
-        c.frameworks = []
-        c.generators.rails :aliases => { :test_framework => "-w" }
-        c.generators.orm :datamapper
-        c.generators.test_framework :rspec
-      end
+      add_to_config <<-RUBY
+        config.generators.rails :aliases => { :test_framework => "-w" }
+        config.generators.orm :datamapper
+        config.generators.test_framework :rspec
+      RUBY
+
+      require "#{app_path}/config/environment"
       # Initialize the application
-      app_const.initialize!
+      require "rails/generators"
       Rails::Generators.configure!
 
       assert_equal :rspec, Rails::Generators.options[:rails][:test_framework]
@@ -61,12 +62,13 @@ module ApplicationTests
     end
 
     test "generators no color on initialization" do
-      with_config do |c|
-        c.frameworks = []
-        c.generators.colorize_logging = false
-      end
+      add_to_config <<-RUBY
+        config.generators.colorize_logging = false
+      RUBY
+
       # Initialize the application
-      app_const.initialize!
+      require "#{app_path}/config/environment"
+      require "rails/generators"
       Rails::Generators.configure!
 
       assert_equal Thor::Base.shell, Thor::Shell::Basic
diff --git a/railties/test/application/initializer_test.rb b/railties/test/application/initializer_test.rb
index fa00d287ca..2ecc3e9e2d 100644
--- a/railties/test/application/initializer_test.rb
+++ b/railties/test/application/initializer_test.rb
@@ -6,33 +6,19 @@ module ApplicationTests
 
     def setup
       build_app
-      FileUtils.rm_rf("#{app_path}/config/environments")
       boot_rails
       require "rails"
     end
 
     test "initializing an application adds the application paths to the load path" do
-      Rails::Initializer.run do |config|
-        config.root = app_path
-      end
+      add_to_config <<-RUBY
+        config.root = "#{app_path}"
+      RUBY
 
-      Rails.initialize!
+      require "#{app_path}/config/environment"
       assert $:.include?("#{app_path}/app/models")
     end
 
-    test "adding an unknown framework raises an error" do
-      Rails::Initializer.run do |config|
-        config.root = app_path
-        config.frameworks << :action_foo
-      end
-
-      require "active_support/core_ext/load_error"
-
-      assert_raises MissingSourceFile do
-        Rails.initialize!
-      end
-    end
-
     test "eager loading loads parent classes before children" do
       app_file "lib/zoo.rb", <<-ZOO
         class Zoo ; include ReptileHouse ; end
@@ -41,12 +27,12 @@ module ApplicationTests
         module Zoo::ReptileHouse ; end
       ZOO
 
-      Rails::Initializer.run do |config|
-        config.root = app_path
+      add_to_config <<-RUBY
+        config.root = "#{app_path}"
         config.eager_load_paths = "#{app_path}/lib"
-      end
+      RUBY
 
-      Rails.initialize!
+      require "#{app_path}/config/environment"
 
       assert Zoo
     end
@@ -54,41 +40,43 @@ module ApplicationTests
     test "load environment with global" do
       app_file "config/environments/development.rb", "$initialize_test_set_from_env = 'success'"
       assert_nil $initialize_test_set_from_env
-      Rails::Initializer.run { |config| config.root = app_path }
-      Rails.initialize!
+      add_to_config <<-RUBY
+        config.root = "#{app_path}"
+      RUBY
+      require "#{app_path}/config/environment"
       assert_equal "success", $initialize_test_set_from_env
     end
 
     test "action_controller load paths set only if action controller in use" do
       assert_nothing_raised NameError do
-        Rails::Initializer.run do |config|
-          config.root = app_path
+        add_to_config <<-RUBY
+          config.root = "#{app_path}"
           config.frameworks = []
-        end
-        Rails.initialize!
+        RUBY
+        require "#{app_path}/config/environment"
       end
     end
 
     test "after_initialize block works correctly" do
-      Rails::Initializer.run do |config|
-        config.root = app_path
+      add_to_config <<-RUBY
+        config.root = "#{app_path}"
         config.after_initialize { $test_after_initialize_block1 = "success" }
         config.after_initialize { $test_after_initialize_block2 = "congratulations" }
-      end
-      Rails.initialize!
+      RUBY
+      require "#{app_path}/config/environment"
 
       assert_equal "success", $test_after_initialize_block1
       assert_equal "congratulations", $test_after_initialize_block2
     end
 
     test "after_initialize block works correctly when no block is passed" do
-      Rails::Initializer.run do |config|
-        config.root = app_path
+      add_to_config <<-RUBY
+        config.root = "#{app_path}"
         config.after_initialize { $test_after_initialize_block1 = "success" }
         config.after_initialize # don't pass a block, this is what we're testing!
         config.after_initialize { $test_after_initialize_block2 = "congratulations" }
-      end
-      Rails.initialize!
+      RUBY
+      require "#{app_path}/config/environment"
 
       assert_equal "success", $test_after_initialize_block1
       assert_equal "congratulations", $test_after_initialize_block2
@@ -96,35 +84,40 @@ module ApplicationTests
 
     # i18n
     test "setting another default locale" do
-      Rails::Initializer.run do |config|
-        config.root = app_path
+      add_to_config <<-RUBY
+        config.root = "#{app_path}"
         config.i18n.default_locale = :de
-      end
-      Rails.initialize!
+      RUBY
+      require "#{app_path}/config/environment"
 
       assert_equal :de, I18n.default_locale
     end
 
     test "no config locales dir present should return empty load path" do
       FileUtils.rm_rf "#{app_path}/config/locales"
-      Rails::Initializer.run do |c|
-        c.root = app_path
-        assert_equal [], c.i18n.load_path
-      end
+      add_to_config <<-RUBY
+        config.root = "#{app_path}"
+      RUBY
+      require "#{app_path}/config/environment"
+
+      assert_equal [], Rails.application.config.i18n.load_path
     end
 
     test "config locales dir present should be added to load path" do
-      Rails::Initializer.run do |c|
-        c.root = app_path
-        assert_equal ["#{app_path}/config/locales/en.yml"], c.i18n.load_path
-      end
+      add_to_config <<-RUBY
+        config.root = "#{app_path}"
+      RUBY
+
+      require "#{app_path}/config/environment"
+      assert_equal ["#{app_path}/config/locales/en.yml"],  Rails.application.config.i18n.load_path
     end
 
     test "config defaults should be added with config settings" do
-      Rails::Initializer.run do |c|
-        c.root = app_path
-        c.i18n.load_path << "my/other/locale.yml"
-      end
+      add_to_config <<-RUBY
+        config.root = "#{app_path}"
+        config.i18n.load_path << "my/other/locale.yml"
+      RUBY
+      require "#{app_path}/config/environment"
 
       assert_equal [
         "#{app_path}/config/locales/en.yml", "my/other/locale.yml"
@@ -133,64 +126,47 @@ module ApplicationTests
 
     # DB middleware
     test "database middleware doesn't initialize when session store is not active_record" do
-      Rails::Initializer.run do |config|
-        config.root = app_path
+      add_to_config <<-RUBY
+        config.root = "#{app_path}"
         config.action_controller.session_store = :cookie_store
-      end
-      Rails.initialize!
+      RUBY
+      require "#{app_path}/config/environment"
 
       assert !Rails.application.config.middleware.include?(ActiveRecord::SessionStore)
     end
 
-    test "database middleware doesn't initialize when activerecord is not in frameworks" do
-      Rails::Initializer.run do |c|
-        c.root = app_path
-        c.frameworks = []
-      end
-      assert_equal [], Rails.application.config.middleware
-    end
-
     test "database middleware initializes when session store is active record" do
-      Rails::Initializer.run do |c|
-        c.root = app_path
-        c.action_controller.session_store = :active_record_store
-      end
-      Rails.initialize!
+      add_to_config "config.action_controller.session_store = :active_record_store"
+
+      require "#{app_path}/config/environment"
 
       expects = [ActiveRecord::ConnectionAdapters::ConnectionManagement, ActiveRecord::QueryCache, ActiveRecord::SessionStore]
       middleware = Rails.application.config.middleware.map { |m| m.klass }
       assert_equal expects, middleware & expects
     end
 
-    test "ensure database middleware doesn't use action_controller on initializing" do
-      Rails::Initializer.run do |c|
-        c.root = app_path
-        c.frameworks -= [:action_controller]
-        c.action_controller.session_store = :active_record_store
-      end
-      Rails.initialize!
-
-      assert !Rails.application.config.middleware.include?(ActiveRecord::SessionStore)
+    test "Rails.root should be a Pathname" do
+      add_to_config <<-RUBY
+        config.root = "#{app_path}"
+      RUBY
+      require "#{app_path}/config/environment"
+      assert_instance_of Pathname, Rails.root
     end
+  end
 
-    # Pathview test
-    test "load view paths doesn't perform anything when action_view not in frameworks" do
-      Rails::Initializer.run do |c|
-        c.root = app_path
-        c.frameworks -= [:action_view]
-      end
-      Rails.initialize!
+  class InitializerCustomFrameworkExtensionsTest < Test::Unit::TestCase
+    include ActiveSupport::Testing::Isolation
 
-      assert_equal nil, ActionMailer::Base.template_root
-      assert_equal [], ActionController::Base.view_paths
+    def setup
+      build_app
+      boot_rails
     end
 
-    test "Rails.root should be a Pathname" do
-      Rails::Initializer.run do |c|
-        c.root = app_path
-      end
-      Rails.initialize!
-      assert_instance_of Pathname, Rails.root
+    test "database middleware doesn't initialize when activerecord is not in frameworks" do
+      use_frameworks []
+      require "#{app_path}/config/environment"
+
+      assert !defined?(ActiveRecord)
     end
   end
 end
\ No newline at end of file
diff --git a/railties/test/application/load_test.rb b/railties/test/application/load_test.rb
index e17f1ebdb0..1c5811b07a 100644
--- a/railties/test/application/load_test.rb
+++ b/railties/test/application/load_test.rb
@@ -1,6 +1,4 @@
 require "isolation/abstract_unit"
-# require "rails"
-# require 'action_dispatch'
 
 module ApplicationTests
   class LoadTest < Test::Unit::TestCase
@@ -22,8 +20,10 @@ module ApplicationTests
     end
 
     test "config.ru can be racked up" do
-      @app = rackup
-      assert_welcome get("/")
+      Dir.chdir app_path do
+        @app = rackup
+        assert_welcome get("/")
+      end
     end
 
     test "Rails.application is available after config.ru has been racked up" do
diff --git a/railties/test/application/routing_test.rb b/railties/test/application/routing_test.rb
index decde056fd..725dd06929 100644
--- a/railties/test/application/routing_test.rb
+++ b/railties/test/application/routing_test.rb
@@ -1,24 +1,29 @@
 require 'isolation/abstract_unit'
-require 'rack/test'
 
 module ApplicationTests
   class RoutingTest < Test::Unit::TestCase
     include ActiveSupport::Testing::Isolation
-    include Rack::Test::Methods
 
     def setup
       build_app
+      boot_rails
+      require 'rack/test'
+      extend Rack::Test::Methods
     end
 
     def app
       @app ||= begin
-        boot_rails
         require "#{app_path}/config/environment"
 
         Rails.application
       end
     end
 
+    test "rails/info/properties" do
+      get "/rails/info/properties"
+      assert_equal 200, last_response.status
+    end
+
     test "simple controller" do
       controller :foo, <<-RUBY
         class FooController < ActionController::Base
@@ -28,6 +33,12 @@ module ApplicationTests
         end
       RUBY
 
+      app_file 'config/routes.rb', <<-RUBY
+        AppTemplate::Application.routes.draw do |map|
+          match ':controller(/:action)'
+        end
+      RUBY
+
       get '/foo'
       assert_equal 'foo', last_response.body
     end
@@ -49,6 +60,12 @@ module ApplicationTests
         end
       RUBY
 
+      app_file 'config/routes.rb', <<-RUBY
+        AppTemplate::Application.routes.draw do |map|
+          match ':controller(/:action)'
+        end
+      RUBY
+
       get '/foo'
       assert_equal 'foo', last_response.body
 
@@ -75,6 +92,12 @@ module ApplicationTests
         end
       RUBY
 
+      app_file 'config/routes.rb', <<-RUBY
+        AppTemplate::Application.routes.draw do |map|
+          match ':controller(/:action)'
+        end
+      RUBY
+
       get '/foo'
       assert_equal 'foo', last_response.body
 
@@ -92,7 +115,7 @@ module ApplicationTests
       RUBY
 
       app_file 'config/routes.rb', <<-RUBY
-        ActionController::Routing::Routes.draw do |map|
+        AppTemplate::Application.routes.draw do |map|
           match 'foo', :to => 'foo#index'
         end
       RUBY
@@ -107,7 +130,7 @@ module ApplicationTests
         RUBY
 
         plugin.write 'config/routes.rb', <<-RUBY
-          ActionController::Routing::Routes.draw do |map|
+          AppTemplate::Application.routes.draw do |map|
             match 'bar', :to => 'bar#index'
           end
         RUBY
@@ -134,7 +157,7 @@ module ApplicationTests
       RUBY
 
       app_file 'config/routes.rb', <<-RUBY
-        ActionController::Routing::Routes.draw do |map|
+        AppTemplate::Application.routes.draw do |map|
           match 'foo', :to => 'foo#bar'
         end
       RUBY
@@ -143,11 +166,13 @@ module ApplicationTests
       assert_equal 'bar', last_response.body
 
       app_file 'config/routes.rb', <<-RUBY
-        ActionController::Routing::Routes.draw do |map|
+        AppTemplate::Application.routes.draw do |map|
           match 'foo', :to => 'foo#baz'
         end
       RUBY
 
+      sleep 0.1
+
       get '/foo'
       assert_equal 'baz', last_response.body
     end