X-Git-Url: https://git.openstreetmap.org/rails.git/blobdiff_plain/4d91fe3dd95c1058cb8d24fd4c900223e30b9059..e84ed734aae9eea6f970f203bd28d8f698588b97:/test/functional/site_controller_test.rb

diff --git a/test/functional/site_controller_test.rb b/test/functional/site_controller_test.rb
index 67d020b74..770f3e2b5 100644
--- 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
-  fixtures :users
+  api_fixtures
 
   ##
   # test all routes which lead to this controller
@@ -58,6 +58,10 @@ class SiteControllerTest < ActionController::TestCase
       { :path => "/preview/formatname", :method => :get },
       { :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  
@@ -68,7 +72,29 @@ class SiteControllerTest < ActionController::TestCase
     assert_template 'index'
     assert_site_partials
   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_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
@@ -86,7 +112,6 @@ class SiteControllerTest < ActionController::TestCase
   
   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
 
@@ -118,5 +143,38 @@ class SiteControllerTest < ActionController::TestCase
     get(:edit, nil, { 'user' => user.id })
     assert_response :success
     assert_template "index"
-  end    
+  end
+
+  def test_edit_with_node
+    @request.cookies["_osm_username"] = users(:public_user).display_name
+
+    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
+    @request.cookies["_osm_username"] = users(:public_user).display_name
+
+    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
+    @request.cookies["_osm_username"] = users(:public_user).display_name
+
+    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