4 files changed, 114 insertions, 31 deletions
diff --git a/railties/test/app_rails_loader_test.rb b/railties/test/app_rails_loader_test.rb
index 63ed9eaef0..ceae78ae80 100644
--- a/railties/test/app_rails_loader_test.rb
+++ b/railties/test/app_rails_loader_test.rb
@@ -1,48 +1,68 @@
+require 'tmpdir'
 require 'abstract_unit'
 require 'rails/app_rails_loader'
 
 class AppRailsLoaderTest < ActiveSupport::TestCase
+  def write(filename, contents=nil)
+    FileUtils.mkdir_p(File.dirname(filename))
+    File.write(filename, contents)
+  end
+
+  def expects_exec(exe)
+    Rails::AppRailsLoader.expects(:exec).with(Rails::AppRailsLoader::RUBY, exe)
+  end
 
   setup do
-    File.stubs(:exists?).returns(false)
+    @tmp = Dir.mktmpdir('railties-rails-loader-test-suite')
+    @cwd = Dir.pwd
+    Dir.chdir(@tmp)
   end
 
-  ['bin/rails', 'script/rails'].each do |exe|
-    test "is in a rails application if #{exe} exists and contains APP_PATH" do
-      File.stubs(:exists?).with(exe).returns(true)
-      File.stubs(:read).with(exe).returns('APP_PATH')
-      assert Rails::AppRailsLoader.find_executable
-    end
+  ['bin', 'script'].each do |script_dir|
+    exe = "#{script_dir}/rails"
 
-    test "is not in a rails application if #{exe} exists but doesn't contain APP_PATH" do
-      File.stubs(:exists?).with(exe).returns(true)
-      File.stubs(:read).with(exe).returns("railties #{exe}")
-      assert !Rails::AppRailsLoader.find_executable
-    end
+    test "is not in a Rails application if #{exe} is not found in the current or parent directories" do
+      File.stubs(:exists?).with('bin/rails').returns(false)
+      File.stubs(:exists?).with('script/rails').returns(false)
 
-    test "is in a rails application if parent directory has #{exe} containing APP_PATH" do
-      File.stubs(:exists?).with("/foo/bar/#{exe}").returns(false)
-      File.stubs(:exists?).with("/foo/#{exe}").returns(true)
-      File.stubs(:read).with("/foo/#{exe}").returns('APP_PATH')
-      assert Rails::AppRailsLoader.find_executable_in_parent_path(Pathname.new("/foo/bar"))
+      assert !Rails::AppRailsLoader.exec_app_rails
     end
 
-    test "is not in a rails application if at the root directory and doesn't have #{exe}" do
-      Pathname.any_instance.stubs(:root?).returns true
-      assert !Rails::AppRailsLoader.find_executable
-    end
+    ['APP_PATH', 'ENGINE_PATH'].each do |keyword|
+      test "is in a Rails application if #{exe} exists and contains #{keyword}" do
+        write exe, keyword
 
-    test "is in a rails engine if parent directory has #{exe} containing ENGINE_PATH" do
-      File.stubs(:exists?).with("/foo/bar/#{exe}").returns(false)
-      File.stubs(:exists?).with("/foo/#{exe}").returns(true)
-      File.stubs(:read).with("/foo/#{exe}").returns('ENGINE_PATH')
-      assert Rails::AppRailsLoader.find_executable_in_parent_path(Pathname.new("/foo/bar"))
-    end
+        expects_exec exe
+        Rails::AppRailsLoader.exec_app_rails
+      end
 
-    test "is in a rails engine if #{exe} exists containing ENGINE_PATH" do
-      File.stubs(:exists?).with(exe).returns(true)
-      File.stubs(:read).with(exe).returns('ENGINE_PATH')
-      assert Rails::AppRailsLoader.find_executable
+      test "is not in a Rails application if #{exe} exists but doesn't contain #{keyword}" do
+        write exe
+
+        assert !Rails::AppRailsLoader.exec_app_rails
+      end
+
+      test "is in a Rails application if parent directory has #{exe} containing #{keyword} and chdirs to the root directory" do
+        write "foo/bar/#{exe}"
+        write "foo/#{exe}", keyword
+
+        Dir.chdir('foo/bar')
+
+        expects_exec exe
+        Rails::AppRailsLoader.exec_app_rails
+
+        # Compare the realpath in case either of them has symlinks.
+        #
+        # This happens in particular in Mac OS X, where @tmp starts
+        # with "/var", and Dir.pwd with "/private/var", due to a
+        # default system symlink var -> private/var.
+        assert_equal File.realpath("#@tmp/foo"), File.realpath(Dir.pwd)
+      end
     end
   end
+
+  teardown do
+    Dir.chdir(@cwd)
+    FileUtils.rm_rf(@tmp)
+  end
 end
diff --git a/railties/test/application/initializers/load_path_test.rb b/railties/test/application/initializers/load_path_test.rb
index 9b18c329ec..0c66213caa 100644
--- a/railties/test/application/initializers/load_path_test.rb
+++ b/railties/test/application/initializers/load_path_test.rb
@@ -72,6 +72,7 @@ module ApplicationTests
     end
 
     test "load environment with global" do
+      $initialize_test_set_from_env = nil
       app_file "config/environments/development.rb", <<-RUBY
         $initialize_test_set_from_env = 'success'
         AppTemplate::Application.configure do
diff --git a/railties/test/application/rake_test.rb b/railties/test/application/rake_test.rb
index eb590da678..fa3ab969ae 100644
--- a/railties/test/application/rake_test.rb
+++ b/railties/test/application/rake_test.rb
@@ -79,6 +79,23 @@ module ApplicationTests
       assert_match "Hello world", output
     end
 
+    def test_should_not_eager_load_model_path_for_rake
+      add_to_config <<-RUBY
+        config.eager_load = true
+
+        rake_tasks do
+          task do_nothing: :environment do
+          end
+        end
+      RUBY
+
+      app_file "app/models/hello.rb", <<-RUBY
+      raise 'should not be pre-required for rake even `eager_load=true`'
+      RUBY
+
+      Dir.chdir(app_path){ `rake do_nothing` }
+    end
+
     def test_code_statistics_sanity
       assert_match "Code LOC: 5     Test LOC: 0     Code to Test Ratio: 1:0.0",
         Dir.chdir(app_path){ `rake stats` }
diff --git a/railties/test/application/rendering_test.rb b/railties/test/application/rendering_test.rb
new file mode 100644
index 0000000000..588d64dde9
--- /dev/null
+++ b/railties/test/application/rendering_test.rb
@@ -0,0 +1,45 @@
+require 'isolation/abstract_unit'
+require 'rack/test'
+
+module ApplicationTests
+  class RoutingTest < ActiveSupport::TestCase
+    include ActiveSupport::Testing::Isolation
+    include Rack::Test::Methods
+
+    def setup
+      build_app
+      boot_rails
+    end
+
+    def teardown
+      teardown_app
+    end
+
+    test "Unknown format falls back to HTML template" do
+      app_file 'config/routes.rb', <<-RUBY
+        AppTemplate::Application.routes.draw do
+          get 'pages/:id', to: 'pages#show'
+        end
+      RUBY
+
+      app_file 'app/controllers/pages_controller.rb', <<-RUBY
+        class PagesController < ApplicationController
+          layout false
+
+          def show
+          end
+        end
+      RUBY
+
+      app_file 'app/views/pages/show.html.erb', <<-RUBY
+        <%= params[:id] %>
+      RUBY
+
+      get '/pages/foo'
+      assert_equal 200, last_response.status
+
+      get '/pages/foo.bar'
+      assert_equal 200, last_response.status
+    end
+  end
+end