X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/45487e1ff8e7d334792440a2b5b3b1067269bfaf..86fae8980d97ba7fdd9345eb5e372fd4f8f20b7f:/test/models/note_test.rb diff --git a/test/models/note_test.rb b/test/models/note_test.rb index b74cebcc4..34b16c19d 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.utc) + note = create(:note, :closed) assert_equal "closed", note.status assert_not_nil note.closed_at note.reopen @@ -37,14 +37,14 @@ 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.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_author