aboutsummaryrefslogtreecommitdiffstats
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 11:43:12 -0700
commit6ff78a188a953fb06ebae469e17d3fa6917f08e2 (patch)
tree8fbf9f409adc85070e5d74dc5fc4752da8f1d52f
parenta268d2dc972c73b9f406002364b633afa0d3d98c (diff)
parentddf58fa9aa15bb2f58bc8779aab5bd273d35edde (diff)
downloadrails-6ff78a188a953fb06ebae469e17d3fa6917f08e2.tar.gz
rails-6ff78a188a953fb06ebae469e17d3fa6917f08e2.tar.bz2
rails-6ff78a188a953fb06ebae469e17d3fa6917f08e2.zip
Merge pull request #6715 from arunagw/add_asserts
Need a assert here in tests
-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 b35dc2d26d..214546802a 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