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 3f9e2a145c74278f6dd6f0a52af349aa7a6826dd..86a8fe609f1a66c2d43aef97823b482e8bf74041 100644 (file)
--- a/test/functional/site_controller_test.rb
+++ b/test/functional/site_controller_test.rb
@@ -1,7 +1,7 @@
 require File.dirname(__FILE__) + '/../test_helper'
 
 class SiteControllerTest < ActionController::TestCase
 require File.dirname(__FILE__) + '/../test_helper'
 
 class SiteControllerTest < ActionController::TestCase

-  fixtures :users
+  api_fixtures

 
   ##
   # test all routes which lead to this controller
 
   ##
   # test all routes which lead to this controller


@@ -34,6 +34,10 @@ class SiteControllerTest < ActionController::TestCase
       { :path => "/copyright/locale", :method => :get },
       { :controller => "site", :action => "copyright", :copyright_locale => "locale" }
     )
       { :path => "/copyright/locale", :method => :get },
       { :controller => "site", :action => "copyright", :copyright_locale => "locale" }
     )

+    assert_routing(
+      { :path => "/welcome", :method => :get },
+      { :controller => "site", :action => "welcome" }
+    )

     assert_routing(
       { :path => "/export", :method => :get },
       { :controller => "site", :action => "export" }
     assert_routing(
       { :path => "/export", :method => :get },
       { :controller => "site", :action => "export" }


@@ -47,13 +51,21 @@ class SiteControllerTest < ActionController::TestCase
       { :controller => "site", :action => "offline" }
     )
     assert_routing(
       { :controller => "site", :action => "offline" }
     )
     assert_routing(

-      { :path => "/key", :method => :post },
+      { :path => "/key", :method => :get },

       { :controller => "site", :action => "key" }
     )
     assert_routing(
       { :path => "/go/shortcode", :method => :get },
       { :controller => "site", :action => "permalink", :code => "shortcode" }
     )
       { :controller => "site", :action => "key" }
     )
     assert_routing(
       { :path => "/go/shortcode", :method => :get },
       { :controller => "site", :action => "permalink", :code => "shortcode" }
     )

+    assert_routing(
+      { :path => "/preview/formatname", :method => :post },
+      { :controller => "site", :action => "preview", :format => "formatname" }
+    )
+    assert_routing(
+      { :path => "/id", :method => :get },
+      { :controller => "site", :action => "id" }
+    )

   end
 
   ## Lets check that we can get all the pages without any errors  
   end
 
   ## Lets check that we can get all the pages without any errors  


@@ -62,9 +74,41 @@ class SiteControllerTest < ActionController::TestCase
     get :index
     assert_response :success
     assert_template 'index'
     get :index
     assert_response :success
     assert_template 'index'

-    assert_site_partials

   end
   end

-  
+
+  def test_index_redirect
+    get :index, :lat => 4, :lon => 5
+    assert_redirected_to :controller => :site, :action => 'index', :anchor => 'map=5/4/5'
+
+    get :index, :lat => 4, :lon => 5, :zoom => 3
+    assert_redirected_to :controller => :site, :action => 'index', :anchor => 'map=3/4/5'
+
+    get :index, :layers => 'T'
+    assert_redirected_to :controller => :site, :action => 'index', :anchor => 'layers=T'
+
+    get :index, :notes => 'yes'
+    assert_redirected_to :controller => :site, :action => 'index', :anchor => 'layers=N'
+
+    get :index, :lat => 4, :lon => 5, :zoom => 3, :layers => 'T'
+    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'
+  end
+

   # Get the edit page
   def test_edit
     get :edit
   # Get the edit page
   def test_edit
     get :edit


@@ -72,32 +116,15 @@ class SiteControllerTest < ActionController::TestCase
     assert_redirected_to :controller => :user, :action => 'login', :referer => "/edit"
   end
   
     assert_redirected_to :controller => :user, :action => 'login', :referer => "/edit"
   end
   

-  # Get the export page
-  def test_export
-    get :export
-    assert_response :success
-    assert_template 'index'
-    assert_site_partials
-  end
-  

   # Offline page
   def test_offline
     get :offline
     assert_response :success
     assert_template 'offline'
   # Offline page
   def test_offline
     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 => '_key', :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
   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
     get(:edit, nil, { 'user' => users(:public_user).id })
     assert_response :success
     assert_template :partial => "_#{DEFAULT_EDITOR}", :count => 1


@@ -105,8 +132,6 @@ class SiteControllerTest < ActionController::TestCase
 
   # and when they have...
   def test_edit_with_preference
 
   # 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!
     user = users(:public_user)
     user.preferred_editor = "potlatch"
     user.save!


@@ -122,5 +147,32 @@ class SiteControllerTest < ActionController::TestCase
     get(:edit, nil, { 'user' => user.id })
     assert_response :success
     assert_template "index"
     get(:edit, nil, { 'user' => user.id })
     assert_response :success
     assert_template "index"

-  end    
+  end
+
+  def test_edit_with_node
+    user = users(:public_user)
+    node = current_nodes(:visible_node)
+
+    get :edit, { :node => node.id }, { 'user' => user.id }
+    assert_equal 1.0, assigns(:lat)
+    assert_equal 1.0, assigns(:lon)
+  end
+
+  def test_edit_with_way
+    user = users(:public_user)
+    way  = current_ways(:visible_way)
+
+    get :edit, { :way => way.id }, { 'user' => user.id }
+    assert_equal 3.0, assigns(:lat)
+    assert_equal 3.0, assigns(:lon)
+  end
+
+  def test_edit_with_gpx
+    user = users(:public_user)
+    gpx  = gpx_files(:public_trace_file)
+
+    get :edit, { :gpx => gpx.id }, { 'user' => user.id }
+    assert_equal 1.0, assigns(:lat)
+    assert_equal 1.0, assigns(:lon)
+  end

 end
 end