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

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

diff --git a/test/models/note_test.rb b/test/models/note_test.rb
index ba87911e33a8d79be67e2793958bdb5f8c20290b..706cda413f014761f5788c852e8b351872b25f40 100644 (file)
--- a/test/models/note_test.rb
+++ b/test/models/note_test.rb
@@ -48,38 +48,30 @@ class NoteTest < ActiveSupport::TestCase
   end
 
   def test_description
-    comment = create(:note_comment)
-    assert_equal comment.body, comment.note.description
+    note = create(:note)
+    assert_equal "Default note's description", note.description
 
-    user = create(:user)
-    comment = create(:note_comment, :author => user)
-    assert_equal comment.body, comment.note.description
-  end
+    note = create(:note, :description => "Test description #1")
+    assert_equal "Test description #1", note.description
 
-  def test_author
     comment = create(:note_comment)
-    assert_nil comment.note.author
+    assert_equal "Default note's description", comment.note.description
 
-    user = create(:user)
-    comment = create(:note_comment, :author => user)
-    assert_equal user, comment.note.author
+    comment = create(:note_comment, :note => build(:note, :description => "Test description #2"))
+    assert_equal "Test description #2", comment.note.description
   end
 
-  def test_author_id
-    comment = create(:note_comment)
-    assert_nil comment.note.author_id
-
+  def test_author
     user = create(:user)
-    comment = create(:note_comment, :author => user)
-    assert_equal user.id, comment.note.author_id
-  end
 
-  def test_author_ip
+    note = create(:note, :author => user)
+    assert_equal user, note.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
+    comment = create(:note_comment, :author => user, :note => build(:note, :author => user))
+    assert_equal user, comment.note.author
   end
 
   # Ensure the lat/lon is formatted as a decimal e.g. not 4.0e-05