Merge remote-tracking branch 'openstreetmap/pull/1347' into master

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

diff --git a/test/models/note_test.rb b/test/models/note_test.rb
index 441f52eb6b8a0036c3fc1a60a8b263c912785d87..d4bd36e74a49fede0dc6600bcaceeaa4e118cdd7 100644 (file)
--- a/test/models/note_test.rb
+++ b/test/models/note_test.rb
@@ -51,16 +51,18 @@ class NoteTest < ActiveSupport::TestCase
   end
 
   def test_author
   end
 
   def test_author

-    anonymous_comment = create(:note_comment)
-    assert_nil anonymous_comment.note.author
-    comment = create(:note_comment, :author_id => users(:normal_user).id)
+    comment = create(:note_comment)
+    assert_nil comment.note.author
+
+    comment = create(:note_comment, :author => users(:normal_user))

     assert_equal users(:normal_user), comment.note.author
   end
 
   def test_author_ip
     assert_equal users(:normal_user), comment.note.author
   end
 
   def test_author_ip

+    comment = create(:note_comment)
+    assert_nil comment.note.author_ip
+

     comment = create(:note_comment, :author_ip => IPAddr.new("192.168.1.1"))
     assert_equal IPAddr.new("192.168.1.1"), comment.note.author_ip
     comment = create(:note_comment, :author_ip => IPAddr.new("192.168.1.1"))
     assert_equal IPAddr.new("192.168.1.1"), comment.note.author_ip

-    comment = create(:note_comment, :author_ip => nil)
-    assert_nil comment.note.author_ip

   end
 end
   end
 end