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

[rails.git] / test / controllers / api / tracepoints_controller_test.rb

diff --git a/test/controllers/api/tracepoints_controller_test.rb b/test/controllers/api/tracepoints_controller_test.rb
index 5b4f4ad8463cb9b7dbd867abc081cdb0aa1906ea..aeea3f4f45f2ecfd64bc0ec4d2d80b0c9d8bb9d5 100644 (file)
--- a/test/controllers/api/tracepoints_controller_test.rb
+++ b/test/controllers/api/tracepoints_controller_test.rb
@@ -13,7 +13,7 @@ module Api
       @goodbbox = %w[-0.1,-0.1,0.1,0.1 51.1,-0.1,51.2,0
                      -0.1,%20-0.1,%200.1,%200.1 -0.1edcd,-0.1d,0.1,0.1 -0.1E,-0.1E,0.1S,0.1N S0.1,W0.1,N0.1,E0.1]
       # That last item in the goodbbox really shouldn't be there, as the API should
-      # reall reject it, however this is to test to see if the api changes.
+      # really reject it, however this is to test to see if the api changes.
     end
 
     ##
@@ -38,7 +38,10 @@ module Api
       assert_response :success
       assert_select "gpx[version='1.0'][creator='OpenStreetMap.org']", :count => 1 do
         assert_select "trk" do
-          assert_select "trkseg"
+          assert_select "name", :count => 0
+          assert_select "desc", :count => 0
+          assert_select "url", :count => 0
+          assert_select "trkseg", :count => 1
         end
       end
     end
@@ -57,7 +60,10 @@ module Api
       assert_response :success
       assert_select "gpx[version='1.0'][creator='OpenStreetMap.org']", :count => 1 do
         assert_select "trk", :count => 1 do
-          assert_select "trk > trkseg", :count => 2 do |trksegs|
+          assert_select "name", :count => 0
+          assert_select "desc", :count => 0
+          assert_select "url", :count => 0
+          assert_select "trkseg", :count => 2 do |trksegs|
             trksegs.each do |trkseg|
               assert_select trkseg, "trkpt", :count => 1 do |trkpt|
                 assert_select trkpt[0], "time", :count => 1
@@ -81,9 +87,9 @@ module Api
       assert_response :success
       assert_select "gpx[version='1.0'][creator='OpenStreetMap.org']", :count => 1 do
         assert_select "trk", :count => 1 do
-          assert_select "trk>name", :count => 1
-          assert_select "trk>desc", :count => 1
-          assert_select "trk>url", :count => 1
+          assert_select "name", :count => 1
+          assert_select "desc", :count => 1
+          assert_select "url", :count => 1
           assert_select "trkseg", :count => 1 do
             assert_select "trkpt", :count => 1 do
               assert_select "time", :count => 1
@@ -96,10 +102,10 @@ module Api
     def test_index_without_bbox
       get trackpoints_path
       assert_response :bad_request
-      assert_equal "The parameter bbox is required, and must be of the form min_lon,min_lat,max_lon,max_lat", @response.body, "A bbox param was expected"
+      assert_equal "The parameter bbox is required", @response.body, "A bbox param was expected"
     end
 
-    def test_traces_page_less_than_0
+    def test_traces_page_less_than_zero
       -10.upto(-1) do |i|
         get trackpoints_path(:page => i, :bbox => "-0.1,-0.1,0.1,0.1")
         assert_response :bad_request
@@ -123,7 +129,7 @@ module Api
       @badmalformedbbox.each do |bbox|
         get trackpoints_path(:bbox => bbox)
         assert_response :bad_request, "The bbox:#{bbox} was expected to be malformed"
-        assert_equal "The parameter bbox is required, and must be of the form min_lon,min_lat,max_lon,max_lat", @response.body, "bbox: #{bbox}"
+        assert_equal "The parameter bbox must be of the form min_lon,min_lat,max_lon,max_lat", @response.body, "bbox: #{bbox}"
       end
     end
 
@@ -142,5 +148,14 @@ module Api
         assert_equal "The minimum latitude must be less than the maximum latitude, but it wasn't", @response.body, "bbox: #{bbox}"
       end
     end
+
+    # Ensure the lat/lon is formatted as a decimal e.g. not 4.0e-05
+    def test_lat_lon_xml_format
+      create(:tracepoint, :latitude => (0.00004 * GeoRecord::SCALE).to_i, :longitude => (0.00008 * GeoRecord::SCALE).to_i)
+
+      get trackpoints_path(:bbox => "0,0,0.1,0.1")
+      assert_match(/lat="0.0000400"/, response.body)
+      assert_match(/lon="0.0000800"/, response.body)
+    end
   end
 end