1 files changed, 26 insertions, 23 deletions

diff --git a/railties/test/application/initializers/frameworks_test.rb b/railties/test/application/initializers/frameworks_test.rb
index 44209a52f7..d2b77bd015 100644
--- a/railties/test/application/initializers/frameworks_test.rb
+++ b/railties/test/application/initializers/frameworks_test.rb
@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require "isolation/abstract_unit"
 
 module ApplicationTests
@@ -6,7 +8,6 @@ module ApplicationTests
 
     def setup
       build_app
-      boot_rails
       FileUtils.rm_rf "#{app_path}/config/environments"
     end
 
@@ -129,7 +130,7 @@ module ApplicationTests
         end
       RUBY
 
-      require 'rack/test'
+      require "rack/test"
       extend Rack::Test::Methods
 
       get "/foo/included_helpers"
@@ -161,10 +162,10 @@ module ApplicationTests
         end
       RUBY
 
-      require 'rack/test'
+      require "rack/test"
       extend Rack::Test::Methods
 
-      get 'omg/show'
+      get "omg/show"
       assert_equal '{"omg":"omg"}', last_response.body
     end
 
@@ -176,7 +177,7 @@ module ApplicationTests
     end
 
     test "assignment config.encoding to default_charset" do
-      charset = 'Shift_JIS'
+      charset = "Shift_JIS"
       add_to_config "config.encoding = '#{charset}'"
       require "#{app_path}/config/environment"
       assert_equal charset, ActionDispatch::Response.default_charset
@@ -186,7 +187,7 @@ module ApplicationTests
     test "if there's no config.active_support.bare, all of ActiveSupport is required" do
       use_frameworks []
       require "#{app_path}/config/environment"
-      assert_nothing_raised { [1,2,3].sample }
+      assert_nothing_raised { [1, 2, 3].sample }
     end
 
     test "config.active_support.bare does not require all of ActiveSupport" do
@@ -204,41 +205,35 @@ module ApplicationTests
     test "active_record extensions are applied to ActiveRecord" do
       add_to_config "config.active_record.table_name_prefix = 'tbl_'"
       require "#{app_path}/config/environment"
-      assert_equal 'tbl_', ActiveRecord::Base.table_name_prefix
+      assert_equal "tbl_", ActiveRecord::Base.table_name_prefix
     end
 
     test "database middleware doesn't initialize when activerecord is not in frameworks" do
       use_frameworks []
       require "#{app_path}/config/environment"
-      assert_nil defined?(ActiveRecord::Base)
+      assert !defined?(ActiveRecord::Base) || ActiveRecord.autoload?(:Base)
     end
 
     test "use schema cache dump" do
-      Dir.chdir(app_path) do
-        `rails generate model post title:string;
-         bin/rails db:migrate db:schema:cache:dump`
-      end
+      rails %w(generate model post title:string)
+      rails %w(db:migrate db:schema:cache:dump)
       require "#{app_path}/config/environment"
       ActiveRecord::Base.connection.drop_table("posts") # force drop posts table for test.
-      assert ActiveRecord::Base.connection.schema_cache.tables("posts")
+      assert ActiveRecord::Base.connection.schema_cache.data_sources("posts")
     end
 
     test "expire schema cache dump" do
-      Dir.chdir(app_path) do
-        `rails generate model post title:string;
-         bin/rails db:migrate db:schema:cache:dump db:rollback`
-      end
-      silence_warnings {
-        require "#{app_path}/config/environment"
-        assert !ActiveRecord::Base.connection.schema_cache.tables("posts")
-      }
+      rails %w(generate model post title:string)
+      rails %w(db:migrate db:schema:cache:dump db:rollback)
+      require "#{app_path}/config/environment"
+      assert !ActiveRecord::Base.connection.schema_cache.data_sources("posts")
     end
 
     test "active record establish_connection uses Rails.env if DATABASE_URL is not set" do
       begin
         require "#{app_path}/config/environment"
         orig_database_url = ENV.delete("DATABASE_URL")
-        orig_rails_env, Rails.env = Rails.env, 'development'
+        orig_rails_env, Rails.env = Rails.env, "development"
         ActiveRecord::Base.establish_connection
         assert ActiveRecord::Base.connection
         assert_match(/#{ActiveRecord::Base.configurations[Rails.env]['database']}/, ActiveRecord::Base.connection_config[:database])
@@ -253,7 +248,7 @@ module ApplicationTests
       begin
         require "#{app_path}/config/environment"
         orig_database_url = ENV.delete("DATABASE_URL")
-        orig_rails_env, Rails.env = Rails.env, 'development'
+        orig_rails_env, Rails.env = Rails.env, "development"
         database_url_db_name = "db/database_url_db.sqlite3"
         ENV["DATABASE_URL"] = "sqlite3:#{database_url_db_name}"
         ActiveRecord::Base.establish_connection
@@ -265,5 +260,13 @@ module ApplicationTests
         Rails.env = orig_rails_env if orig_rails_env
       end
     end
+
+    test "connections checked out during initialization are returned to the pool" do
+      app_file "config/initializers/active_record.rb", <<-RUBY
+        ActiveRecord::Base.connection
+      RUBY
+      require "#{app_path}/config/environment"
+      assert !ActiveRecord::Base.connection_pool.active_connection?
+    end
   end
 end