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

[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 972e08cc37258edb7b2cee94c9309c1d8cf1126b..daaf193c8969eaee4d9c21c3a7b5414c821d24d2 100644 (file)
--- a/test/controllers/export_controller_test.rb
+++ b/test/controllers/export_controller_test.rb
@@ -19,7 +19,7 @@ class ExportControllerTest < ActionController::TestCase
   def test_finish_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"
+    assert_redirected_to "controller" => "api/map", "action" => "index", "bbox" => "0.0,50.0,1.0,51.0"
   end
 
   ###
@@ -27,7 +27,7 @@ class ExportControllerTest < ActionController::TestCase
   def test_finish_mapnik
     get :finish, :params => { :minlon => 0, :minlat => 50, :maxlon => 1, :maxlat => 51, :format => "mapnik", :mapnik_format => "test", :mapnik_scale => "12" }
     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
 
   ##