Merge remote-tracking branch 'upstream/pull/5751'

[rails.git] / test / models / issue_test.rb

diff --git a/test/models/issue_test.rb b/test/models/issue_test.rb
index 02e2580b81daa08ad5dc081248d134f7d43e621d..12a7efec2b1f2c012f919a184a91c4def660b341 100644 (file)
--- a/test/models/issue_test.rb
+++ b/test/models/issue_test.rb
@@ -4,16 +4,16 @@ class IssueTest < ActiveSupport::TestCase
   def test_assigned_role
     issue = create(:issue)
 
   def test_assigned_role
     issue = create(:issue)
 

-    assert issue.valid?
+    assert_predicate issue, :valid?

     issue.assigned_role = "bogus"
     issue.assigned_role = "bogus"

-    assert_not issue.valid?
+    assert_not_predicate issue, :valid?

   end
 
   def test_reported_user
     create(:language, :code => "en")
     user = create(:user)
   end
 
   def test_reported_user
     create(:language, :code => "en")
     user = create(:user)

-    note = create(:note_comment, :author => create(:user)).note
-    anonymous_note = create(:note_comment, :author => nil).note
+    note = create(:note, :author => create(:user))
+    anonymous_note = create(:note, :author => nil)

     diary_entry = create(:diary_entry)
     diary_comment = create(:diary_comment, :diary_entry => diary_entry)
 
     diary_entry = create(:diary_entry)
     diary_comment = create(:diary_comment, :diary_entry => diary_entry)