1 files changed, 64 insertions, 0 deletions
diff --git a/activerecord/test/cases/timestamp_test.rb b/activerecord/test/cases/timestamp_test.rb
index 717e0e1866..db474c63a4 100644
--- a/activerecord/test/cases/timestamp_test.rb
+++ b/activerecord/test/cases/timestamp_test.rb
@@ -1,5 +1,7 @@
 require 'cases/helper'
+require 'support/ddl_helper'
 require 'models/developer'
+require 'models/computer'
 require 'models/owner'
 require 'models/pet'
 require 'models/toy'
@@ -89,6 +91,18 @@ class TimestampTest < ActiveRecord::TestCase
     assert_in_delta Time.now, task.ending, 1
   end
 
+  def test_touching_many_attributes_updates_them
+    task = Task.first
+    previous_starting = task.starting
+    previous_ending = task.ending
+    task.touch(:starting, :ending)
+
+    assert_not_equal previous_starting, task.starting
+    assert_not_equal previous_ending, task.ending
+    assert_in_delta Time.now, task.starting, 1
+    assert_in_delta Time.now, task.ending, 1
+  end
+
   def test_touching_a_record_without_timestamps_is_unexceptional
     assert_nothing_raised { Car.first.touch }
   end
@@ -140,6 +154,25 @@ class TimestampTest < ActiveRecord::TestCase
     assert !@developer.no_touching?
   end
 
+  def test_no_touching_with_callbacks
+    klass = Class.new(ActiveRecord::Base) do
+      self.table_name = "developers"
+
+      attr_accessor :after_touch_called
+
+      after_touch do |user|
+        user.after_touch_called = true
+      end
+    end
+
+    developer = klass.first
+
+    klass.no_touching do
+      developer.touch
+      assert_not developer.after_touch_called
+    end
+  end
+
   def test_saving_a_record_with_a_belongs_to_that_specifies_touching_the_parent_should_update_the_parent_updated_at
     pet   = Pet.first
     owner = pet.owner
@@ -350,6 +383,19 @@ class TimestampTest < ActiveRecord::TestCase
     assert_not_equal time, pet.updated_at
   end
 
+  def test_timestamp_column_values_are_present_in_the_callbacks
+    klass = Class.new(ActiveRecord::Base) do
+      self.table_name = 'people'
+
+      before_create do
+        self.born_at = self.created_at
+      end
+    end
+
+    person = klass.create first_name: 'David'
+    assert_not_equal person.born_at, nil
+  end
+
   def test_timestamp_attributes_for_create
     toy = Toy.first
     assert_equal [:created_at, :created_on], toy.send(:timestamp_attributes_for_create)
@@ -380,3 +426,21 @@ class TimestampTest < ActiveRecord::TestCase
     assert_equal [:created_at, :updated_at], toy.send(:all_timestamp_attributes_in_model)
   end
 end
+
+class TimestampsWithoutTransactionTest < ActiveRecord::TestCase
+  include DdlHelper
+  self.use_transactional_fixtures = false
+
+  class TimestampAttributePost < ActiveRecord::Base
+    attr_accessor :created_at, :updated_at
+  end
+
+  def test_do_not_write_timestamps_on_save_if_they_are_not_attributes
+    with_example_table ActiveRecord::Base.connection, "timestamp_attribute_posts", "id integer primary key" do
+      post = TimestampAttributePost.new(id: 1)
+      post.save! # should not try to assign and persist created_at, updated_at
+      assert_nil post.created_at
+      assert_nil post.updated_at
+    end
+  end
+end