Fix test failures

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

diff --git a/test/functional/site_controller_test.rb b/test/functional/site_controller_test.rb
index 4f41858e86b2d17ccc4ae6ca2bafd461a75ffb6d..86a8fe609f1a66c2d43aef97823b482e8bf74041 100644 (file)
--- a/test/functional/site_controller_test.rb
+++ b/test/functional/site_controller_test.rb
@@ -40,10 +40,10 @@ class SiteControllerTest < ActionController::TestCase
     )
     assert_routing(
       { :path => "/export", :method => :get },
-      { :controller => "site", :action => "index", :export => true }
+      { :controller => "site", :action => "export" }
     )
     assert_recognizes(
-      { :controller => "site", :action => "index", :export => true, :format => "html" },
+      { :controller => "site", :action => "export", :format => "html" },
       { :path => "/export.html", :method => :get }
     )
     assert_routing(
@@ -59,7 +59,7 @@ class SiteControllerTest < ActionController::TestCase
       { :controller => "site", :action => "permalink", :code => "shortcode" }
     )
     assert_routing(
-      { :path => "/preview/formatname", :method => :get },
+      { :path => "/preview/formatname", :method => :post },
       { :controller => "site", :action => "preview", :format => "formatname" }
     )
     assert_routing(
@@ -74,7 +74,6 @@ class SiteControllerTest < ActionController::TestCase
     get :index
     assert_response :success
     assert_template 'index'
-    assert_site_partials
   end
 
   def test_index_redirect
@@ -94,6 +93,17 @@ class SiteControllerTest < ActionController::TestCase
     assert_redirected_to :controller => :site, :action => 'index', :anchor => 'map=3/4/5&layers=T'
   end
 
+  def test_edit_redirect
+    get :edit, :lat => 4, :lon => 5
+    assert_redirected_to :controller => :site, :action => 'edit', :anchor => 'map=5/4/5'
+
+    get :edit, :lat => 4, :lon => 5, :zoom => 3
+    assert_redirected_to :controller => :site, :action => 'edit', :anchor => 'map=3/4/5'
+
+    get :edit, :lat => 4, :lon => 5, :zoom => 3, :editor => 'id'
+    assert_redirected_to :controller => :site, :action => 'edit', :editor => 'id', :anchor => 'map=3/4/5'
+  end
+
   def test_permalink
     get :permalink, :code => 'wBz3--'
     assert_redirected_to :controller => :site, :action => 'index', :anchor => 'map=3/4.8779296875/3.955078125'
@@ -111,18 +121,10 @@ class SiteControllerTest < ActionController::TestCase
     get :offline
     assert_response :success
     assert_template 'offline'
-    assert_site_partials 0
-  end
-  
-  def assert_site_partials(count = 1)
-    assert_template :partial => '_search', :count => count
-    assert_template :partial => '_sidebar', :count => count
   end
 
   # test the right editor gets used when the user hasn't set a preference
   def test_edit_without_preference
-    @request.cookies["_osm_username"] = users(:public_user).display_name
-
     get(:edit, nil, { 'user' => users(:public_user).id })
     assert_response :success
     assert_template :partial => "_#{DEFAULT_EDITOR}", :count => 1
@@ -130,8 +132,6 @@ class SiteControllerTest < ActionController::TestCase
 
   # and when they have...
   def test_edit_with_preference
-    @request.cookies["_osm_username"] = users(:public_user).display_name
-
     user = users(:public_user)
     user.preferred_editor = "potlatch"
     user.save!
@@ -150,8 +150,6 @@ class SiteControllerTest < ActionController::TestCase
   end
 
   def test_edit_with_node
-    @request.cookies["_osm_username"] = users(:public_user).display_name
-
     user = users(:public_user)
     node = current_nodes(:visible_node)
 
@@ -161,8 +159,6 @@ class SiteControllerTest < ActionController::TestCase
   end
 
   def test_edit_with_way
-    @request.cookies["_osm_username"] = users(:public_user).display_name
-
     user = users(:public_user)
     way  = current_ways(:visible_way)
 
@@ -172,8 +168,6 @@ class SiteControllerTest < ActionController::TestCase
   end
 
   def test_edit_with_gpx
-    @request.cookies["_osm_username"] = users(:public_user).display_name
-
     user = users(:public_user)
     gpx  = gpx_files(:public_trace_file)