X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/4627b79885a53043001383679e83fafacf5c6193..47ef813f1fbb59136a77bf1d154ce4d136269458:/test/models/note_test.rb diff --git a/test/models/note_test.rb b/test/models/note_test.rb index d4bd36e74..34b16c19d 100644 --- a/test/models/note_test.rb +++ b/test/models/note_test.rb @@ -1,23 +1,20 @@ -# -*- coding: utf-8 -*- require "test_helper" class NoteTest < ActiveSupport::TestCase - fixtures :users - 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 = 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 !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 @@ -31,7 +28,7 @@ class NoteTest < ActiveSupport::TestCase end def test_reopen - note = create(:note, :status => "closed", :closed_at => Time.now) + note = create(:note, :closed) assert_equal "closed", note.status assert_not_nil note.closed_at note.reopen @@ -40,22 +37,23 @@ class NoteTest < ActiveSupport::TestCase end def test_visible? - assert_equal true, create(:note, :status => "open").visible? - assert_equal true, create(:note, :status => "closed").visible? - assert_equal false, 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_equal true, create(:note, :status => "closed", :closed_at => Time.now).closed? - assert_equal false, 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 comment = create(:note_comment) assert_nil comment.note.author - comment = create(:note_comment, :author => users(:normal_user)) - assert_equal users(:normal_user), comment.note.author + user = create(:user) + comment = create(:note_comment, :author => user) + assert_equal user, comment.note.author end def test_author_ip @@ -65,4 +63,12 @@ class NoteTest < ActiveSupport::TestCase 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