3 files changed, 14 insertions, 17 deletions
diff --git a/railties/lib/rails/tasks/framework.rake b/railties/lib/rails/tasks/framework.rake
index e669315934..a1c805f8aa 100644
--- a/railties/lib/rails/tasks/framework.rake
+++ b/railties/lib/rails/tasks/framework.rake
@@ -3,7 +3,7 @@ namespace :rails do
   task update: [ "update:configs", "update:bin" ]
 
   desc "Applies the template supplied by LOCATION=(/path/to/template) or URL"
-  task :template do
+  task template: :environment do
     template = ENV["LOCATION"]
     raise "No LOCATION value given. Please set LOCATION either as path to a file or a URL" if template.blank?
     template = File.expand_path(template) if template !~ %r{\A[A-Za-z][A-Za-z0-9+\-\.]*://}
@@ -55,7 +55,7 @@ namespace :rails do
     # desc "Update config/boot.rb from your current rails install"
     task :configs do
       invoke_from_app_generator :create_boot_file
-      invoke_from_app_generator :create_config_files
+      invoke_from_app_generator :update_config_files
     end
 
     # desc "Adds new executables to the application bin/ directory"
diff --git a/railties/lib/rails/tasks/statistics.rake b/railties/lib/rails/tasks/statistics.rake
index c1674c72ad..735c36eb3a 100644
--- a/railties/lib/rails/tasks/statistics.rake
+++ b/railties/lib/rails/tasks/statistics.rake
@@ -1,6 +1,10 @@
+# While global constants are bad, many 3rd party tools depend on this one (e.g
+# rspec-rails & cucumber-rails). So a deprecation warning is needed if we want
+# to remove it.
 STATS_DIRECTORIES = [
   %w(Controllers        app/controllers),
   %w(Helpers            app/helpers),
+  %w(Jobs               app/jobs),
   %w(Models             app/models),
   %w(Mailers            app/mailers),
   %w(Javascripts        app/assets/javascripts),
@@ -10,12 +14,13 @@ STATS_DIRECTORIES = [
   %w(Helper\ tests      test/helpers),
   %w(Model\ tests       test/models),
   %w(Mailer\ tests      test/mailers),
+  %w(Job\ tests         test/jobs),
   %w(Integration\ tests test/integration),
-  %w(Functional\ tests\ (old)  test/functional),
-  %w(Unit\ tests \ (old)       test/unit)
-].collect { |name, dir| [ name, "#{Rails.root}/#{dir}" ] }.select { |name, dir| File.directory?(dir) }
+].collect do |name, dir|
+  [ name, "#{File.dirname(Rake.application.rakefile_location)}/#{dir}" ]
+end.select { |name, dir| File.directory?(dir) }
 
-desc "Report code statistics (KLOCs, etc) from the application"
+desc "Report code statistics (KLOCs, etc) from the application or engine"
 task :stats do
   require 'rails/code_statistics'
   CodeStatistics.new(*STATS_DIRECTORIES).to_s
diff --git a/railties/lib/rails/tasks/tmp.rake b/railties/lib/rails/tasks/tmp.rake
index 116988665f..b33ae9862b 100644
--- a/railties/lib/rails/tasks/tmp.rake
+++ b/railties/lib/rails/tasks/tmp.rake
@@ -1,9 +1,8 @@
 namespace :tmp do
-  desc "Clear session, cache, and socket files from tmp/ (narrow w/ tmp:sessions:clear, tmp:cache:clear, tmp:sockets:clear)"
-  task clear: [ "tmp:sessions:clear",  "tmp:cache:clear", "tmp:sockets:clear"]
+  desc "Clear cache and socket files from tmp/ (narrow w/ tmp:cache:clear, tmp:sockets:clear)"
+  task clear: ["tmp:cache:clear", "tmp:sockets:clear"]
 
-  tmp_dirs = [ 'tmp/sessions',
-               'tmp/cache',
+  tmp_dirs = [ 'tmp/cache',
                'tmp/sockets',
                'tmp/pids',
                'tmp/cache/assets/development',
@@ -15,13 +14,6 @@ namespace :tmp do
   desc "Creates tmp directories for sessions, cache, sockets, and pids"
   task create: tmp_dirs
 
-  namespace :sessions do
-    # desc "Clears all files in tmp/sessions"
-    task :clear do
-      FileUtils.rm(Dir['tmp/sessions/[^.]*'])
-    end
-  end
-
   namespace :cache do
     # desc "Clears all files and directories in tmp/cache"
     task :clear do