Change the default `null` value for `timestamps` to `false`

2 files changed, 27 insertions, 61 deletions

diff --git a/activerecord/test/cases/ar_schema_test.rb b/activerecord/test/cases/ar_schema_test.rb
index 025c9fe6f9..f4e8003bc3 100644
--- a/activerecord/test/cases/ar_schema_test.rb
+++ b/activerecord/test/cases/ar_schema_test.rb
@@ -93,69 +93,38 @@ if ActiveRecord::Base.connection.supports_migrations?
       assert_equal "20131219224947", ActiveRecord::SchemaMigration.normalize_migration_number("20131219224947")
     end
 
-    def test_timestamps_without_null_is_deprecated_on_create_table
-      assert_deprecated do
-        ActiveRecord::Schema.define do
-          create_table :has_timestamps do |t|
-            t.timestamps
-          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_is_deprecated_on_change_table
-      assert_deprecated do
-        ActiveRecord::Schema.define do
-          create_table :has_timestamps
+    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
-          end
+        change_table :has_timestamps do |t|
+          t.timestamps default: Time.now
         end
       end
-    end
 
-    def test_timestamps_without_null_is_deprecated_on_add_timestamps
-      assert_deprecated do
-        ActiveRecord::Schema.define do
-          create_table :has_timestamps
-          add_timestamps :has_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_no_deprecation_warning_from_timestamps_on_create_table
-      assert_not_deprecated do
-        ActiveRecord::Schema.define do
-          create_table :has_timestamps do |t|
-            t.timestamps null: true
-          end
-
-          drop_table :has_timestamps
-
-          create_table :has_timestamps do |t|
-            t.timestamps null: false
-          end
-        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
-    end
-
-    def test_no_deprecation_warning_from_timestamps_on_change_table
-      assert_not_deprecated do
-        ActiveRecord::Schema.define do
-          create_table :has_timestamps
-          change_table :has_timestamps do |t|
-            t.timestamps null: true
-          end
 
-          drop_table :has_timestamps
-
-          create_table :has_timestamps
-          change_table :has_timestamps do |t|
-            t.timestamps null: false, default: Time.now
-          end
-        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
   end
 end
diff --git a/activerecord/test/cases/migration/change_schema_test.rb b/activerecord/test/cases/migration/change_schema_test.rb
index 337360e97f..b3129a8984 100644
--- a/activerecord/test/cases/migration/change_schema_test.rb
+++ b/activerecord/test/cases/migration/change_schema_test.rb
@@ -195,32 +195,29 @@ module ActiveRecord
       end
 
       def test_create_table_with_timestamps_should_create_datetime_columns
-        # FIXME: Remove the silence when we change the default `null` behavior
-        ActiveSupport::Deprecation.silence do
-          connection.create_table table_name do |t|
-            t.timestamps
-          end
+        connection.create_table table_name do |t|
+          t.timestamps
         end
         created_columns = connection.columns(table_name)
 
         created_at_column = created_columns.detect {|c| c.name == 'created_at' }
         updated_at_column = created_columns.detect {|c| c.name == 'updated_at' }
 
-        assert created_at_column.null
-        assert updated_at_column.null
+        assert !created_at_column.null
+        assert !updated_at_column.null
       end
 
       def test_create_table_with_timestamps_should_create_datetime_columns_with_options
         connection.create_table table_name do |t|
-          t.timestamps :null => false
+          t.timestamps null: true
         end
         created_columns = connection.columns(table_name)
 
         created_at_column = created_columns.detect {|c| c.name == 'created_at' }
         updated_at_column = created_columns.detect {|c| c.name == 'updated_at' }
 
-        assert !created_at_column.null
-        assert !updated_at_column.null
+        assert created_at_column.null
+        assert updated_at_column.null
       end
 
       def test_create_table_without_a_block