Remove unneessary return added accidentally

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

diff --git a/test/functional/export_controller_test.rb b/test/functional/export_controller_test.rb
index 8e4282b8f1b5c1e45058f9393ae1d191370c0972..d36f0cfd807e61fa5b78aaf7456213438652a36a 100644 (file)
--- a/test/functional/export_controller_test.rb
+++ b/test/functional/export_controller_test.rb
@@ -5,30 +5,38 @@ class ExportControllerTest < ActionController::TestCase
   ##
   # test all routes which lead to this controller
   def test_routes
-    assert_routing(
-      { :path => "/export/start", :method => :get },
-      { :controller => "export", :action => "start" }
-    )
     assert_routing(
       { :path => "/export/finish", :method => :post },
       { :controller => "export", :action => "finish" }
     )
+    assert_routing(
+      { :path => "/export/embed", :method => :get },
+      { :controller => "export", :action => "embed" }
+    )
   end
 
-  def test_start
-    xhr :get, :start
-    assert_response :success
-    assert_template 'export/_sidebar'
-  end
-  
+  ###
+  # test the finish action for raw OSM data
   def test_finish_osm
     get :finish, {: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"
   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'}
     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"
+  end
+
+  ##
+  # test the embed action
+  def test_embed
+    get :embed
+    assert_response :success
+    assert_template "export/embed"
   end
 
 end