X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/3ca642271aac133eb3f0b32e9c5d096e61479cbe..e418075e26d80d68e4127d3358a2d8b11dee3a13:/test/functional/site_controller_test.rb

diff --git a/test/functional/site_controller_test.rb b/test/functional/site_controller_test.rb
index 8885fae28..d55761f82 100644
--- a/test/functional/site_controller_test.rb
+++ b/test/functional/site_controller_test.rb
@@ -14,10 +14,6 @@ class SiteControllerTest < ActionController::TestCase
       { :path => "/", :method => :post },
       { :controller => "site", :action => "index" }
     )
-    assert_recognizes(
-      { :controller => "site", :action => "index" },
-      { :path => "/index.html", :method => :get }
-    )
     assert_routing(
       { :path => "/edit", :method => :get },
       { :controller => "site", :action => "edit" }
@@ -40,10 +36,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 +55,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 +70,6 @@ class SiteControllerTest < ActionController::TestCase
     get :index
     assert_response :success
     assert_template 'index'
-    assert_site_partials
   end
 
   def test_index_redirect
@@ -122,18 +117,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
@@ -141,8 +128,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!
@@ -161,8 +146,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)
 
@@ -172,8 +155,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)
 
@@ -183,8 +164,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)