Enable image compression utils for image_optim

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

diff --git a/test/controllers/site_controller_test.rb b/test/controllers/site_controller_test.rb
index 58379c0ea7fe8b6586f2545e8f34e9d28f678b32..b8941ed30f1a4a24c1f474ab33e6bfb27d2b5f4a 100644 (file)
--- a/test/controllers/site_controller_test.rb
+++ b/test/controllers/site_controller_test.rb
@@ -91,71 +91,71 @@ class SiteControllerTest < ActionController::TestCase
 
   # Test the index page redirects
   def test_index_redirect
-    get :index, :node => 123
+    get :index, :params => { :node => 123 }
     assert_redirected_to :controller => :browse, :action => :node, :id => 123
 
-    get :index, :way => 123
+    get :index, :params => { :way => 123 }
     assert_redirected_to :controller => :browse, :action => :way, :id => 123
 
-    get :index, :relation => 123
+    get :index, :params => { :relation => 123 }
     assert_redirected_to :controller => :browse, :action => :relation, :id => 123
 
-    get :index, :note => 123
+    get :index, :params => { :note => 123 }
     assert_redirected_to :controller => :browse, :action => :note, :id => 123
 
-    get :index, :query => "test"
+    get :index, :params => { :query => "test" }
     assert_redirected_to :controller => :geocoder, :action => :search, :query => "test"
 
-    get :index, :lat => 4, :lon => 5
+    get :index, :params => { :lat => 4, :lon => 5 }
     assert_redirected_to :controller => :site, :action => :index, :anchor => "map=5/4/5"
 
-    get :index, :lat => 4, :lon => 5, :zoom => 3
+    get :index, :params => { :lat => 4, :lon => 5, :zoom => 3 }
     assert_redirected_to :controller => :site, :action => :index, :anchor => "map=3/4/5"
 
-    get :index, :layers => "T"
+    get :index, :params => { :layers => "T" }
     assert_redirected_to :controller => :site, :action => :index, :anchor => "layers=T"
 
-    get :index, :notes => "yes"
+    get :index, :params => { :notes => "yes" }
     assert_redirected_to :controller => :site, :action => :index, :anchor => "layers=N"
 
-    get :index, :lat => 4, :lon => 5, :zoom => 3, :layers => "T"
+    get :index, :params => { :lat => 4, :lon => 5, :zoom => 3, :layers => "T" }
     assert_redirected_to :controller => :site, :action => :index, :anchor => "map=3/4/5&layers=T"
   end
 
   # Test the permalink redirect
   def test_permalink
-    get :permalink, :code => "wBz3--"
+    get :permalink, :params => { :code => "wBz3--" }
     assert_response :redirect
     assert_redirected_to :controller => :site, :action => :index, :anchor => "map=3/4.8779296875/3.955078125"
 
-    get :permalink, :code => "wBz3--", :m => ""
+    get :permalink, :params => { :code => "wBz3--", :m => "" }
     assert_response :redirect
     assert_redirected_to :controller => :site, :action => :index, :mlat => "4.8779296875", :mlon => "3.955078125", :anchor => "map=3/4.8779296875/3.955078125"
 
-    get :permalink, :code => "wBz3--", :layers => "T"
+    get :permalink, :params => { :code => "wBz3--", :layers => "T" }
     assert_response :redirect
     assert_redirected_to :controller => :site, :action => :index, :anchor => "map=3/4.8779296875/3.955078125&layers=T"
 
-    get :permalink, :code => "wBz3--", :node => 1
+    get :permalink, :params => { :code => "wBz3--", :node => 1 }
     assert_response :redirect
     assert_redirected_to :controller => :browse, :action => :node, :id => 1, :anchor => "map=3/4.8779296875/3.955078125"
 
-    get :permalink, :code => "wBz3--", :way => 2
+    get :permalink, :params => { :code => "wBz3--", :way => 2 }
     assert_response :redirect
     assert_redirected_to :controller => :browse, :action => :way, :id => 2, :anchor => "map=3/4.8779296875/3.955078125"
 
-    get :permalink, :code => "wBz3--", :relation => 3
+    get :permalink, :params => { :code => "wBz3--", :relation => 3 }
     assert_response :redirect
     assert_redirected_to :controller => :browse, :action => :relation, :id => 3, :anchor => "map=3/4.8779296875/3.955078125"
 
-    get :permalink, :code => "wBz3--", :changeset => 4
+    get :permalink, :params => { :code => "wBz3--", :changeset => 4 }
     assert_response :redirect
     assert_redirected_to :controller => :browse, :action => :changeset, :id => 4, :anchor => "map=3/4.8779296875/3.955078125"
   end
 
   # Test the key page
   def test_key
-    xhr :get, :key
+    get :key, :xhr => true
     assert_response :success
     assert_template "key"
     assert_template :layout => false
@@ -170,7 +170,7 @@ class SiteControllerTest < ActionController::TestCase
 
   # Test the right editor gets used when the user hasn't set a preference
   def test_edit_without_preference
-    get :edit, nil, :user => create(:user)
+    get :edit, :session => { :user => create(:user) }
     assert_response :success
     assert_template "edit"
     assert_template :partial => "_#{DEFAULT_EDITOR}", :count => 1
@@ -182,7 +182,7 @@ class SiteControllerTest < ActionController::TestCase
     user.preferred_editor = "id"
     user.save!
 
-    get :edit, nil, :user => user
+    get :edit, :session => { :user => user }
     assert_response :success
     assert_template "edit"
     assert_template :partial => "_id", :count => 1
@@ -191,7 +191,7 @@ class SiteControllerTest < ActionController::TestCase
     user.preferred_editor = "potlatch2"
     user.save!
 
-    get :edit, nil, :user => user
+    get :edit, :session => { :user => user }
     assert_response :success
     assert_template "edit"
     assert_template :partial => "_potlatch2", :count => 1
@@ -200,7 +200,7 @@ class SiteControllerTest < ActionController::TestCase
     user.preferred_editor = "potlatch"
     user.save!
 
-    get :edit, nil, :user => user
+    get :edit, :session => { :user => user }
     assert_response :success
     assert_template "edit"
     assert_template :partial => "_potlatch", :count => 1
@@ -209,29 +209,29 @@ class SiteControllerTest < ActionController::TestCase
     user.preferred_editor = "remote"
     user.save!
 
-    get :edit, nil, :user => user
+    get :edit, :session => { :user => user }
     assert_response :success
     assert_template "index"
   end
 
   # Test the right editor gets used when the URL has an override
   def test_edit_with_override
-    get :edit, { :editor => "id" }, { :user => create(:user) }
+    get :edit, :params => { :editor => "id" }, :session => { :user => create(:user) }
     assert_response :success
     assert_template "edit"
     assert_template :partial => "_id", :count => 1
 
-    get :edit, { :editor => "potlatch2" }, { :user => create(:user) }
+    get :edit, :params => { :editor => "potlatch2" }, :session => { :user => create(:user) }
     assert_response :success
     assert_template "edit"
     assert_template :partial => "_potlatch2", :count => 1
 
-    get :edit, { :editor => "potlatch" }, { :user => create(:user) }
+    get :edit, :params => { :editor => "potlatch" }, :session => { :user => create(:user) }
     assert_response :success
     assert_template "edit"
     assert_template :partial => "_potlatch", :count => 1
 
-    get :edit, { :editor => "remote" }, { :user => create(:user) }
+    get :edit, :params => { :editor => "remote" }, :session => { :user => create(:user) }
     assert_response :success
     assert_template "index"
   end
@@ -241,7 +241,7 @@ class SiteControllerTest < ActionController::TestCase
     user = create(:user)
     node = create(:node, :lat => 1.0, :lon => 1.0)
 
-    get :edit, { :node => node.id }, { :user => user }
+    get :edit, :params => { :node => node.id }, :session => { :user => user }
     assert_response :success
     assert_template "edit"
     assert_equal 1.0, assigns(:lat)
@@ -256,7 +256,7 @@ class SiteControllerTest < ActionController::TestCase
     way  = create(:way)
     create(:way_node, :node => node, :way => way)
 
-    get :edit, { :way => way.id }, { :user => user }
+    get :edit, :params => { :way => way.id }, :session => { :user => user }
     assert_response :success
     assert_template "edit"
     assert_equal 3.0, assigns(:lat)
@@ -271,7 +271,7 @@ class SiteControllerTest < ActionController::TestCase
       n.comments.create(:author_id => user.id)
     end
 
-    get :edit, { :note => note.id }, { :user => user }
+    get :edit, :params => { :note => note.id }, :session => { :user => user }
     assert_response :success
     assert_template "edit"
     assert_equal 1.0, assigns(:lat)
@@ -284,7 +284,7 @@ class SiteControllerTest < ActionController::TestCase
     user = create(:user)
     gpx  = create(:trace, :latitude => 1, :longitude => 1)
 
-    get :edit, { :gpx => gpx.id }, { :user => user }
+    get :edit, :params => { :gpx => gpx.id }, :session => { :user => user }
     assert_response :success
     assert_template "edit"
     assert_equal 1.0, assigns(:lat)
@@ -294,13 +294,13 @@ class SiteControllerTest < ActionController::TestCase
 
   # Test the edit page redirects
   def test_edit_redirect
-    get :edit, :lat => 4, :lon => 5
+    get :edit, :params => { :lat => 4, :lon => 5 }
     assert_redirected_to :controller => :site, :action => :edit, :anchor => "map=5/4/5"
 
-    get :edit, :lat => 4, :lon => 5, :zoom => 3
+    get :edit, :params => { :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"
+    get :edit, :params => { :lat => 4, :lon => 5, :zoom => 3, :editor => "id" }
     assert_redirected_to :controller => :site, :action => :edit, :editor => "id", :anchor => "map=3/4/5"
   end
 
@@ -317,7 +317,7 @@ class SiteControllerTest < ActionController::TestCase
     assert_response :redirect
     assert_redirected_to :controller => :user, :action => :login, :referer => "/welcome"
 
-    get :welcome, nil, :user => create(:user)
+    get :welcome, :session => { :user => create(:user) }
     assert_response :success
     assert_template "welcome"
   end
@@ -350,7 +350,7 @@ class SiteControllerTest < ActionController::TestCase
     assert_template "export"
     assert_template :layout => "map"
 
-    xhr :get, :export
+    get :export, :xhr => true
     assert_response :success
     assert_template "export"
     assert_template :layout => "xhr"
@@ -365,19 +365,19 @@ class SiteControllerTest < ActionController::TestCase
 
   # Test the rich text preview
   def test_preview
-    xhr :post, :preview, :type => "html"
+    post :preview, :xhr => true, :params => { :type => "html" }
     assert_response :success
 
-    xhr :post, :preview, :type => "markdown"
+    post :preview, :xhr => true, :params => { :type => "markdown" }
     assert_response :success
 
-    xhr :post, :preview, :type => "text"
+    post :preview, :xhr => true, :params => { :type => "text" }
     assert_response :success
   end
 
   # Test the id frame
   def test_id
-    get :id, nil, :user => create(:user)
+    get :id, :session => { :user => create(:user) }
     assert_response :success
     assert_template "id"
     assert_template :layout => false