aboutsummaryrefslogtreecommitdiffstats
path: root/railties
diff options
context:
space:
mode:
authorDavid Heinemeier Hansson <david@basecamp.com>2014-08-17 18:12:52 -0700
committerDavid Heinemeier Hansson <david@basecamp.com>2014-08-17 18:12:52 -0700
commit7ee055076ec2c5b2e9c110f821c10fe06bf38a1c (patch)
treede7578ca9afadfb05ea45134c2ae1d053aba0d26 /railties
parenteced6f81184a67fc47ecb78e802d82a7234ae23d (diff)
parentea3ba34506c72d636096245016b5ef9cfe27c566 (diff)
downloadrails-7ee055076ec2c5b2e9c110f821c10fe06bf38a1c.tar.gz
rails-7ee055076ec2c5b2e9c110f821c10fe06bf38a1c.tar.bz2
rails-7ee055076ec2c5b2e9c110f821c10fe06bf38a1c.zip
Merge pull request #16481 from sgrif/sg-change-default-timestamps
Change the default `null` value for timestamps
Diffstat (limited to 'railties')
-rw-r--r--railties/test/generators/model_generator_test.rb2
1 files changed, 1 insertions, 1 deletions
diff --git a/railties/test/generators/model_generator_test.rb b/railties/test/generators/model_generator_test.rb
index b67cf02d7b..6daedc0c29 100644
--- a/railties/test/generators/model_generator_test.rb
+++ b/railties/test/generators/model_generator_test.rb
@@ -222,7 +222,7 @@ class ModelGeneratorTest < Rails::Generators::TestCase
def test_migration_with_timestamps
run_generator
- assert_migration "db/migrate/create_accounts.rb", /t.timestamps/
+ assert_migration "db/migrate/create_accounts.rb", /t.timestamps null: false/
end
def test_migration_timestamps_are_skipped