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 64ba70b1937668f1b2853a4206caee5cf38ab5cb..daaf193c8969eaee4d9c21c3a7b5414c821d24d2 100644 (file)
--- a/test/controllers/export_controller_test.rb
+++ b/test/controllers/export_controller_test.rb
@@ -1,7 +1,6 @@
-require 'test_helper'
+require "test_helper"
 
 class ExportControllerTest < ActionController::TestCase
-
   ##
   # test all routes which lead to this controller
   def test_routes
@@ -18,17 +17,17 @@ class ExportControllerTest < ActionController::TestCase
   ###
   # 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 "http://api.openstreetmap.org/api/#{API_VERSION}/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
 
   ###
   # 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_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
 
   ##
@@ -38,5 +37,4 @@ class ExportControllerTest < ActionController::TestCase
     assert_response :success
     assert_template "export/embed"
   end
-
 end