Avoid using format as a URL parameter name

[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 26d936e1bf1fa860b23860b46a7e716e04176650..58379c0ea7fe8b6586f2545e8f34e9d28f678b32 100644 (file)
--- a/test/controllers/site_controller_test.rb
+++ b/test/controllers/site_controller_test.rb
@@ -73,8 +73,8 @@ class SiteControllerTest < ActionController::TestCase
       { :controller => "site", :action => "permalink", :code => "shortcode" }
     )
     assert_routing(
       { :controller => "site", :action => "permalink", :code => "shortcode" }
     )
     assert_routing(

-      { :path => "/preview/formatname", :method => :post },
-      { :controller => "site", :action => "preview", :format => "formatname" }
+      { :path => "/preview/typename", :method => :post },
+      { :controller => "site", :action => "preview", :type => "typename" }

     )
     assert_routing(
       { :path => "/id", :method => :get },
     )
     assert_routing(
       { :path => "/id", :method => :get },


@@ -365,13 +365,13 @@ class SiteControllerTest < ActionController::TestCase
 
   # Test the rich text preview
   def test_preview
 
   # Test the rich text preview
   def test_preview

-    xhr :post, :preview, :format => "html"
+    xhr :post, :preview, :type => "html"

     assert_response :success
 
     assert_response :success
 

-    xhr :post, :preview, :format => "markdown"
+    xhr :post, :preview, :type => "markdown"

     assert_response :success
 
     assert_response :success
 

-    xhr :post, :preview, :format => "text"
+    xhr :post, :preview, :type => "text"

     assert_response :success
   end
 
     assert_response :success
   end