X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/03cad948e30d8f82d0c1c5e249cd6c92bb44dd3d..0ab8d954ad6d6e4cee5c1238973b8f693c788fcb:/test/models/note_test.rb?ds=sidebyside diff --git a/test/models/note_test.rb b/test/models/note_test.rb index 8d5a557cd..ba87911e3 100644 --- a/test/models/note_test.rb +++ b/test/models/note_test.rb @@ -14,7 +14,7 @@ class NoteTest < ActiveSupport::TestCase 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.utc) + note = create(:note, :closed) assert_equal "closed", note.status assert_not_nil note.closed_at note.reopen @@ -38,13 +38,22 @@ class NoteTest < ActiveSupport::TestCase def test_visible? assert_predicate create(:note, :status => "open"), :visible? - assert_predicate create(:note, :status => "closed"), :visible? - assert_not create(:note, :status => "hidden").visible? + assert_predicate create(:note, :closed), :visible? + assert_not_predicate create(:note, :status => "hidden"), :visible? end def test_closed? - assert_predicate create(:note, :status => "closed", :closed_at => Time.now.utc), :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_description + comment = create(:note_comment) + assert_equal comment.body, comment.note.description + + user = create(:user) + comment = create(:note_comment, :author => user) + assert_equal comment.body, comment.note.description end def test_author @@ -56,6 +65,15 @@ class NoteTest < ActiveSupport::TestCase assert_equal user, comment.note.author end + def test_author_id + comment = create(:note_comment) + assert_nil comment.note.author_id + + user = create(:user) + comment = create(:note_comment, :author => user) + assert_equal user.id, comment.note.author_id + end + def test_author_ip comment = create(:note_comment) assert_nil comment.note.author_ip