Merge remote-tracking branch 'osmlab/id-default'

[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 5fc3a02149e88146b2d5bfe383ec28ae2cbb6d72..8885fae28fb5de64c7acb078570f3963ea036431 100644 (file)
--- a/test/functional/site_controller_test.rb
+++ b/test/functional/site_controller_test.rb
@@ -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 => "index", :export => true }
     assert_routing(
       { :path => "/export", :method => :get },
       { :controller => "site", :action => "index", :export => true }


@@ -58,6 +62,10 @@ class SiteControllerTest < ActionController::TestCase
       { :path => "/preview/formatname", :method => :get },
       { :controller => "site", :action => "preview", :format => "formatname" }
     )
       { :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  
   end
 
   ## Lets check that we can get all the pages without any errors  


@@ -68,7 +76,40 @@ class SiteControllerTest < ActionController::TestCase
     assert_template 'index'
     assert_site_partials
   end
     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_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