Merge branch 'master' into moderation

[rails.git] / test / models / note_test.rb

diff --git a/test/models/note_test.rb b/test/models/note_test.rb
index 441f52eb6b8a0036c3fc1a60a8b263c912785d87..77ed7f1b2f924b75cbad17042313d42e1ebcea0f 100644 (file)
--- a/test/models/note_test.rb
+++ b/test/models/note_test.rb
@@ -2,11 +2,9 @@
 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)
@@ -51,16 +49,27 @@ class NoteTest < ActiveSupport::TestCase
   end
 
   def test_author
-    anonymous_comment = create(:note_comment)
-    assert_nil anonymous_comment.note.author
-    comment = create(:note_comment, :author_id => users(:normal_user).id)
-    assert_equal users(:normal_user), comment.note.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
+    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
-    comment = create(:note_comment, :author_ip => nil)
-    assert_nil 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