diff --git a/app/controllers/wiki_pages_controller.rb b/app/controllers/wiki_pages_controller.rb index daed5b0d6..9dd22b3f3 100644 --- a/app/controllers/wiki_pages_controller.rb +++ b/app/controllers/wiki_pages_controller.rb @@ -61,7 +61,7 @@ class WikiPagesController < ApplicationController def destroy @wiki_page = WikiPage.find(params[:id]) - @wiki_page.update_attribute(:is_deleted, true) + @wiki_page.update_attributes(:is_deleted => true) respond_with(@wiki_page) end diff --git a/test/functional/wiki_pages_controller_test.rb b/test/functional/wiki_pages_controller_test.rb index 472b4a2c1..782508aa9 100644 --- a/test/functional/wiki_pages_controller_test.rb +++ b/test/functional/wiki_pages_controller_test.rb @@ -112,13 +112,24 @@ class WikiPagesControllerTest < ActionController::TestCase context "destroy action" do setup do @wiki_page = FactoryGirl.create(:wiki_page) + @mod = FactoryGirl.create(:mod_user) end should "destroy a wiki_page" do - post :destroy, {:id => @wiki_page.id}, {:user_id => @mod.id} + CurrentUser.scoped(@mod) do + post :destroy, {:id => @wiki_page.id}, {:user_id => @mod.id} + end @wiki_page.reload assert_equal(true, @wiki_page.is_deleted?) end + + should "record the deleter" do + CurrentUser.scoped(@mod) do + post :destroy, {:id => @wiki_page.id}, {:user_id => @mod.id} + end + @wiki_page.reload + assert_equal(@mod.id, @wiki_page.updater_id) + end end context "revert action" do