Move close button out of right sidebar content

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

diff --git a/test/models/note_test.rb b/test/models/note_test.rb
index 8b0439ac22dc0e5487f6017e872f6883b50fc4cc..706cda413f014761f5788c852e8b351872b25f40 100644 (file)
--- a/test/models/note_test.rb
+++ b/test/models/note_test.rb
@@ -48,20 +48,29 @@ class NoteTest < ActiveSupport::TestCase
   end
 
   def test_description
+    note = create(:note)
+    assert_equal "Default note's description", note.description
+
+    note = create(:note, :description => "Test description #1")
+    assert_equal "Test description #1", note.description
+
     comment = create(:note_comment)
-    assert_equal comment.body, comment.note.description
+    assert_equal "Default note's description", comment.note.description
 
-    user = create(:user)
-    comment = create(:note_comment, :author => user)
-    assert_equal comment.body, comment.note.description
+    comment = create(:note_comment, :note => build(:note, :description => "Test description #2"))
+    assert_equal "Test description #2", comment.note.description
   end
 
   def test_author
+    user = create(:user)
+
+    note = create(:note, :author => user)
+    assert_equal user, note.author
+
     comment = create(:note_comment)
     assert_nil comment.note.author
 
-    user = create(:user)
-    comment = create(:note_comment, :author => user)
+    comment = create(:note_comment, :author => user, :note => build(:note, :author => user))
     assert_equal user, comment.note.author
   end