11 files changed, 236 insertions, 15 deletions

diff --git a/railties/test/application/configuration_test.rb b/railties/test/application/configuration_test.rb
index 56f45582c8..54cd751f4e 100644
--- a/railties/test/application/configuration_test.rb
+++ b/railties/test/application/configuration_test.rb
@@ -171,5 +171,62 @@ module ApplicationTests
       get "/"
       assert $prepared
     end
+
+    test "config.action_dispatch.x_sendfile_header defaults to X-Sendfile" do
+      require "rails"
+      require "action_controller/railtie"
+
+      class MyApp < Rails::Application
+        config.cookie_secret = "3b7cd727ee24e8444053437c36cc66c4"
+        config.session_store :cookie_store, :key => "_myapp_session"
+      end
+
+      MyApp.initialize!
+
+      class ::OmgController < ActionController::Base
+        def index
+          send_file __FILE__
+        end
+      end
+
+      MyApp.routes.draw do
+        match "/" => "omg#index"
+      end
+
+      require 'rack/test'
+      extend Rack::Test::Methods
+
+      get "/"
+      assert_equal File.expand_path(__FILE__), last_response.headers["X-Sendfile"]
+    end
+
+    test "config.action_dispatch.x_sendfile_header is sent to Rack::Sendfile" do
+      require "rails"
+      require "action_controller/railtie"
+
+      class MyApp < Rails::Application
+        config.cookie_secret = "3b7cd727ee24e8444053437c36cc66c4"
+        config.session_store :cookie_store, :key => "_myapp_session"
+        config.action_dispatch.x_sendfile_header = 'X-Lighttpd-Send-File'
+      end
+
+      MyApp.initialize!
+
+      class ::OmgController < ActionController::Base
+        def index
+          send_file __FILE__
+        end
+      end
+
+      MyApp.routes.draw do
+        match "/" => "omg#index"
+      end
+
+      require 'rack/test'
+      extend Rack::Test::Methods
+
+      get "/"
+      assert_equal File.expand_path(__FILE__), last_response.headers["X-Lighttpd-Send-File"]
+    end
   end
 end
diff --git a/railties/test/application/console_test.rb b/railties/test/application/console_test.rb
index 22ab60f4a0..8ff69f0208 100644
--- a/railties/test/application/console_test.rb
+++ b/railties/test/application/console_test.rb
@@ -6,7 +6,9 @@ class ConsoleTest < Test::Unit::TestCase
   def setup
     build_app
     boot_rails
+  end
 
+  def load_environment
     # Load steps taken from rails/commands/console.rb
     require "#{rails_root}/config/environment"
     require 'rails/console/app'
@@ -14,18 +16,21 @@ class ConsoleTest < Test::Unit::TestCase
   end
 
   def test_app_method_should_return_integration_session
+    load_environment
     console_session = app
     assert_not_nil console_session
     assert_instance_of ActionController::Integration::Session, console_session
   end
 
   def test_new_session_should_return_integration_session
+    load_environment
     session = new_session
     assert_not_nil session
     assert_instance_of ActionController::Integration::Session, session
   end
 
   def test_reload_should_fire_preparation_callbacks
+    load_environment
     a = b = c = nil
 
     # TODO: These should be defined on the initializer
@@ -34,16 +39,37 @@ class ConsoleTest < Test::Unit::TestCase
     ActionDispatch::Callbacks.to_prepare { c = 3 }
 
     # Hide Reloading... output
-    silence_stream(STDOUT) do
-      reload!
-    end
+    silence_stream(STDOUT) { reload! }
 
     assert_equal 1, a
     assert_equal 2, b
     assert_equal 3, c
   end
 
+  def test_reload_should_reload_constants
+    app_file "app/models/user.rb", <<-MODEL
+      class User
+        attr_accessor :name
+      end
+    MODEL
+
+    load_environment
+    assert User.new.respond_to?(:name)
+    assert !User.new.respond_to?(:age)
+
+    app_file "app/models/user.rb", <<-MODEL
+      class User
+        attr_accessor :name, :age
+      end
+    MODEL
+
+    assert !User.new.respond_to?(:age)
+    silence_stream(STDOUT) { reload! }
+    assert User.new.respond_to?(:age)
+  end
+
   def test_access_to_helpers
+    load_environment
     assert_not_nil helper
     assert_instance_of ActionView::Base, helper
     assert_equal 'Once upon a time in a world...',
diff --git a/railties/test/application/initializers/frameworks_test.rb b/railties/test/application/initializers/frameworks_test.rb
index 1e7b9c9997..8e57022e5b 100644
--- a/railties/test/application/initializers/frameworks_test.rb
+++ b/railties/test/application/initializers/frameworks_test.rb
@@ -32,6 +32,17 @@ module ApplicationTests
       ActionMailer::Base.view_paths.include?(File.expand_path("app/views", app_path))
     end
 
+    test "allows me to configure default url options for ActionMailer" do
+      app_file "config/environments/development.rb", <<-RUBY
+        Rails::Application.configure do
+          config.action_mailer.default_url_options = { :host => "test.rails" }
+        end
+      RUBY
+
+      require "#{app_path}/config/environment"
+      assert "test.rails", ActionMailer::Base.default_url_options[:host]
+    end
+
     # AS
     test "if there's no config.active_support.bare, all of ActiveSupport is required" do
       use_frameworks []
@@ -54,7 +65,7 @@ module ApplicationTests
     test "database middleware doesn't initialize when session store is not active_record" do
       add_to_config <<-RUBY
         config.root = "#{app_path}"
-        config.action_controller.session_store = :cookie_store
+        config.session_store :cookie_store, { :key => "blahblahblah" }
       RUBY
       require "#{app_path}/config/environment"
 
@@ -62,7 +73,7 @@ module ApplicationTests
     end
 
     test "database middleware initializes when session store is active record" do
-      add_to_config "config.action_controller.session_store = :active_record_store"
+      add_to_config "config.session_store :active_record_store"
 
       require "#{app_path}/config/environment"
 
@@ -80,7 +91,7 @@ module ApplicationTests
     test "database middleware doesn't initialize when activerecord is not in frameworks" do
       use_frameworks []
       require "#{app_path}/config/environment"
-      assert_nil defined?(ActiveRecord)
+      assert_nil defined?(ActiveRecord::Base)
     end
   end
 end
diff --git a/railties/test/application/initializers/initializers_test.rb b/railties/test/application/initializers/initializers_test.rb
index 0c3de7ce33..2e6a707175 100644
--- a/railties/test/application/initializers/initializers_test.rb
+++ b/railties/test/application/initializers/initializers_test.rb
@@ -51,5 +51,31 @@ module ApplicationTests
       assert $activerecord_configurations
       assert $activerecord_configurations['development']
     end
+
+    test "after_initialize happens after to_prepare in development" do
+      $order = []
+      add_to_config <<-RUBY
+        config.cache_classes = false
+        config.after_initialize { $order << :after_initialize }
+        config.to_prepare { $order << :to_prepare }
+      RUBY
+
+      require "#{app_path}/config/environment"
+      assert [:to_prepare, :after_initialize], $order
+    end
+
+    test "after_initialize happens after to_prepare in production" do
+      $order = []
+      add_to_config <<-RUBY
+        config.cache_classes = true
+        config.after_initialize { $order << :after_initialize }
+        config.to_prepare { $order << :to_prepare }
+      RUBY
+
+      require "#{app_path}/config/application"
+      Rails.env.replace "production"
+      require "#{app_path}/config/environment"
+      assert [:to_prepare, :after_initialize], $order
+    end
   end
 end
diff --git a/railties/test/application/initializers/notifications_test.rb b/railties/test/application/initializers/notifications_test.rb
index 061bb34c19..b99cf5bb4f 100644
--- a/railties/test/application/initializers/notifications_test.rb
+++ b/railties/test/application/initializers/notifications_test.rb
@@ -28,7 +28,7 @@ module ApplicationTests
       ActiveSupport::Notifications.notifier.wait
     end
 
-    test "rails subscribers are added" do
+    test "rails log_subscribers are added" do
       add_to_config <<-RUBY
         config.colorize_logging = false
       RUBY
diff --git a/railties/test/application/metal_test.rb b/railties/test/application/metal_test.rb
index 225bede117..1ec62282c8 100644
--- a/railties/test/application/metal_test.rb
+++ b/railties/test/application/metal_test.rb
@@ -28,7 +28,7 @@ module ApplicationTests
         end
       RUBY
 
-      get "/"
+      get "/not/slash"
       assert_equal 200, last_response.status
       assert_equal "FooMetal", last_response.body
     end
@@ -50,7 +50,7 @@ module ApplicationTests
         end
       RUBY
 
-      get "/"
+      get "/not/slash"
       assert_equal 200, last_response.status
       assert_equal "Metal B", last_response.body
     end
diff --git a/railties/test/application/middleware_stack_defaults_test.rb b/railties/test/application/middleware_stack_defaults_test.rb
new file mode 100644
index 0000000000..284f7e2e5b
--- /dev/null
+++ b/railties/test/application/middleware_stack_defaults_test.rb
@@ -0,0 +1,54 @@
+require 'isolation/abstract_unit'
+
+class MiddlewareStackDefaultsTest < Test::Unit::TestCase
+  include ActiveSupport::Testing::Isolation
+
+  def setup
+    boot_rails
+    require "rails"
+    require "action_controller/railtie"
+
+    Object.const_set(:MyApplication, Class.new(Rails::Application))
+    MyApplication.class_eval do
+      config.cookie_secret = "3b7cd727ee24e8444053437c36cc66c4"
+      config.session_store :cookie_store, :key => "_myapp_session"
+    end
+  end
+
+  def remote_ip(env = {})
+    remote_ip = nil
+    env = Rack::MockRequest.env_for("/").merge(env).merge('action_dispatch.show_exceptions' => false)
+
+    endpoint = Proc.new do |e|
+      remote_ip = ActionDispatch::Request.new(e).remote_ip
+      [200, {}, ["Hello"]]
+    end
+
+    out = MyApplication.middleware.build(endpoint).call(env)
+    remote_ip
+  end
+
+  test "remote_ip works" do
+    assert_equal "1.1.1.1", remote_ip("REMOTE_ADDR" => "1.1.1.1")
+  end
+
+  test "checks IP spoofing by default" do
+    assert_raises(ActionDispatch::RemoteIp::IpSpoofAttackError) do
+      remote_ip("HTTP_X_FORWARDED_FOR" => "1.1.1.1", "HTTP_CLIENT_IP" => "1.1.1.2")
+    end
+  end
+
+  test "can disable IP spoofing check" do
+    MyApplication.config.action_dispatch.ip_spoofing_check = false
+
+    assert_nothing_raised(ActionDispatch::RemoteIp::IpSpoofAttackError) do
+      assert_equal "1.1.1.2", remote_ip("HTTP_X_FORWARDED_FOR" => "1.1.1.1", "HTTP_CLIENT_IP" => "1.1.1.2")
+    end
+  end
+
+  test "the user can set trusted proxies" do
+    MyApplication.config.action_dispatch.trusted_proxies = /^4\.2\.42\.42$/
+
+    assert_equal "1.1.1.1", remote_ip("REMOTE_ADDR" => "4.2.42.42,1.1.1.1")
+  end
+end
diff --git a/railties/test/application/middleware_test.rb b/railties/test/application/middleware_test.rb
index ce9cd510a3..9a359d20b1 100644
--- a/railties/test/application/middleware_test.rb
+++ b/railties/test/application/middleware_test.rb
@@ -19,6 +19,8 @@ module ApplicationTests
         "Rack::Runtime",
         "Rails::Rack::Logger",
         "ActionDispatch::ShowExceptions",
+        "ActionDispatch::RemoteIp",
+        "Rack::Sendfile",
         "ActionDispatch::Callbacks",
         "ActionDispatch::Cookies",
         "ActionDispatch::Session::CookieStore",
diff --git a/railties/test/application/paths_test.rb b/railties/test/application/paths_test.rb
index ac0aa27c64..511b8b629a 100644
--- a/railties/test/application/paths_test.rb
+++ b/railties/test/application/paths_test.rb
@@ -11,8 +11,8 @@ module ApplicationTests
       app_file "config/environments/development.rb", ""
       add_to_config <<-RUBY
         config.root = "#{app_path}"
-        config.after_initialize do
-          ActionController::Base.session_store = nil
+        config.after_initialize do |app|
+          app.config.session_store nil
         end
       RUBY
       use_frameworks [:action_controller, :action_view, :action_mailer, :active_record]
@@ -56,9 +56,10 @@ module ApplicationTests
     end
 
     test "booting up Rails yields a list of paths that are eager" do
-      assert @paths.app.eager_load?
-      assert @paths.app.controllers.eager_load?
-      assert @paths.app.helpers.eager_load?
+      eager_load = @paths.eager_load
+      assert eager_load.include?(root("app/controllers"))
+      assert eager_load.include?(root("app/helpers"))
+      assert eager_load.include?(root("app/models"))
     end
 
     test "environments has a glob equal to the current environment" do
diff --git a/railties/test/application/routing_test.rb b/railties/test/application/routing_test.rb
index b93e349a46..dcac1a87d9 100644
--- a/railties/test/application/routing_test.rb
+++ b/railties/test/application/routing_test.rb
@@ -120,7 +120,8 @@ module ApplicationTests
 
       app_file 'config/routes.rb', <<-RUBY
         AppTemplate::Application.routes.draw do |map|
-          match ':controller(/:action)'
+          match 'admin/foo', :to => 'admin/foo#index'
+          match 'foo', :to => 'foo#index'
         end
       RUBY
 
diff --git a/railties/test/application/url_generation_test.rb b/railties/test/application/url_generation_test.rb
new file mode 100644
index 0000000000..04f5454e09
--- /dev/null
+++ b/railties/test/application/url_generation_test.rb
@@ -0,0 +1,43 @@
+require 'isolation/abstract_unit'
+
+module ApplicationTests
+  class UrlGenerationTest < Test::Unit::TestCase
+    include ActiveSupport::Testing::Isolation
+
+    def app
+      Rails.application
+    end
+
+    test "it works" do
+      boot_rails
+      require "rails"
+      require "action_controller/railtie"
+
+      class MyApp < Rails::Application
+        config.cookie_secret = "3b7cd727ee24e8444053437c36cc66c4"
+        config.session_store :cookie_store, :key => "_myapp_session"
+      end
+
+      MyApp.initialize!
+
+      class ::ApplicationController < ActionController::Base
+      end
+
+      class ::OmgController < ::ApplicationController
+        def index
+          render :text => omg_path
+        end
+      end
+
+      MyApp.routes.draw do
+        match "/" => "omg#index", :as => :omg
+      end
+
+      require 'rack/test'
+      extend Rack::Test::Methods
+
+      get "/"
+      assert_equal "/", last_response.body
+    end
+  end
+end