aboutsummaryrefslogtreecommitdiffstats
path: root/activerecord
diff options
context:
space:
mode:
authorRafael Mendonça França <rafaelmfranca@gmail.com>2012-06-12 11:43:12 -0700
committerRafael Mendonça França <rafaelmfranca@gmail.com>2012-06-12 15:48:46 -0300
commit5dd2cfc8b4a89ec6321ebbb0e81cd50d58785b6f (patch)
tree20d0d490ae27e43ee091426ff1d4bd51edbb7daa /activerecord
parent32709ea41ed1ec2a89590e9bc6656c1ecd462d30 (diff)
downloadrails-5dd2cfc8b4a89ec6321ebbb0e81cd50d58785b6f.tar.gz
rails-5dd2cfc8b4a89ec6321ebbb0e81cd50d58785b6f.tar.bz2
rails-5dd2cfc8b4a89ec6321ebbb0e81cd50d58785b6f.zip
Merge pull request #6715 from arunagw/add_asserts
Need a assert here in tests
Diffstat (limited to 'activerecord')
-rw-r--r--activerecord/test/cases/mass_assignment_security_test.rb4
1 files changed, 2 insertions, 2 deletions
diff --git a/activerecord/test/cases/mass_assignment_security_test.rb b/activerecord/test/cases/mass_assignment_security_test.rb
index e47b06f244..5153945546 100644
--- a/activerecord/test/cases/mass_assignment_security_test.rb
+++ b/activerecord/test/cases/mass_assignment_security_test.rb
@@ -95,11 +95,11 @@ class MassAssignmentSecurityTest < ActiveRecord::TestCase
end
def test_mass_assigning_does_not_choke_on_nil
- Firm.new.assign_attributes(nil)
+ assert_nil Firm.new.assign_attributes(nil)
end
def test_mass_assigning_does_not_choke_on_empty_hash
- Firm.new.assign_attributes({})
+ assert_nil Firm.new.assign_attributes({})
end
def test_assign_attributes_uses_default_role_when_no_role_is_provided