diff options
| author | Xavier Noria <fxn@hashref.com> | 2010-05-19 23:29:39 +0200 |
|---|---|---|
| committer | Xavier Noria <fxn@hashref.com> | 2010-05-19 23:29:39 +0200 |
| commit | 7f07cc364a7ee7ceae21b29b54467fde0db93389 (patch) | |
| tree | 7c9dd8aaeda68731756ee108a8318239b04c80f0 /activerecord/test/cases/pk_test.rb | |
| parent | b9fcd8d71f94702463b97545bb70ce4727c5b47e (diff) | |
| parent | 61001e766de974a8864c0bc2cf915888d277a0ea (diff) | |
| download | rails-7f07cc364a7ee7ceae21b29b54467fde0db93389.tar.gz rails-7f07cc364a7ee7ceae21b29b54467fde0db93389.tar.bz2 rails-7f07cc364a7ee7ceae21b29b54467fde0db93389.zip | |
Merge remote branch 'rails/master'
Diffstat (limited to 'activerecord/test/cases/pk_test.rb')
| -rw-r--r-- | activerecord/test/cases/pk_test.rb | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/activerecord/test/cases/pk_test.rb b/activerecord/test/cases/pk_test.rb index 33ad5992de..73f4b3848c 100644 --- a/activerecord/test/cases/pk_test.rb +++ b/activerecord/test/cases/pk_test.rb @@ -18,7 +18,7 @@ class PrimaryKeysTest < ActiveRecord::TestCase def test_to_key_with_customized_primary_key keyboard = Keyboard.new - assert keyboard.to_key.nil? + assert_nil keyboard.to_key keyboard.save assert_equal keyboard.to_key, [keyboard.id] end @@ -37,7 +37,7 @@ class PrimaryKeysTest < ActiveRecord::TestCase topic = Topic.new topic.title = "New Topic" - assert_equal(nil, topic.id) + assert_nil topic.id assert_nothing_raised { topic.save! } id = topic.id |