3 files changed, 44 insertions, 2 deletions
diff --git a/railties/test/application/rake/restart_test.rb b/railties/test/application/rake/restart_test.rb
index 35099913fb..4cae199e6b 100644
--- a/railties/test/application/rake/restart_test.rb
+++ b/railties/test/application/rake/restart_test.rb
@@ -13,12 +13,12 @@ module ApplicationTests
       def teardown
         teardown_app
       end
-      
+
       test 'rake restart touches tmp/restart.txt' do
         Dir.chdir(app_path) do
           `rake restart`
           assert File.exist?("tmp/restart.txt")
-          
+
           prev_mtime = File.mtime("tmp/restart.txt")
           sleep(1)
           `rake restart`
@@ -26,6 +26,14 @@ module ApplicationTests
           assert_not_equal prev_mtime, curr_mtime
         end
       end
+
+      test 'rake restart should work even if tmp folder does not exist' do
+        Dir.chdir(app_path) do
+          FileUtils.remove_dir('tmp')
+          `rake restart`
+          assert File.exist?('tmp/restart.txt')
+        end
+      end
     end
   end
 end
diff --git a/railties/test/application/rake_test.rb b/railties/test/application/rake_test.rb
index de14f269df..dd26ec867d 100644
--- a/railties/test/application/rake_test.rb
+++ b/railties/test/application/rake_test.rb
@@ -285,5 +285,12 @@ module ApplicationTests
 
       assert_match(/Hello, World!/, output)
     end
+
+    def test_tmp_clear_should_work_if_folder_missing
+      FileUtils.remove_dir("#{app_path}/tmp")
+      errormsg = Dir.chdir(app_path) { `bundle exec rake tmp:clear` }
+      assert_predicate $?, :success?
+      assert_empty errormsg
+    end
   end
 end
diff --git a/railties/test/generators/app_generator_test.rb b/railties/test/generators/app_generator_test.rb
index 2bfa05a0b8..af1c05cab1 100644
--- a/railties/test/generators/app_generator_test.rb
+++ b/railties/test/generators/app_generator_test.rb
@@ -44,6 +44,7 @@ DEFAULT_APP_FILES = %w(
   vendor/assets
   vendor/assets/stylesheets
   vendor/assets/javascripts
+  tmp
   tmp/cache
   tmp/cache/assets
 )
@@ -606,6 +607,32 @@ class AppGeneratorTest < Rails::Generators::TestCase
     end
   end
 
+  def test_create_keeps
+    run_generator
+    folders_with_keep = %w(
+      app/assets/images
+      app/mailers
+      app/models
+      app/controllers/concerns
+      app/models/concerns
+      lib/tasks
+      lib/assets
+      log
+      test/fixtures
+      test/fixtures/files
+      test/controllers
+      test/mailers
+      test/models
+      test/helpers
+      test/integration
+      tmp
+      vendor/assets/stylesheets
+    )
+    folders_with_keep.each do |folder|
+      assert_file("#{folder}/.keep")
+    end
+  end
+
   def test_psych_gem
     run_generator
     gem_regex = /gem 'psych',\s+'~> 2.0',\s+platforms: :rbx/