From 07bae8b2f0831519d3e3f33bd73a1ffec3f05155 Mon Sep 17 00:00:00 2001 From: Nikita Vasilevsky Date: Tue, 24 May 2022 21:39:18 +0000 Subject: [PATCH] Change `DeveloperWithDefaultNilableMentorScopeAllQueries` name --- .../test/cases/scoping/default_scoping_test.rb | 14 +++++++------- activerecord/test/models/developer.rb | 2 +- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/activerecord/test/cases/scoping/default_scoping_test.rb b/activerecord/test/cases/scoping/default_scoping_test.rb index d23663dd89fa3..06553573fb018 100644 --- 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 index eea35dced8ec6..b9be99adebd53 100644 --- 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