X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/1f7bd08f4a8a6a626a0c1d7ed60f2dcd6a6801e8..5a0e0b2407823f501977d362ddc09664d9fa2f3f:/test/models/note_test.rb?ds=inline

diff --git a/test/models/note_test.rb b/test/models/note_test.rb
index 39efc7fe5..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 = [ "open", "closed", "hidden" ]
-    bad = [ "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
@@ -30,8 +27,8 @@ class NoteTest < ActiveSupport::TestCase
     assert_not_nil note.closed_at
   end
 
-  def test_close
-    note = notes(:closed_note_with_comment)
+  def test_reopen
+    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