X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/baf10cd39289cd7e94a819305e46f43e85a136c6..c47a40c1db59f0d0f836fbcd1b876390befe796e:/test/models/note_test.rb?ds=sidebyside diff --git a/test/models/note_test.rb b/test/models/note_test.rb index 1f0cd74e5..34b16c19d 100644 --- a/test/models/note_test.rb +++ b/test/models/note_test.rb @@ -1,28 +1,25 @@ -# -*- coding: utf-8 -*- -require 'test_helper' +require "test_helper" class NoteTest < ActiveSupport::TestCase - fixtures :users, :notes, :note_comments - def test_status_valid - ok = %w(open closed hidden) - bad = %w(expropriated fubared) + ok = %w[open closed hidden] + bad = %w[expropriated fubared] ok.each do |status| - note = notes(:open_note) + 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 = notes(:open_note) + note = create(:note) note.status = status - assert !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 def test_close - note = notes(:open_note) + note = create(:note) assert_equal "open", note.status assert_nil note.closed_at note.close @@ -31,7 +28,7 @@ class NoteTest < ActiveSupport::TestCase end def test_reopen - note = notes(:closed_note_with_comment) + note = create(:note, :closed) assert_equal "closed", note.status assert_not_nil note.closed_at note.reopen @@ -40,23 +37,38 @@ class NoteTest < ActiveSupport::TestCase end def test_visible? - assert_equal true, notes(:open_note).visible? - assert_equal true, notes(:note_with_hidden_comment).visible? - assert_equal false, notes(:hidden_note_with_comment).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_equal true, notes(:closed_note_with_comment).closed? - assert_equal false, notes(:open_note).closed? + assert_predicate create(:note, :closed), :closed? + assert_not_predicate create(:note, :status => "open", :closed_at => nil), :closed? end def test_author - assert_nil notes(:open_note).author - assert_equal users(:normal_user), notes(:note_with_comments_by_users).author + comment = create(:note_comment) + assert_nil comment.note.author + + user = create(:user) + comment = create(:note_comment, :author => user) + assert_equal user, comment.note.author end def test_author_ip - assert_equal IPAddr.new("192.168.1.1"), notes(:open_note).author_ip - assert_nil notes(:note_with_comments_by_users).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 + end + + # Ensure the lat/lon is formatted as a decimal e.g. not 4.0e-05 + def test_lat_lon_format + note = build(:note, :latitude => 0.00004 * GeoRecord::SCALE, :longitude => 0.00008 * GeoRecord::SCALE) + + assert_equal "0.0000400", note.lat.to_s + assert_equal "0.0000800", note.lon.to_s end end