3 files changed, 46 insertions, 0 deletions
diff --git a/railties/test/application/middleware/session_test.rb b/railties/test/application/middleware/session_test.rb
index f847e80471..85e7761727 100644
--- a/railties/test/application/middleware/session_test.rb
+++ b/railties/test/application/middleware/session_test.rb
@@ -345,5 +345,33 @@ module ApplicationTests
       get '/foo/read_raw_cookie'
       assert_equal 2, verifier.verify(last_response.body)['foo']
     end
+
+    test 'calling reset_session on request does not trigger an error for API apps' do
+      add_to_config 'config.api_only = true'
+
+      controller :test, <<-RUBY
+        class TestController < ApplicationController
+          def dump_flash
+            request.reset_session
+            render plain: 'It worked!'
+          end
+        end
+      RUBY
+
+      app_file 'config/routes.rb', <<-RUBY
+        Rails.application.routes.draw do
+          get '/dump_flash' => "test#dump_flash"
+        end
+      RUBY
+
+      require "#{app_path}/config/environment"
+
+      get '/dump_flash'
+
+      assert_equal 200, last_response.status
+      assert_equal 'It worked!', last_response.body
+
+      refute Rails.application.middleware.include?(ActionDispatch::Flash)
+    end
   end
 end
diff --git a/railties/test/application/rake/dev_test.rb b/railties/test/application/rake/dev_test.rb
index 59b46c6e79..deb9bc8dee 100644
--- a/railties/test/application/rake/dev_test.rb
+++ b/railties/test/application/rake/dev_test.rb
@@ -29,6 +29,15 @@ module ApplicationTests
           assert_match(/Development mode is no longer being cached/, output)
         end
       end
+
+      test 'dev:cache removes server.pid also' do
+        Dir.chdir(app_path) do
+          FileUtils.mkdir_p("tmp/pids")
+          FileUtils.touch("tmp/pids/server.pid")
+          `rake dev:cache`
+          assert_not File.exist?("tmp/pids/server.pid")
+        end
+      end
     end
   end
 end
diff --git a/railties/test/application/rake/restart_test.rb b/railties/test/application/rake/restart_test.rb
index 4cae199e6b..30f662a9be 100644
--- a/railties/test/application/rake/restart_test.rb
+++ b/railties/test/application/rake/restart_test.rb
@@ -34,6 +34,15 @@ module ApplicationTests
           assert File.exist?('tmp/restart.txt')
         end
       end
+
+      test 'rake restart removes server.pid also' do
+        Dir.chdir(app_path) do
+          FileUtils.mkdir_p("tmp/pids")
+          FileUtils.touch("tmp/pids/server.pid")
+          `rake restart`
+          assert_not File.exist?("tmp/pids/server.pid")
+        end
+      end
     end
   end
 end