Update to Omniauth 2.x

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

diff --git a/test/controllers/api/changes_controller_test.rb b/test/controllers/api/changes_controller_test.rb
index c212ba1d07a66506ced55c3be3a5b2ade3b38864..88d3c2e0eb08e51393a9957c142bf7a9232a85b4 100644 (file)
--- a/test/controllers/api/changes_controller_test.rb
+++ b/test/controllers/api/changes_controller_test.rb
@@ -1,7 +1,7 @@
 require "test_helper"
 
 module Api
-  class ChangesControllerTest < ActionController::TestCase
+  class ChangesControllerTest < ActionDispatch::IntegrationTest
     ##
     # test all routes which lead to this controller
     def test_routes
@@ -28,11 +28,11 @@ module Api
       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 :index
+        get changes_path
         assert_response :success
         now = Time.now.getutc
         hourago = now - 1.hour
-        assert_select "osm[version='#{API_VERSION}'][generator='#{GENERATOR}']", :count => 1 do
+        assert_select "osm[version='#{Settings.api_version}'][generator='#{Settings.generator}']", :count => 1 do
           assert_select "changes[starttime='#{hourago.xmlschema}'][endtime='#{now.xmlschema}']", :count => 1 do
             assert_select "tile", :count => 0
           end
@@ -40,14 +40,14 @@ module Api
       end
 
       travel_to Time.utc(2007, 1, 1, 0, 30, 0) do
-        get :index
+        get changes_path
         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 "osm[version='#{Settings.api_version}'][generator='#{Settings.generator}']", :count => 1 do
           assert_select "changes[starttime='#{hourago.xmlschema}'][endtime='#{now.xmlschema}']", :count => 1 do
             assert_select "tile", :count => 6
           end
@@ -58,19 +58,19 @@ module Api
     def test_changes_zoom_invalid
       zoom_to_test = %w[p -1 0 17 one two]
       zoom_to_test.each do |zoom|
-        get :index, :params => { :zoom => zoom }
+        get changes_path(: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"
+        assert_equal("Requested zoom is invalid, or the supplied start is after the end time, or the start duration is more than 24 hours", @response.body)
       end
     end
 
     def test_changes_zoom_valid
       1.upto(16) do |zoom|
-        get :index, :params => { :zoom => zoom }
+        get changes_path(: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 "osm[version='#{Settings.api_version}'][generator='#{Settings.generator}']", :count => 1 do
           assert_select "changes", :count => 1
         end
       end
@@ -79,27 +79,27 @@ module Api
     def test_changes_hours_invalid
       invalid = %w[-21 335 -1 0 25 26 100 one two three ping pong :]
       invalid.each do |hour|
-        get :index, :params => { :hours => hour }
+        get changes_path(: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}."
+        assert_equal("Requested zoom is invalid, or the supplied start is after the end time, or the start duration is more than 24 hours", @response.body, "Problem with the hour: #{hour}.")
       end
     end
 
     def test_changes_hours_valid
       1.upto(24) do |hour|
-        get :index, :params => { :hours => hour }
+        get changes_path(:hours => hour)
         assert_response :success
       end
     end
 
     def test_changes_start_end_invalid
-      get :index, :params => { :start => "2010-04-03 10:55:00", :end => "2010-04-03 09:55:00" }
+      get changes_path(: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"
+      assert_equal("Requested zoom is invalid, or the supplied start is after the end time, or the start duration is more than 24 hours", @response.body)
     end
 
     def test_changes_start_end_valid
-      get :index, :params => { :start => "2010-04-03 09:55:00", :end => "2010-04-03 10:55:00" }
+      get changes_path(:start => "2010-04-03 09:55:00", :end => "2010-04-03 10:55:00")
       assert_response :success
     end
   end