1 files changed, 40 insertions, 2 deletions
diff --git a/activerecord/test/cases/ar_schema_test.rb b/activerecord/test/cases/ar_schema_test.rb
index 8700b20dee..9d5327bf35 100644
--- a/activerecord/test/cases/ar_schema_test.rb
+++ b/activerecord/test/cases/ar_schema_test.rb
@@ -3,9 +3,11 @@ require "cases/helper"
 if ActiveRecord::Base.connection.supports_migrations?
 
   class ActiveRecordSchemaTest < ActiveRecord::TestCase
-    self.use_transactional_fixtures = false
+    self.use_transactional_tests = false
 
-    def setup
+    setup do
+      @original_verbose = ActiveRecord::Migration.verbose
+      ActiveRecord::Migration.verbose = false
       @connection = ActiveRecord::Base.connection
       ActiveRecord::SchemaMigration.drop_table
     end
@@ -14,7 +16,9 @@ if ActiveRecord::Base.connection.supports_migrations?
       @connection.drop_table :fruits rescue nil
       @connection.drop_table :nep_fruits rescue nil
       @connection.drop_table :nep_schema_migrations rescue nil
+      @connection.drop_table :has_timestamps rescue nil
       ActiveRecord::SchemaMigration.delete_all rescue nil
+      ActiveRecord::Migration.verbose = @original_verbose
     end
 
     def test_has_no_primary_key
@@ -88,5 +92,39 @@ if ActiveRecord::Base.connection.supports_migrations?
       assert_equal "017", ActiveRecord::SchemaMigration.normalize_migration_number("0017")
       assert_equal "20131219224947", ActiveRecord::SchemaMigration.normalize_migration_number("20131219224947")
     end
+
+    def test_timestamps_without_null_set_null_to_false_on_create_table
+      ActiveRecord::Schema.define do
+        create_table :has_timestamps do |t|
+          t.timestamps
+        end
+      end
+
+      assert !@connection.columns(:has_timestamps).find { |c| c.name == 'created_at' }.null
+      assert !@connection.columns(:has_timestamps).find { |c| c.name == 'updated_at' }.null
+    end
+
+    def test_timestamps_without_null_set_null_to_false_on_change_table
+      ActiveRecord::Schema.define do
+        create_table :has_timestamps
+
+        change_table :has_timestamps do |t|
+          t.timestamps default: Time.now
+        end
+      end
+
+      assert !@connection.columns(:has_timestamps).find { |c| c.name == 'created_at' }.null
+      assert !@connection.columns(:has_timestamps).find { |c| c.name == 'updated_at' }.null
+    end
+
+    def test_timestamps_without_null_set_null_to_false_on_add_timestamps
+      ActiveRecord::Schema.define do
+        create_table :has_timestamps
+        add_timestamps :has_timestamps, default: Time.now
+      end
+
+      assert !@connection.columns(:has_timestamps).find { |c| c.name == 'created_at' }.null
+      assert !@connection.columns(:has_timestamps).find { |c| c.name == 'updated_at' }.null
+    end
   end
 end