Move the changes api to its own controller

[rails.git] / test / controllers / api_controller_test.rb

diff --git a/test/controllers/api_controller_test.rb b/test/controllers/api_controller_test.rb
index 3f4196ffb957c074f28d6f91750c570ebc1a4ade..a9f8323b387014ce01e02909c2b58c9b6afd1b8a 100644 (file)
--- a/test/controllers/api_controller_test.rb
+++ b/test/controllers/api_controller_test.rb
@@ -22,10 +22,6 @@ class ApiControllerTest < ActionController::TestCase
       { :path => "/api/0.6/map", :method => :get },
       { :controller => "api", :action => "map" }
     )
       { :path => "/api/0.6/map", :method => :get },
       { :controller => "api", :action => "map" }
     )

-    assert_routing(
-      { :path => "/api/0.6/changes", :method => :get },
-      { :controller => "api", :action => "changes" }
-    )

   end
 
   # -------------------------------------
   end
 
   # -------------------------------------


@@ -180,96 +176,4 @@ class ApiControllerTest < ActionController::TestCase
   #    end
   #  end
   # end
   #    end
   #  end
   # end

-
-  # MySQL and Postgres require that the C based functions are installed for
-  # this test to work. More information is available from:
-  # http://wiki.openstreetmap.org/wiki/Rails#Installing_the_quadtile_functions
-  # or by looking at the readme in db/README
-  def test_changes_simple
-    # create a selection of nodes
-    (1..5).each do |n|
-      create(:node, :timestamp => Time.utc(2007, 1, 1, 0, 0, 0), :lat => n, :lon => n)
-    end
-    # deleted nodes should also be counted
-    create(:node, :deleted, :timestamp => Time.utc(2007, 1, 1, 0, 0, 0), :lat => 6, :lon => 6)
-    # nodes in the same tile won't change the total
-    create(:node, :timestamp => Time.utc(2007, 1, 1, 0, 0, 0), :lat => 6, :lon => 6)
-    # nodes with a different timestamp should be ignored
-    create(:node, :timestamp => Time.utc(2008, 1, 1, 0, 0, 0), :lat => 7, :lon => 7)
-
-    travel_to Time.utc(2010, 4, 3, 10, 55, 0) do
-      get :changes
-      assert_response :success
-      now = Time.now.getutc
-      hourago = now - 1.hour
-      assert_select "osm[version='#{API_VERSION}'][generator='#{GENERATOR}']", :count => 1 do
-        assert_select "changes[starttime='#{hourago.xmlschema}'][endtime='#{now.xmlschema}']", :count => 1 do
-          assert_select "tile", :count => 0
-        end
-      end
-    end
-
-    travel_to Time.utc(2007, 1, 1, 0, 30, 0) do
-      get :changes
-      assert_response :success
-      # print @response.body
-      # As we have loaded the fixtures, we can assume that there are some
-      # changes at the time we have frozen at
-      now = Time.now.getutc
-      hourago = now - 1.hour
-      assert_select "osm[version='#{API_VERSION}'][generator='#{GENERATOR}']", :count => 1 do
-        assert_select "changes[starttime='#{hourago.xmlschema}'][endtime='#{now.xmlschema}']", :count => 1 do
-          assert_select "tile", :count => 6
-        end
-      end
-    end
-  end
-
-  def test_changes_zoom_invalid
-    zoom_to_test = %w[p -1 0 17 one two]
-    zoom_to_test.each do |zoom|
-      get :changes, :params => { :zoom => zoom }
-      assert_response :bad_request
-      assert_equal @response.body, "Requested zoom is invalid, or the supplied start is after the end time, or the start duration is more than 24 hours"
-    end
-  end
-
-  def test_changes_zoom_valid
-    1.upto(16) do |zoom|
-      get :changes, :params => { :zoom => zoom }
-      assert_response :success
-      # NOTE: there was a test here for the timing, but it was too sensitive to be a good test
-      # and it was annoying.
-      assert_select "osm[version='#{API_VERSION}'][generator='#{GENERATOR}']", :count => 1 do
-        assert_select "changes", :count => 1
-      end
-    end
-  end
-
-  def test_changes_hours_invalid
-    invalid = %w[-21 335 -1 0 25 26 100 one two three ping pong :]
-    invalid.each do |hour|
-      get :changes, :params => { :hours => hour }
-      assert_response :bad_request, "Problem with the hour: #{hour}"
-      assert_equal @response.body, "Requested zoom is invalid, or the supplied start is after the end time, or the start duration is more than 24 hours", "Problem with the hour: #{hour}."
-    end
-  end
-
-  def test_changes_hours_valid
-    1.upto(24) do |hour|
-      get :changes, :params => { :hours => hour }
-      assert_response :success
-    end
-  end
-
-  def test_changes_start_end_invalid
-    get :changes, :params => { :start => "2010-04-03 10:55:00", :end => "2010-04-03 09:55:00" }
-    assert_response :bad_request
-    assert_equal @response.body, "Requested zoom is invalid, or the supplied start is after the end time, or the start duration is more than 24 hours"
-  end
-
-  def test_changes_start_end_valid
-    get :changes, :params => { :start => "2010-04-03 09:55:00", :end => "2010-04-03 10:55:00" }
-    assert_response :success
-  end

 end
 end