community_engine 2.3.2 → 3.0.0

data/test/functional/pages_controller_test.rb

@@ -60,14 +60,14 @@ class PagesControllerTest < ActionController::TestCase
   
   def test_should_update_page
     login_as :admin
-    put :update, :id => pages(:custom_page).id, :page => { :title => "changed_name" }
+    patch :update, :id => pages(:custom_page).id, :page => { :title => "changed_name" }
     assert_redirected_to admin_pages_path
     assert_equal assigns(:page).title, "changed_name"
   end
 
   def test_should_fail_to_update_page
     login_as :admin
-    put :update, :id => pages(:custom_page).id, :page => { :title => nil }
+    patch :update, :id => pages(:custom_page).id, :page => { :title => nil }
     assert_response :success
     assert assigns(:page).errors[:title]
   end

data/test/functional/password_reset_controller_test.rb

@@ -31,10 +31,10 @@ class PasswordResetsControllerTest < ActionController::TestCase
     assert_response :success
   end
 
-  test "should put to update and redirect to dashboard" do
+  test "should patch to update and redirect to dashboard" do
     @user = users(:quentin)
 
-    put :update, :id => @user.perishable_token, :user => { :password => "newpassword" }
+    patch :update, :id => @user.perishable_token, :user => { :password => "newpassword" }
 
     assert_redirected_to dashboard_user_path(@user)
   end

data/test/functional/photos_controller_test.rb

@@ -10,7 +10,7 @@ class PhotosControllerTest < ActionController::TestCase
         :photo => { :photo => fixture_file_upload('/files/library.jpg', 'image/jpg') },
         :user_id => users(:quentin).id,
         :tag_list => 'tag1, tag2',
-        :album_id => '1'
+        :album_id => albums(:one).id
       photo = Photo.find(assigns(:photo).id)
       assert_equal users(:quentin), photo.user
       assert_equal ['tag1', 'tag2'], photo.tag_list.sort
@@ -25,33 +25,34 @@ class PhotosControllerTest < ActionController::TestCase
         :photo => { :photo => fixture_file_upload('/files/library.jpg', 'image/jpg') },
         :user_id => users(:quentin).id,
         :tag_list => 'tag1, tag2',
-        :album_id => '1'
+        :album_id => albums(:one).id
     end
   end
   
   def test_should_update
     login_as :quentin 
     assert_no_difference Photo ,:count do
-      post :update, :id => 1, :user_id => users(:quentin).id, :photo => {:name => 'Another name', :album_id => 2}
+      post :update, :id => photos(:library_pic).id, :user_id => users(:quentin).id, :photo => {:name => 'Another name', :album_id => albums(:two).id}
     end
-    assert_equal photos(:library_pic).name, 'Another name'
-    assert_equal photos(:library_pic).album_id, 2    
+    photo = photos(:library_pic).reload
+    assert_equal photo.name, 'Another name'
+    assert_equal photo.album_id, albums(:two).id
   end
   
   def owner_should_not_update_view_counter
-    login_as :quentin 
-    get :show, :id => 1
+    login_as :quentin
+    get :show, :id => photos(:library_pic).id
     assert_equal assigns(:photo).reload.view_count, 0
   end
   
   def other_user_should_update_view_counter
-    login_as :quentin 
-    get :show, :id => 2
+    login_as :quentin
+    get :show, :id => photos(:another_pic).id
     assert_equal assigns(:photo).reload.view_count, 1
   end
   
   def no_logged_should_not_update_view_counter
-    get :show, :id => 1
+    get :show, :id => photos(:library_pic).id
     assert_equal assigns(:photo).reload.view_count, 0
   end
   
@@ -154,7 +155,7 @@ class PhotosControllerTest < ActionController::TestCase
   
   def test_should_update_photo
     login_as :quentin
-    put :update,
+    patch :update,
       :id => photos(:library_pic).id,
       :user_id => users(:quentin).id,
       :photo => { :name => "changed_name" },
@@ -169,7 +170,7 @@ class PhotosControllerTest < ActionController::TestCase
 
   def test_should_fail_to_update_photo
     login_as :quentin
-    put :update, :id => photos(:library_pic).id, :user_id => users(:aaron).id, :photo => { :size => nil }
+    patch :update, :id => photos(:library_pic).id, :user_id => users(:aaron).id, :photo => { :size => nil }
     assert_response :redirect
   end
 
@@ -177,7 +178,7 @@ class PhotosControllerTest < ActionController::TestCase
   def test_should_destroy_photo
     login_as :quentin
     assert_difference Photo, :count, -1 do
-      delete :destroy, :id => photos(:library_pic), :user_id => users(:quentin).id
+      delete :destroy, :id => photos(:library_pic).id, :user_id => users(:quentin).id
     end
     assert_redirected_to user_photos_path(:user_id => users(:quentin) )
   end
@@ -185,7 +186,7 @@ class PhotosControllerTest < ActionController::TestCase
   def test_should_not_destroy_photo
     login_as :quentin
     assert_difference Photo, :count, 0 do
-      delete :destroy, :id => photos(:library_pic), :user_id => users(:aaron).id
+      delete :destroy, :id => photos(:library_pic).id, :user_id => users(:aaron).id
     end
     assert_redirected_to login_path
   end
@@ -195,7 +196,7 @@ class PhotosControllerTest < ActionController::TestCase
     users(:quentin).avatar = photos(:library_pic)
     users(:quentin).save!
     assert_difference Photo, :count, -1 do
-      delete :destroy, :id => 1, :user_id => users(:quentin).id
+      delete :destroy, :id => photos(:library_pic).id, :user_id => users(:quentin).id
     end
     assert users(:quentin).reload.avatar.nil?
   end

data/test/functional/posts_controller_test.rb

@@ -100,7 +100,7 @@ class PostsControllerTest < ActionController::TestCase
   
   def test_should_update_post
     login_as :quentin
-    put :update, :id => posts(:funny_post).id, :user_id => users(:quentin), :post => { :title => "changed_name" }
+    patch :update, :id => posts(:funny_post).id, :user_id => users(:quentin), :post => { :title => "changed_name" }
     assert_redirected_to user_post_path(users(:quentin), assigns(:post))
     assert_equal assigns(:post).title, "changed_name"
   end
@@ -110,14 +110,14 @@ class PostsControllerTest < ActionController::TestCase
     posts(:funny_post).save_as_draft
         
     login_as :quentin
-    put :update, :id => posts(:funny_post).id, :user_id => users(:quentin), :post => { :title => "changed_name", :published_as => "live" }
+    patch :update, :id => posts(:funny_post).id, :user_id => users(:quentin), :post => { :title => "changed_name", :published_as => "live" }
     assert_redirected_to user_post_path(users(:quentin), assigns(:post))
     assert assigns(:post).is_live?
   end
 
   def test_should_fail_to_update_post
     login_as :quentin
-    put :update, :id => posts(:funny_post).id, :user_id => users(:quentin), :post => { :title => nil }
+    patch :update, :id => posts(:funny_post).id, :user_id => users(:quentin), :post => { :title => nil }
     assert_response :success
     assert assigns(:post).errors[:title]
   end
@@ -191,7 +191,7 @@ class PostsControllerTest < ActionController::TestCase
   
   def test_should_update_views
     assert_equal 1, posts(:funny_post).view_count
-    put :update_views, :user_id => posts(:funny_post).user_id, :id => posts(:funny_post)
+    patch :update_views, :user_id => posts(:funny_post).user_id, :id => posts(:funny_post)
     assert_response :success
     assert_equal 2, posts(:funny_post).reload.view_count      
   end

data/test/functional/rsvps_controller_test.rb

@@ -50,33 +50,33 @@ class RsvpsControllerTest < ActionController::TestCase
   def test_should_fail_to_create_rsvp_for_event_that_does_not_allow_rsvps
     login_as :quentin
     assert_no_difference Rsvp, :count do
-      post :create, :event_id => "6", :rsvp => {:attendees_count=>1} 
+      post :create, :event_id => "6", :rsvp => {:attendees_count=>1}
     end
     assert_response :success
   end
 
   def test_should_get_edit
     login_as :quentin
-    get :edit, :event_id => "2", :id => 1
+    get :edit, :event_id => "2", :id => rsvps(:quentin_rsvp_for_future_event).id
     assert_response :success
   end
 
   def test_should_update_rsvp
     login_as :quentin
-    put :update, :event_id => "2", :id => 1, :rsvp => {:attendees_count => '3' }
+    patch :update, :event_id => "2", :id => rsvps(:quentin_rsvp_for_future_event).id, :rsvp => {:attendees_count => '3' }
     assert_redirected_to event_path(events(:future_event))
   end
 
   def test_should_fail_to_update_rsvp
     login_as :quentin
-    put :update, :event_id => "2", :id => 1, :rsvp => { :attendees_count => nil }
+    patch :update, :event_id => "2", :id => rsvps(:quentin_rsvp_for_future_event).id, :rsvp => { :attendees_count => nil }
     assert assigns(:rsvp).errors[:attendees_count]
     assert_response :success
   end
 
   def test_should_fail_to_update_rsvp_for_other_user
     login_as :aaron
-    put :update, :event_id => "2", :id => 1, :rsvp => { :attendees_count => '3' }
+    patch :update, :event_id => "2", :id => rsvps(:quentin_rsvp_for_future_event).id, :rsvp => { :attendees_count => '3' }
     assert_equal Rsvp.find(1).attendees_count, 2
     assert_redirected_to event_path(events(:future_event))
   end
@@ -84,7 +84,7 @@ class RsvpsControllerTest < ActionController::TestCase
   def test_should_destroy_rsvp
     login_as :quentin
     assert_difference Rsvp, :count, -1 do
-      delete :destroy, :event_id => "2", :id => 1
+      delete :destroy, :event_id => "2", :id => rsvps(:quentin_rsvp_for_future_event).id
     end
     assert_redirected_to event_path(events(:future_event))
   end

data/test/functional/sb_posts_controller_test.rb

@@ -10,28 +10,28 @@ class SbPostsControllerTest < ActionController::TestCase
     old_equal  = equal.call
 
     login_as :aaron
-    post :create, :forum_id => forums(:rails).to_param, :topic_id => topics(:pdi).to_param, :post => { :body => 'blah' }
+    post :create, :forum_id => forums(:rails).to_param, :topic_id => topics(:pdi).to_param, :sb_post => { :body => 'blah' }
     assert_redirected_to forum_topic_path(:forum_id => forums(:rails).to_param, :id => topics(:pdi).to_param, :anchor => assigns(:post).dom_id, :page => '1')
     assert_equal topics(:pdi), assigns(:topic)
     [forums(:rails), users(:aaron), topics(:pdi)].each &:reload
-  
+
     assert_equal old_counts.collect { |n| n + 1}, counts.call
     assert_equal old_equal, equal.call
   end
 
   def test_should_update_topic_replied_at_upon_replying
-    old=topics(:pdi).replied_at
+    old = topics(:pdi).replied_at
     login_as :aaron
-    post :create, :forum_id => forums(:rails).to_param, :topic_id => topics(:pdi).to_param, :post => { :body => 'blah' }
+    post :create, :forum_id => forums(:rails).to_param, :topic_id => topics(:pdi).to_param, :sb_post => { :body => 'blah' }
     assert_not_equal(old, topics(:pdi).reload.replied_at)
     assert old < topics(:pdi).reload.replied_at
   end
 
-  def test_should_reply_with_no_body
+  def test_should_not_reply_with_no_body
     assert_difference SbPost, :count, 0 do
       login_as :aaron
-      post :create, :forum_id => forums(:rails).to_param, :topic_id => sb_posts(:pdi).to_param, :post => {:body => ''}
-      assert_redirected_to forum_topic_path({:forum_id => forums(:rails).to_param, :id => sb_posts(:pdi).to_param, :anchor => 'reply-form', :page => '1'}.merge(:post => {:body => ''}))
+      post :create, :forum_id => forums(:rails).to_param, :topic_id => sb_posts(:pdi).to_param, :sb_post => {:body => ''}
+      assert_redirected_to forum_topic_path({:forum_id => forums(:rails).to_param, :id => sb_posts(:pdi).to_param, :anchor => 'reply-form', :page => '1'}.merge(:sb_post => {:body => ''}))
     end
   end
 
@@ -51,21 +51,21 @@ class SbPostsControllerTest < ActionController::TestCase
     assert_equal old_equal, equal.call
   end
 
-  def test_should_delete_reply_as_moderator
+  def test_should_delete_reply_js
+    login_as :admin
+
     assert_difference SbPost, :count, -1 do
-      login_as :sam
-      delete :destroy, :forum_id => forums(:rails).to_param, :topic_id => topics(:pdi).to_param, :id => sb_posts(:pdi_rebuttal).to_param
+      delete :destroy, :forum_id => forums(:rails).to_param, :topic_id => topics(:pdi).to_param, :id => sb_posts(:pdi_reply).to_param, :format => :js
+      assert_response :success
     end
+
+    [forums(:rails), users(:sam), topics(:pdi)].each &:reload
   end
 
-  def test_should_delete_topic_if_deleting_the_last_reply
+  def test_should_delete_reply_as_moderator
     assert_difference SbPost, :count, -1 do
-      assert_difference Topic, :count, -1 do
-        login_as :aaron
-        delete :destroy, :forum_id => forums(:rails).to_param, :topic_id => topics(:il8n).to_param, :id => sb_posts(:il8n).to_param
-        assert_redirected_to forum_path(forums(:rails).to_param)
-        assert_raise(ActiveRecord::RecordNotFound) { topics(:il8n).reload }
-      end
+      login_as :sam
+      delete :destroy, :forum_id => forums(:rails).to_param, :topic_id => topics(:pdi).to_param, :id => sb_posts(:pdi_rebuttal).to_param
     end
   end
 
@@ -77,35 +77,35 @@ class SbPostsControllerTest < ActionController::TestCase
 
   def test_can_edit_own_post
     login_as :sam
-    put :update, :forum_id => forums(:comics).to_param, :topic_id => topics(:galactus).to_param, :id => sb_posts(:silver_surfer).to_param, :post => {}
+    patch :update, :forum_id => forums(:comics).to_param, :topic_id => topics(:galactus).to_param, :id => sb_posts(:silver_surfer).to_param, :sb_post => {}
     assert_redirected_to forum_topic_path(:forum_id => forums(:comics).to_param, :id => topics(:galactus).to_param, :anchor => sb_posts(:silver_surfer).dom_id, :page => '1')
   end
 
   def test_can_edit_other_post_as_moderator
     login_as :sam
-    put :update, :forum_id => forums(:rails).to_param, :topic_id => topics(:pdi).to_param, :id => sb_posts(:pdi_rebuttal).to_param, :post => {}
+    patch :update, :forum_id => forums(:rails).to_param, :topic_id => topics(:pdi).to_param, :id => sb_posts(:pdi_rebuttal).to_param, :sb_post => {}
     assert_redirected_to forum_topic_path(:forum_id => forums(:rails).to_param, :id => topics(:pdi).to_param, :anchor => sb_posts(:pdi_rebuttal).dom_id, :page => '1')
   end
 
   def test_cannot_edit_other_post
     login_as :sam
-    put :update, :forum_id => forums(:comics).to_param, :topic_id => topics(:galactus).to_param, :id => sb_posts(:galactus).to_param, :post => {}
+    patch :update, :forum_id => forums(:comics).to_param, :topic_id => topics(:galactus).to_param, :id => sb_posts(:galactus).to_param, :sb_post => {}
     assert_redirected_to login_path
   end
 
   def test_cannot_edit_own_post_user_id
     login_as :sam
-    put :update, :forum_id => forums(:rails).to_param, :topic_id => topics(:pdi).to_param, :id => sb_posts(:pdi_reply).to_param, :post => { :user_id => 32 }
+    patch :update, :forum_id => forums(:rails).to_param, :topic_id => topics(:pdi).to_param, :id => sb_posts(:pdi_reply).to_param, :sb_post => { :user_id => 32 }
     assert_redirected_to forum_topic_path(:forum_id => forums(:rails).to_param, :id => topics(:pdi).to_param, :anchor => sb_posts(:pdi_reply).dom_id, :page => '1')
     assert_equal users(:sam).id, sb_posts(:pdi_reply).reload.user_id
   end
 
   def test_can_edit_other_post_as_admin
     login_as :admin
-    put :update, :forum_id => forums(:rails).to_param, :topic_id => topics(:pdi).to_param, :id => sb_posts(:pdi_rebuttal).to_param, :post => {}
+    patch :update, :forum_id => forums(:rails).to_param, :topic_id => topics(:pdi).to_param, :id => sb_posts(:pdi_rebuttal).to_param, :sb_post => {}
     assert_redirected_to forum_topic_path(:forum_id => forums(:rails).to_param, :id => topics(:pdi).to_param, :anchor => sb_posts(:pdi_rebuttal).dom_id, :page => '1')
   end
-  
+
   def test_should_view_recent_posts
     get :index
     assert_response :success
@@ -123,7 +123,7 @@ class SbPostsControllerTest < ActionController::TestCase
     assert_response :success
     assert_equal [sb_posts(:shield), sb_posts(:silver_surfer), sb_posts(:ponies), sb_posts(:pdi_reply), sb_posts(:sticky)], assigns(:posts)
   end
-  
+
   def test_should_view_monitored_posts
     get :monitored, :user_id => users(:aaron).id
     assert_equal [sb_posts(:pdi_reply)], assigns(:posts)
@@ -140,7 +140,7 @@ class SbPostsControllerTest < ActionController::TestCase
     assert_response :success
     assert_equal [sb_posts(:silver_surfer), sb_posts(:galactus)], assigns(:posts)
   end
-    
+
   def test_disallow_new_post_to_locked_topic
     galactus = topics(:galactus)
     galactus.locked = true
@@ -150,40 +150,43 @@ class SbPostsControllerTest < ActionController::TestCase
     assert_redirected_to forum_topic_path(forums(:comics).to_param, topics(:galactus).to_param)
     assert_equal :this_topic_is_locked.l, flash[:notice]
   end
-  
-  
+
+
   test "should create anonymous reply" do
-    configatron.allow_anonymous_forum_posting = true    
-    assert_difference SbPost, :count, 1 do
-      post :create, :forum_id => forums(:rails).to_param, :topic_id => topics(:pdi).to_param, :post => { :body => 'blah', :author_email => 'foo@bar.com' }
-      assert_redirected_to :controller => "topics", :action => "show", :forum_id => forums(:rails).to_param, :id => topics(:pdi).to_param, :anchor => assigns(:post).dom_id, :page => '1'
+    configatron.temp do
+      configatron.allow_anonymous_forum_posting = true
+      assert_difference SbPost, :count, 1 do
+        post :create, :forum_id => forums(:rails).to_param, :topic_id => topics(:pdi).to_param, :sb_post => { :body => 'blah', :author_email => 'foo@bar.com' }
+        assert_redirected_to :controller => "topics", :action => "show", :forum_id => forums(:rails).to_param, :id => topics(:pdi).to_param, :anchor => assigns(:post).dom_id, :page => '1'
+      end
     end
-    configatron.allow_anonymous_forum_posting = false    
   end
 
   test "should fail creating an anonymous reply" do
-    configatron.allow_anonymous_forum_posting = true        
-    assert_difference SbPost, :count, 0 do
-      post_params = { :body => 'blah', :author_email => 'foo' }
-      post :create, :forum_id => forums(:rails).to_param, :topic_id => topics(:pdi).to_param, :post => post_params
-      assert_redirected_to forum_topic_path({:forum_id => forums(:rails).to_param, :id => topics(:pdi).to_param, :anchor => 'reply-form', :page => '1'}.merge({:post => post_params}))
+    configatron.temp do
+      configatron.allow_anonymous_forum_posting = true
+      assert_difference SbPost, :count, 0 do
+        post_params = { :body => 'blah', :author_email => 'foo' }
+        post :create, :forum_id => forums(:rails).to_param, :topic_id => topics(:pdi).to_param, :sb_post => post_params
+        assert_redirected_to forum_topic_path({:forum_id => forums(:rails).to_param, :id => topics(:pdi).to_param, :anchor => 'reply-form', :page => '1'}.merge({:sb_post => post_params}))
+      end
     end
-    configatron.allow_anonymous_forum_posting = false        
   end
 
   test "should show recent with anonymous posts" do
-    configatron.allow_anonymous_forum_posting = true
-    
-    topic = topics(:pdi)
-      
-    assert topic.sb_posts.create!(:topic => topic, :body => "Ok!", :author_email => 'anon@example.com', :author_ip => "1.2.3.4")
-    
-    get :index    
-    assert_response :success
-    
-    configatron.allow_anonymous_forum_posting = false        
+    configatron.temp do
+      configatron.allow_anonymous_forum_posting = true
+
+      topic = topics(:pdi)
+
+      assert topic.sb_posts.create!(:topic => topic, :body => "Ok!", :author_email => 'anon@example.com', :author_ip => "1.2.3.4")
+
+      get :index
+      assert_response :success
+
+    end
   end
-  
 
-  
+
+
 end

data/test/functional/sessions_controller_test.rb

@@ -62,7 +62,10 @@ class SessionsControllerTest < ActionController::TestCase
     login_as :quentin
     assert !session.empty?
     get :destroy
-    assert session.empty?
+    # The session will not be empty because the flash message will be in it.
+    #
+    #assert session.empty?
+    assert session[:user_credentials].nil?
   end
 
 end

data/test/functional/tags_controller_test.rb

@@ -4,7 +4,7 @@ class TagsControllerTest < ActionController::TestCase
   fixtures :all
 
   def test_should_autocomplete_tags
-    get :auto_complete_for_tag_name, :id => 'mis', :format => 'js'
+    get :auto_complete_for_tag_name, :format => 'json'
     assert_response :success
   end
 

data/test/functional/topics_controller_test.rb

@@ -4,13 +4,13 @@ class TopicsControllerTest < ActionController::TestCase
   all_fixtures
 
   def test_should_get_index
-    get :index, :forum_id => 1
+    get :index, :forum_id => forums(:rails).id
     assert_redirected_to forum_path(1)
   end
 
   def test_should_get_index_as_xml
     content_type 'application/xml'
-    get :index, :forum_id => 1, :format => 'xml'
+    get :index, :forum_id => forums(:rails).id, :format => 'xml'
     assert_response :success
   end
 
@@ -28,7 +28,7 @@ class TopicsControllerTest < ActionController::TestCase
 
   def test_should_get_new
     login_as :aaron
-    get :new, :forum_id => 1
+    get :new, :forum_id => forums(:rails).id
     assert_response :success
   end
 
@@ -54,7 +54,7 @@ class TopicsControllerTest < ActionController::TestCase
 
   def test_should_allow_admin_to_sticky_and_lock
     login_as :admin
-    post :create, :forum_id => forums(:rails).id, :topic => { :title => 'blah2', :sticky => "1", :locked => "1", :sb_posts_attributes => { "0" => { :body => 'foo' } } }
+    post :create, :forum_id => forums(:rails).id, :topic => { :title => 'blah2', :sticky => "1", :locked => "1", :body => 'foo' }
     assert assigns(:topic).sticky?
     assert assigns(:topic).locked?
   end
@@ -160,13 +160,13 @@ class TopicsControllerTest < ActionController::TestCase
 
   def test_should_get_edit
     login_as :admin
-    get :edit, :forum_id => 1, :id => 1
+    get :edit, :forum_id => forums(:rails).id, :id => topics(:ponies).id
     assert_response :success
   end
 
   def test_should_update_own_post
     login_as :sam
-    put :update, :forum_id => forums(:rails).id, :id => topics(:ponies).id, :topic => { }, :tag_list => 'tagX, tagY'
+    patch :update, :forum_id => forums(:rails).id, :id => topics(:ponies).id, :topic => { }, :tag_list => 'tagX, tagY'
     assert_redirected_to forum_topic_path(forums(:rails), assigns(:topic))
     assert_equal ['tagX', 'tagY'], topics(:ponies).reload.tag_list
   end
@@ -174,27 +174,27 @@ class TopicsControllerTest < ActionController::TestCase
 
   def test_should_not_update_user_id_of_own_post
     login_as :sam
-    put :update, :forum_id => forums(:rails).id, :id => topics(:ponies).id, :topic => { :user_id => users(:aaron).id }
+    patch :update, :forum_id => forums(:rails).id, :id => topics(:ponies).id, :topic => { :user_id => 32 }
     assert_redirected_to forum_topic_path(forums(:rails), assigns(:topic))
     assert_equal users(:sam).id, sb_posts(:ponies).reload.user_id
   end
 
   def test_should_not_update_other_post
     login_as :sam
-    put :update, :forum_id => forums(:comics).id, :id => topics(:galactus).id, :topic => { }
+    patch :update, :forum_id => forums(:comics).id, :id => topics(:galactus).id, :topic => { }
     assert_redirected_to login_path
   end
 
 
   def test_should_update_other_post_as_moderator
     login_as :sam
-    put :update, :forum_id => forums(:rails).id, :id => topics(:pdi).id, :topic => { }
+    patch :update, :forum_id => forums(:rails).id, :id => topics(:pdi).id, :topic => { }
     assert_redirected_to forum_topic_path(forums(:rails), assigns(:topic))
   end
 
   def test_should_update_other_post_as_admin
     login_as :admin
-    put :update, :forum_id => forums(:rails).id, :id => topics(:ponies), :topic => { }
+    patch :update, :forum_id => forums(:rails).id, :id => topics(:ponies), :topic => { }
     assert_redirected_to forum_topic_path(forums(:rails), assigns(:topic))
   end
 end