Merge remote-tracking branch 'upstream/pull/5419'

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

diff --git a/test/models/tracepoint_test.rb b/test/models/tracepoint_test.rb
index a672b7c62b9de9e0374afc4f93470e730c154e75..3d836a2e7a4f12b4ddf9441c3da6c7f10d65bed7 100644 (file)
--- a/test/models/tracepoint_test.rb
+++ b/test/models/tracepoint_test.rb
@@ -3,16 +3,8 @@ require "test_helper"
 class TracepointTest < ActiveSupport::TestCase
   def test_timestamp_required
     tracepoint = create(:tracepoint)
-    assert tracepoint.valid?
+    assert_predicate tracepoint, :valid?
     tracepoint.timestamp = nil
-    assert_not tracepoint.valid?
-  end
-
-  # Ensure the lat/lon is formatted as a decimal e.g. not 4.0e-05
-  def test_lat_lon_xml_format
-    tracepoint = build(:tracepoint, :latitude => 0.00004 * GeoRecord::SCALE, :longitude => 0.00008 * GeoRecord::SCALE)
-
-    assert_match(/lat="0.0000400"/, tracepoint.to_xml_node.to_s)
-    assert_match(/lon="0.0000800"/, tracepoint.to_xml_node.to_s)
+    assert_not_predicate tracepoint, :valid?
   end
 end