Merge pull request rails#45173 from nvasilevski/change-developer-clas…

…s-misleading-name Change `DeveloperWithDefaultNilableMentorScopeAllQueries` name
Nittarab · May 24, 2022 · 06b1000 · 06b1000
2 parents 9510783 + 07bae8b
commit 06b1000
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 8 deletions.
diff --git a/activerecord/test/cases/scoping/default_scoping_test.rb b/activerecord/test/cases/scoping/default_scoping_test.rb
@@ -112,7 +112,7 @@ def test_default_scope_with_all_queries_runs_on_create
   end
 
   def test_nilable_default_scope_with_all_queries_runs_on_create
-    create_sql = capture_sql { DeveloperWithDefaultNilableMentorScopeAllQueries.create!(name: "Nikita") }.first
+    create_sql = capture_sql { DeveloperWithDefaultNilableFirmScopeAllQueries.create!(name: "Nikita") }.first
 
     assert_no_match(/AND$/, create_sql)
   end
@@ -134,8 +134,8 @@ def test_default_scope_with_all_queries_runs_on_select
   end
 
   def test_nilable_default_scope_with_all_queries_runs_on_select
-    DeveloperWithDefaultNilableMentorScopeAllQueries.create!(name: "Nikita")
-    select_sql = capture_sql { DeveloperWithDefaultNilableMentorScopeAllQueries.find_by(name: "Nikita") }.first
+    DeveloperWithDefaultNilableFirmScopeAllQueries.create!(name: "Nikita")
+    select_sql = capture_sql { DeveloperWithDefaultNilableFirmScopeAllQueries.find_by(name: "Nikita") }.first
 
     assert_no_match(/AND$/, select_sql)
   end
@@ -157,7 +157,7 @@ def test_default_scope_with_all_queries_runs_on_update
   end
 
   def test_nilable_default_scope_with_all_queries_runs_on_update
-    dev = DeveloperWithDefaultNilableMentorScopeAllQueries.create!(name: "Nikita")
+    dev = DeveloperWithDefaultNilableFirmScopeAllQueries.create!(name: "Nikita")
     update_sql = capture_sql { dev.update!(name: "Not Nikita") }.first
 
     assert_no_match(/AND$/, update_sql)
@@ -180,7 +180,7 @@ def test_default_scope_with_all_queries_runs_on_update_columns
   end
 
   def test_nilable_default_scope_with_all_queries_runs_on_update_columns
-    dev = DeveloperWithDefaultNilableMentorScopeAllQueries.create!(name: "Nikita")
+    dev = DeveloperWithDefaultNilableFirmScopeAllQueries.create!(name: "Nikita")
     update_sql = capture_sql { dev.update_columns(name: "Not Nikita") }.first
 
     assert_no_match(/AND$/, update_sql)
@@ -203,7 +203,7 @@ def test_default_scope_with_all_queries_runs_on_destroy
   end
 
   def test_nilable_default_scope_with_all_queries_runs_on_destroy
-    dev = DeveloperWithDefaultNilableMentorScopeAllQueries.create!(name: "Nikita")
+    dev = DeveloperWithDefaultNilableFirmScopeAllQueries.create!(name: "Nikita")
     destroy_sql = capture_sql { dev.destroy }.first
 
     assert_no_match(/AND$/, destroy_sql)
@@ -226,7 +226,7 @@ def test_default_scope_with_all_queries_runs_on_reload
   end
 
   def test_nilable_default_scope_with_all_queries_runs_on_reload
-    dev = DeveloperWithDefaultNilableMentorScopeAllQueries.create!(name: "Nikita")
+    dev = DeveloperWithDefaultNilableFirmScopeAllQueries.create!(name: "Nikita")
     reload_sql = capture_sql { dev.reload }.first
 
     assert_no_match(/AND$/, reload_sql)

diff --git a/activerecord/test/models/developer.rb b/activerecord/test/models/developer.rb
@@ -162,7 +162,7 @@ class DeveloperWithDefaultMentorScopeAllQueries < ActiveRecord::Base
   default_scope -> { where(mentor_id: 1) }, all_queries: true
 end
 
-class DeveloperWithDefaultNilableMentorScopeAllQueries < ActiveRecord::Base
+class DeveloperWithDefaultNilableFirmScopeAllQueries < ActiveRecord::Base
   self.table_name = "developers"
   firm_id = nil # Could be something like Current.firm_id
   default_scope -> { where(firm_id: firm_id) if firm_id }, all_queries: true