aboutsummaryrefslogtreecommitdiffstats
path: root/activerecord/test/cases/primary_keys_test.rb
diff options
context:
space:
mode:
authorDmitry Polushkin <dmitry.polushkin@gmail.com>2011-10-05 17:35:59 +0100
committerDmitry Polushkin <dmitry.polushkin@gmail.com>2011-10-05 17:35:59 +0100
commit84eece0a823e9c601ea99a8709f24605a19bcbfd (patch)
tree12ac66c6404f35faddd06617987ad6db76b11406 /activerecord/test/cases/primary_keys_test.rb
parent19965402b2f868c79d78269ca17cb6282f271382 (diff)
parentc495bfc127405f7ead0d1c275c4d75682a51e00e (diff)
downloadrails-84eece0a823e9c601ea99a8709f24605a19bcbfd.tar.gz
rails-84eece0a823e9c601ea99a8709f24605a19bcbfd.tar.bz2
rails-84eece0a823e9c601ea99a8709f24605a19bcbfd.zip
Merge branch 'master' of git://github.com/rails/rails
Diffstat (limited to 'activerecord/test/cases/primary_keys_test.rb')
-rw-r--r--activerecord/test/cases/primary_keys_test.rb14
1 files changed, 14 insertions, 0 deletions
diff --git a/activerecord/test/cases/primary_keys_test.rb b/activerecord/test/cases/primary_keys_test.rb
index 489c7d8310..58badd6266 100644
--- a/activerecord/test/cases/primary_keys_test.rb
+++ b/activerecord/test/cases/primary_keys_test.rb
@@ -5,6 +5,7 @@ require 'models/subscriber'
require 'models/movie'
require 'models/keyboard'
require 'models/mixed_case_monkey'
+require 'models/edge'
class PrimaryKeysTest < ActiveRecord::TestCase
fixtures :topics, :subscribers, :movies, :mixed_case_monkeys
@@ -161,4 +162,17 @@ class PrimaryKeysTest < ActiveRecord::TestCase
assert_equal 'foo', model.primary_key
end
+
+ def test_no_primary_key_raises
+ assert_raises(ActiveRecord::UnknownPrimaryKey) do
+ Edge.primary_key
+ end
+
+ begin
+ Edge.primary_key
+ rescue ActiveRecord::UnknownPrimaryKey => e
+ assert e.message.include?('edges')
+ assert e.message.include?('Edge')
+ end
+ end
end