aboutsummaryrefslogtreecommitdiffstats
path: root/activerecord/test/cases/primary_keys_test.rb
diff options
context:
space:
mode:
authorSantiago Pastorino <santiago@wyeworks.com>2011-08-05 18:42:41 -0300
committerSantiago Pastorino <santiago@wyeworks.com>2011-08-05 19:39:19 -0300
commit1b676fc76074047f4784502a9597fb529fd74dd7 (patch)
treeb9f8c31f7a5a1152bc624a5c66cb817028cf4aea /activerecord/test/cases/primary_keys_test.rb
parente0a6ec214987882a47722e709a91b17b8395bec9 (diff)
downloadrails-1b676fc76074047f4784502a9597fb529fd74dd7.tar.gz
rails-1b676fc76074047f4784502a9597fb529fd74dd7.tar.bz2
rails-1b676fc76074047f4784502a9597fb529fd74dd7.zip
Revert "to_key on a destroyed model should return nil". Closes #2440
This reverts commit c5448721b5054b8a467958d60427fdee15eac604.
Diffstat (limited to 'activerecord/test/cases/primary_keys_test.rb')
-rw-r--r--activerecord/test/cases/primary_keys_test.rb2
1 files changed, 1 insertions, 1 deletions
diff --git a/activerecord/test/cases/primary_keys_test.rb b/activerecord/test/cases/primary_keys_test.rb
index 7e3da145e5..05a41d8a0a 100644
--- a/activerecord/test/cases/primary_keys_test.rb
+++ b/activerecord/test/cases/primary_keys_test.rb
@@ -26,7 +26,7 @@ class PrimaryKeysTest < ActiveRecord::TestCase
def test_to_key_with_primary_key_after_destroy
topic = Topic.find(1)
topic.destroy
- assert_equal nil, topic.to_key
+ assert_equal [1], topic.to_key
end
def test_integer_key