4 files changed, 15 insertions, 3 deletions
diff --git a/railties/lib/rails/generators/app_base.rb b/railties/lib/rails/generators/app_base.rb
index e55da93f45..f365ad05c7 100644
--- a/railties/lib/rails/generators/app_base.rb
+++ b/railties/lib/rails/generators/app_base.rb
@@ -193,7 +193,7 @@ module Rails
       def webserver_gemfile_entry # :doc:
         return [] if options[:skip_puma]
         comment = "Use Puma as the app server"
-        GemfileEntry.new("puma", "~> 3.0", comment)
+        GemfileEntry.new("puma", "~> 3.7", comment)
       end
 
       def include_all_railties? # :doc:
diff --git a/railties/lib/rails/test_unit/minitest_plugin.rb b/railties/lib/rails/test_unit/minitest_plugin.rb
index 7d3da6b529..e44fe78bbd 100644
--- a/railties/lib/rails/test_unit/minitest_plugin.rb
+++ b/railties/lib/rails/test_unit/minitest_plugin.rb
@@ -115,7 +115,9 @@ module Minitest
     alias set? runner
 
     # Backwardscompatibility with Rails 5.0 generated plugin test scripts.
-    alias []= runner=
+    def []=(runner, *)
+      @runner = runner
+    end
 
     def ruby?
       runner == :ruby
diff --git a/railties/test/application/test_runner_test.rb b/railties/test/application/test_runner_test.rb
index d3d5b6d6dd..ee03d8b86c 100644
--- a/railties/test/application/test_runner_test.rb
+++ b/railties/test/application/test_runner_test.rb
@@ -15,6 +15,16 @@ module ApplicationTests
       teardown_app
     end
 
+    def test_run_via_backwardscompatibility
+      require "rails/test_unit/minitest_plugin"
+
+      assert_nothing_raised do
+        Minitest.run_via[:ruby] = true
+      end
+
+      assert_predicate Minitest.run_via, :ruby?
+    end
+
     def test_run_single_file
       create_test_file :models, "foo"
       create_test_file :models, "bar"
diff --git a/railties/test/generators/app_generator_test.rb b/railties/test/generators/app_generator_test.rb
index 687aed2c47..bd1b412b36 100644
--- a/railties/test/generators/app_generator_test.rb
+++ b/railties/test/generators/app_generator_test.rb
@@ -340,7 +340,7 @@ class AppGeneratorTest < Rails::Generators::TestCase
 
   def test_generator_defaults_to_puma_version
     run_generator [destination_root]
-    assert_gem "puma", "'~> 3.0'"
+    assert_gem "puma", "'~> 3.7'"
   end
 
   def test_generator_if_skip_puma_is_given