diff options
| author | Rolf Timmermans <r.timmermans@voormedia.com> | 2011-03-27 17:18:32 +0200 |
|---|---|---|
| committer | Rolf Timmermans <r.timmermans@voormedia.com> | 2011-03-27 17:18:32 +0200 |
| commit | 512057d386075f207d8927a5e0ce3943174d5c78 (patch) | |
| tree | c0b9122469af1e4af74142cc2cad6d560226753c /activemodel/lib/active_model/lint.rb | |
| parent | d89a7967b5af5c87bbfc268af72287b82541d384 (diff) | |
| parent | a9d27c04abf24dc85be061ff9772d71897af02b1 (diff) | |
| download | rails-512057d386075f207d8927a5e0ce3943174d5c78.tar.gz rails-512057d386075f207d8927a5e0ce3943174d5c78.tar.bz2 rails-512057d386075f207d8927a5e0ce3943174d5c78.zip | |
Merge remote-tracking branch 'upstream/master' into desc_tracker
Diffstat (limited to 'activemodel/lib/active_model/lint.rb')
| -rw-r--r-- | activemodel/lib/active_model/lint.rb | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/activemodel/lib/active_model/lint.rb b/activemodel/lib/active_model/lint.rb index 957d1b9d70..b71ef4b22e 100644 --- a/activemodel/lib/active_model/lint.rb +++ b/activemodel/lib/active_model/lint.rb @@ -23,7 +23,7 @@ module ActiveModel def test_to_key assert model.respond_to?(:to_key), "The model should respond to to_key" def model.persisted?() false end - assert model.to_key.nil? + assert model.to_key.nil?, "to_key should return nil when `persisted?` returns false" end # == Responds to <tt>to_param</tt> @@ -40,7 +40,7 @@ module ActiveModel assert model.respond_to?(:to_param), "The model should respond to to_param" def model.to_key() [1] end def model.persisted?() false end - assert model.to_param.nil? + assert model.to_param.nil?, "to_param should return nil when `persisted?` returns false" end # == Responds to <tt>valid?</tt> |