X-Git-Url: https://git.openstreetmap.org/rails.git/blobdiff_plain/5682fb4d2465024639d6e0006c664f203ba773f5..8383fd0928a3a431dc58c48d42bf1d19bc43ea34:/test/controllers/api_controller_test.rb

diff --git a/test/controllers/api_controller_test.rb b/test/controllers/api_controller_test.rb
index cdc20a1aa..3f4196ffb 100644
--- a/test/controllers/api_controller_test.rb
+++ b/test/controllers/api_controller_test.rb
@@ -18,26 +18,10 @@ class ApiControllerTest < ActionController::TestCase
   ##
   # test all routes which lead to this controller
   def test_routes
-    assert_routing(
-      { :path => "/api/capabilities", :method => :get },
-      { :controller => "api", :action => "capabilities" }
-    )
-    assert_recognizes(
-      { :controller => "api", :action => "capabilities" },
-      { :path => "/api/0.6/capabilities", :method => :get }
-    )
-    assert_routing(
-      { :path => "/api/0.6/permissions", :method => :get },
-      { :controller => "api", :action => "permissions" }
-    )
     assert_routing(
       { :path => "/api/0.6/map", :method => :get },
       { :controller => "api", :action => "map" }
     )
-    assert_routing(
-      { :path => "/api/0.6/trackpoints", :method => :get },
-      { :controller => "api", :action => "trackpoints" }
-    )
     assert_routing(
       { :path => "/api/0.6/changes", :method => :get },
       { :controller => "api", :action => "changes" }
@@ -147,131 +131,41 @@ class ApiControllerTest < ActionController::TestCase
     end
   end
 
-  def test_tracepoints
-    point = create(:trace, :visibility => "public", :latitude => 1, :longitude => 1) do |trace|
-      create(:tracepoint, :trace => trace, :latitude => 1 * GeoRecord::SCALE, :longitude => 1 * GeoRecord::SCALE)
-    end
-    minlon = point.longitude - 0.001
-    minlat = point.latitude - 0.001
-    maxlon = point.longitude + 0.001
-    maxlat = point.latitude + 0.001
-    bbox = "#{minlon},#{minlat},#{maxlon},#{maxlat}"
-    get :trackpoints, :params => { :bbox => bbox }
-    assert_response :success
-    assert_select "gpx[version='1.0'][creator='OpenStreetMap.org']", :count => 1 do
-      assert_select "trk" do
-        assert_select "trkseg"
-      end
-    end
-  end
-
-  def test_tracepoints_trackable
-    point = create(:trace, :visibility => "trackable", :latitude => 51.51, :longitude => -0.14) do |trace|
-      create(:tracepoint, :trace => trace, :trackid => 1, :latitude => (51.510 * GeoRecord::SCALE).to_i, :longitude => (-0.140 * GeoRecord::SCALE).to_i)
-      create(:tracepoint, :trace => trace, :trackid => 2, :latitude => (51.511 * GeoRecord::SCALE).to_i, :longitude => (-0.141 * GeoRecord::SCALE).to_i)
-    end
-    minlon = point.longitude - 0.002
-    minlat = point.latitude - 0.002
-    maxlon = point.longitude + 0.002
-    maxlat = point.latitude + 0.002
-    bbox = "#{minlon},#{minlat},#{maxlon},#{maxlat}"
-    get :trackpoints, :params => { :bbox => bbox }
-    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|
-          trksegs.each do |trkseg|
-            assert_select trkseg, "trkpt", :count => 1 do |trkpt|
-              assert_select trkpt[0], "time", :count => 1
-            end
-          end
-        end
-      end
-    end
-  end
-
-  def test_tracepoints_identifiable
-    point = create(:trace, :visibility => "identifiable", :latitude => 51.512, :longitude => 0.142) do |trace|
-      create(:tracepoint, :trace => trace, :latitude => (51.512 * GeoRecord::SCALE).to_i, :longitude => (0.142 * GeoRecord::SCALE).to_i)
-    end
-    minlon = point.longitude - 0.002
-    minlat = point.latitude - 0.002
-    maxlon = point.longitude + 0.002
-    maxlat = point.latitude + 0.002
-    bbox = "#{minlon},#{minlat},#{maxlon},#{maxlat}"
-    get :trackpoints, :params => { :bbox => bbox }
-    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 "trkseg", :count => 1 do
-          assert_select "trkpt", :count => 1 do
-            assert_select "time", :count => 1
-          end
-        end
-      end
-    end
-  end
-
   def test_map_without_bbox
-    %w[trackpoints map].each do |tq|
-      get tq
-      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"
-    end
-  end
-
-  def test_traces_page_less_than_0
-    -10.upto(-1) do |i|
-      get :trackpoints, :params => { :page => i, :bbox => "-0.1,-0.1,0.1,0.1" }
-      assert_response :bad_request
-      assert_equal "Page number must be greater than or equal to 0", @response.body, "The page number was #{i}"
-    end
-    0.upto(10) do |i|
-      get :trackpoints, :params => { :page => i, :bbox => "-0.1,-0.1,0.1,0.1" }
-      assert_response :success, "The page number was #{i} and should have been accepted"
-    end
+    get :map
+    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"
   end
 
   def test_bbox_too_big
     @badbigbbox.each do |bbox|
-      %w[trackpoints map].each do |tq|
-        get tq, :params => { :bbox => bbox }
-        assert_response :bad_request, "The bbox:#{bbox} was expected to be too big"
-        assert_equal "The maximum bbox size is #{MAX_REQUEST_AREA}, and your request was too large. Either request a smaller area, or use planet.osm", @response.body, "bbox: #{bbox}"
-      end
+      get :map, :params => { :bbox => bbox }
+      assert_response :bad_request, "The bbox:#{bbox} was expected to be too big"
+      assert_equal "The maximum bbox size is #{MAX_REQUEST_AREA}, and your request was too large. Either request a smaller area, or use planet.osm", @response.body, "bbox: #{bbox}"
     end
   end
 
   def test_bbox_malformed
     @badmalformedbbox.each do |bbox|
-      %w[trackpoints map].each do |tq|
-        get tq, :params => { :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}"
-      end
+      get :map, :params => { :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}"
     end
   end
 
   def test_bbox_lon_mixedup
     @badlonmixedbbox.each do |bbox|
-      %w[trackpoints map].each do |tq|
-        get tq, :params => { :bbox => bbox }
-        assert_response :bad_request, "The bbox:#{bbox} was expected to have the longitude mixed up"
-        assert_equal "The minimum longitude must be less than the maximum longitude, but it wasn't", @response.body, "bbox: #{bbox}"
-      end
+      get :map, :params => { :bbox => bbox }
+      assert_response :bad_request, "The bbox:#{bbox} was expected to have the longitude mixed up"
+      assert_equal "The minimum longitude must be less than the maximum longitude, but it wasn't", @response.body, "bbox: #{bbox}"
     end
   end
 
   def test_bbox_lat_mixedup
     @badlatmixedbbox.each do |bbox|
-      %w[trackpoints map].each do |tq|
-        get tq, :params => { :bbox => bbox }
-        assert_response :bad_request, "The bbox:#{bbox} was expected to have the latitude mixed up"
-        assert_equal "The minimum latitude must be less than the maximum latitude, but it wasn't", @response.body, "bbox: #{bbox}"
-      end
+      get :map, :params => { :bbox => bbox }
+      assert_response :bad_request, "The bbox:#{bbox} was expected to have the latitude mixed up"
+      assert_equal "The minimum latitude must be less than the maximum latitude, but it wasn't", @response.body, "bbox: #{bbox}"
     end
   end
 
@@ -378,58 +272,4 @@ class ApiControllerTest < ActionController::TestCase
     get :changes, :params => { :start => "2010-04-03 09:55:00", :end => "2010-04-03 10:55:00" }
     assert_response :success
   end
-
-  def test_capabilities
-    get :capabilities
-    assert_response :success
-    assert_select "osm[version='#{API_VERSION}'][generator='#{GENERATOR}']", :count => 1 do
-      assert_select "api", :count => 1 do
-        assert_select "version[minimum='#{API_VERSION}'][maximum='#{API_VERSION}']", :count => 1
-        assert_select "area[maximum='#{MAX_REQUEST_AREA}']", :count => 1
-        assert_select "note_area[maximum='#{MAX_NOTE_REQUEST_AREA}']", :count => 1
-        assert_select "tracepoints[per_page='#{TRACEPOINTS_PER_PAGE}']", :count => 1
-        assert_select "changesets[maximum_elements='#{Changeset::MAX_ELEMENTS}']", :count => 1
-        assert_select "status[database='online']", :count => 1
-        assert_select "status[api='online']", :count => 1
-        assert_select "status[gpx='online']", :count => 1
-      end
-    end
-  end
-
-  def test_permissions_anonymous
-    get :permissions
-    assert_response :success
-    assert_select "osm > permissions", :count => 1 do
-      assert_select "permission", :count => 0
-    end
-  end
-
-  def test_permissions_basic_auth
-    basic_authorization create(:user).email, "test"
-    get :permissions
-    assert_response :success
-    assert_select "osm > permissions", :count => 1 do
-      assert_select "permission", :count => ClientApplication.all_permissions.size
-      ClientApplication.all_permissions.each do |p|
-        assert_select "permission[name='#{p}']", :count => 1
-      end
-    end
-  end
-
-  def test_permissions_oauth
-    @request.env["oauth.token"] = AccessToken.new do |token|
-      # Just to test a few
-      token.allow_read_prefs = true
-      token.allow_write_api = true
-      token.allow_read_gpx = false
-    end
-    get :permissions
-    assert_response :success
-    assert_select "osm > permissions", :count => 1 do
-      assert_select "permission", :count => 2
-      assert_select "permission[name='allow_read_prefs']", :count => 1
-      assert_select "permission[name='allow_write_api']", :count => 1
-      assert_select "permission[name='allow_read_gpx']", :count => 0
-    end
-  end
 end