2 files changed, 17 insertions, 7 deletions
diff --git a/activerecord/test/cases/associations/has_and_belongs_to_many_associations_test.rb b/activerecord/test/cases/associations/has_and_belongs_to_many_associations_test.rb
index 25cfa0a723..de9742b250 100644
--- a/activerecord/test/cases/associations/has_and_belongs_to_many_associations_test.rb
+++ b/activerecord/test/cases/associations/has_and_belongs_to_many_associations_test.rb
@@ -700,10 +700,17 @@ class HasAndBelongsToManyAssociationsTest < ActiveRecord::TestCase
     assert_equal ["id"], developers(:david).projects.select(:id).first.attributes.keys
   end
 
+  def test_join_middle_table_alias
+    assert_equal(
+      2,
+      Project.includes(:developers_projects).where.not("developers_projects.joined_on": nil).to_a.size
+    )
+  end
+
   def test_join_table_alias
     assert_equal(
       3,
-      Developer.includes(projects: :developers).where.not("projects_developers_projects_join.joined_on": nil).to_a.size
+      Developer.includes(projects: :developers).where.not("developers_projects_projects_join.joined_on": nil).to_a.size
     )
   end
 
@@ -716,7 +723,7 @@ class HasAndBelongsToManyAssociationsTest < ActiveRecord::TestCase
 
     assert_equal(
       3,
-      Developer.includes(projects: :developers).where.not("projects_developers_projects_join.joined_on": nil).group(group.join(",")).to_a.size
+      Developer.includes(projects: :developers).where.not("developers_projects_projects_join.joined_on": nil).group(group.join(",")).to_a.size
     )
   end
 
diff --git a/activerecord/test/cases/database_configurations_test.rb b/activerecord/test/cases/database_configurations_test.rb
index ed8151f01a..725d1b5d1b 100644
--- a/activerecord/test/cases/database_configurations_test.rb
+++ b/activerecord/test/cases/database_configurations_test.rb
@@ -80,17 +80,20 @@ class LegacyDatabaseConfigurationsTest < ActiveRecord::TestCase
 
   def test_each_is_deprecated
     assert_deprecated do
-      ActiveRecord::Base.configurations.each do |db_config|
-        assert_equal "primary", db_config.spec_name
+      all_configs = ActiveRecord::Base.configurations.values
+      ActiveRecord::Base.configurations.each do |env_name, config|
+        assert_includes ["arunit", "arunit2", "arunit_without_prepared_statements"], env_name
+        assert_includes all_configs, config
       end
     end
   end
 
   def test_first_is_deprecated
+    first_config = ActiveRecord::Base.configurations.values.first
     assert_deprecated do
-      db_config = ActiveRecord::Base.configurations.first
-      assert_equal "arunit", db_config.env_name
-      assert_equal "primary", db_config.spec_name
+      env_name, config = ActiveRecord::Base.configurations.first
+      assert_equal "arunit", env_name
+      assert_equal first_config, config
     end
   end