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

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

diff --git a/test/controllers/export_controller_test.rb b/test/controllers/export_controller_test.rb
index 9d1c69e4dc61f96c3e1c21381c42ec61b12639b0..94cf6cf52ef3d33340bd9d4375e55c81a4e4ec64 100644 (file)
--- a/test/controllers/export_controller_test.rb
+++ b/test/controllers/export_controller_test.rb
@@ -17,7 +17,7 @@ class ExportControllerTest < ActionController::TestCase
   ###
   # test the finish action for raw OSM data
   def test_finish_osm
   ###
   # test the finish action for raw OSM data
   def test_finish_osm

-    get :finish, :minlon => 0, :minlat => 50, :maxlon => 1, :maxlat => 51, :format => "osm"
+    get :finish, :params => { :minlon => 0, :minlat => 50, :maxlon => 1, :maxlat => 51, :format => "osm" }

     assert_response :redirect
     assert_redirected_to "controller" => "api", "action" => "map", "bbox" => "0.0,50.0,1.0,51.0"
   end
     assert_response :redirect
     assert_redirected_to "controller" => "api", "action" => "map", "bbox" => "0.0,50.0,1.0,51.0"
   end


@@ -25,9 +25,9 @@ class ExportControllerTest < ActionController::TestCase
   ###
   # test the finish action for mapnik images
   def test_finish_mapnik
   ###
   # test the finish action for mapnik images
   def test_finish_mapnik

-    get :finish, :minlon => 0, :minlat => 50, :maxlon => 1, :maxlat => 51, :format => "mapnik", :mapnik_format => "test", :mapnik_scale => "12"
+    get :finish, :params => { :minlon => 0, :minlat => 50, :maxlon => 1, :maxlat => 51, :format => "mapnik", :mapnik_format => "test", :mapnik_scale => "12" }

     assert_response :redirect
     assert_response :redirect

-    assert_redirected_to "http://render.openstreetmap.org/cgi-bin/export?bbox=0.0,50.0,1.0,51.0&scale=12&format=test"
+    assert_redirected_to "https://render.openstreetmap.org/cgi-bin/export?bbox=0.0,50.0,1.0,51.0&scale=12&format=test"

   end
 
   ##
   end
 
   ##