1 files changed, 29 insertions, 2 deletions
diff --git a/activerecord/test/models/topic.rb b/activerecord/test/models/topic.rb
index 0420e2d15c..72699046f9 100644
--- a/activerecord/test/models/topic.rb
+++ b/activerecord/test/models/topic.rb
@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 class Topic < ActiveRecord::Base
   scope :base, -> { all }
   scope :written_before, lambda { |time|
@@ -10,11 +12,19 @@ class Topic < ActiveRecord::Base
 
   scope :scope_with_lambda, lambda { all }
 
+  scope :by_private_lifo, -> { where(author_name: private_lifo) }
   scope :by_lifo, -> { where(author_name: "lifo") }
   scope :replied, -> { where "replies_count > 0" }
 
+  class << self
+    private
+      def private_lifo
+        "lifo"
+      end
+  end
+
   scope "approved_as_string", -> { where(approved: true) }
-  scope :anonymous_extension, -> { all } do
+  scope :anonymous_extension, -> {} do
     def one
       1
     end
@@ -63,11 +73,24 @@ class Topic < ActiveRecord::Base
 
   after_initialize :set_email_address
 
+  attr_accessor :change_approved_before_save
+  before_save :change_approved_callback
+
   class_attribute :after_initialize_called
   after_initialize do
     self.class.after_initialize_called = true
   end
 
+  attr_accessor :after_touch_called
+
+  after_initialize do
+    self.after_touch_called = 0
+  end
+
+  after_touch do
+    self.after_touch_called += 1
+  end
+
   def approved=(val)
     @custom_approved = val
     write_attribute(:approved, val)
@@ -84,7 +107,7 @@ class Topic < ActiveRecord::Base
     end
 
     def set_email_address
-      unless persisted?
+      unless persisted? || will_save_change_to_author_email_address?
         self.author_email_address = "test@test.com"
       end
     end
@@ -94,6 +117,10 @@ class Topic < ActiveRecord::Base
     def before_destroy_for_transaction; end
     def after_save_for_transaction; end
     def after_create_for_transaction; end
+
+    def change_approved_callback
+      self.approved = change_approved_before_save unless change_approved_before_save.nil?
+    end
 end
 
 class ImportantTopic < Topic