X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/3666b674330ec8d14a224932a191d6121c5974e2..687429482f3a35bfcf1c828c4223c257b8c556ca:/test/models/note_test.rb

diff --git a/test/models/note_test.rb b/test/models/note_test.rb
index 2385125b5..8b0439ac2 100644
--- a/test/models/note_test.rb
+++ b/test/models/note_test.rb
@@ -8,13 +8,13 @@ class NoteTest < ActiveSupport::TestCase
     ok.each do |status|
       note = create(:note)
       note.status = status
-      assert note.valid?, "#{status} is invalid, when it should be"
+      assert_predicate note, :valid?, "#{status} is invalid, when it should be"
     end
 
     bad.each do |status|
       note = create(:note)
       note.status = status
-      assert_not note.valid?, "#{status} is valid when it shouldn't be"
+      assert_not_predicate note, :valid?, "#{status} is valid when it shouldn't be"
     end
   end
 
@@ -28,7 +28,7 @@ class NoteTest < ActiveSupport::TestCase
   end
 
   def test_reopen
-    note = create(:note, :status => "closed", :closed_at => Time.now)
+    note = create(:note, :closed)
     assert_equal "closed", note.status
     assert_not_nil note.closed_at
     note.reopen
@@ -37,31 +37,32 @@ class NoteTest < ActiveSupport::TestCase
   end
 
   def test_visible?
-    assert create(:note, :status => "open").visible?
-    assert create(:note, :status => "closed").visible?
-    assert_not create(:note, :status => "hidden").visible?
+    assert_predicate create(:note, :status => "open"), :visible?
+    assert_predicate create(:note, :closed), :visible?
+    assert_not_predicate create(:note, :status => "hidden"), :visible?
   end
 
   def test_closed?
-    assert create(:note, :status => "closed", :closed_at => Time.now).closed?
-    assert_not create(:note, :status => "open", :closed_at => nil).closed?
+    assert_predicate create(:note, :closed), :closed?
+    assert_not_predicate create(:note, :status => "open", :closed_at => nil), :closed?
   end
 
-  def test_author
+  def test_description
     comment = create(:note_comment)
-    assert_nil comment.note.author
+    assert_equal comment.body, comment.note.description
 
     user = create(:user)
     comment = create(:note_comment, :author => user)
-    assert_equal user, comment.note.author
+    assert_equal comment.body, comment.note.description
   end
 
-  def test_author_ip
+  def test_author
     comment = create(:note_comment)
-    assert_nil comment.note.author_ip
+    assert_nil comment.note.author
 
-    comment = create(:note_comment, :author_ip => IPAddr.new("192.168.1.1"))
-    assert_equal IPAddr.new("192.168.1.1"), comment.note.author_ip
+    user = create(:user)
+    comment = create(:note_comment, :author => user)
+    assert_equal user, comment.note.author
   end
 
   # Ensure the lat/lon is formatted as a decimal e.g. not 4.0e-05