lib/undo_failed.rb @@ -8,19 +8,32 @@ class Admin::UndoItemsController < Admin::BaseController def undo item = UndoItem.find(params[:id]) - object = item.process! + begin + object = item.process! - respond_to do |format| - format.html { - flash[:notice] = item.complete_description - redirect_to(:back) - } - format.json { - render :json => { - :message => item.complete_description, - :obj => object + respond_to do |format| + format.html { + flash[:notice] = item.complete_description + redirect_to(:back) } - } + format.json { + render :json => { + :message => item.complete_description, + :obj => object + } + } + end + rescue UndoFailed + msg = "Could not undo, would result in an invalid state (i.e. a comment with no post)" + respond_to do |format| + format.html { + flash[:notice] = msg + redirect_to(:back) + } + format.json { + render :json => { :message => msg } + } + end end end end app/controllers/admin/undo_items_controller.rb @@ -1,10 +1,11 @@ class DeleteCommentUndo < UndoItem def process! - raise('Comment already exists') if Comment.find_by_id(loaded_data.delete('id').to_i) + raise(UndoFailed) if Comment.find_by_id(loaded_data.delete('id').to_i) comment = nil transaction do - comment = Comment.create!(loaded_data) + comment = Comment.create(loaded_data) + raise UndoFailed if comment.new_record? self.destroy end comment app/models/delete_comment_undo.rb @@ -48,4 +48,37 @@ describe Admin::UndoItemsController do it("renders json") { do_post; response.should have_text(/hello/) } it("processes the item") { @item.should_receive(:process!); do_post } end + + describe 'handling POST to undo with invalid undo item' do + before do + @item = mock_model(UndoItem) + @item.stub!(:process!).and_raise(UndoFailed) + UndoItem.stub!(:find).and_return(@item) + end + + def do_post + request.env["HTTP_REFERER"] = "/bogus" + session[:logged_in] = true + post :undo, :id => 1 + end + + it("redirects back") { do_post; response.should redirect_to("/bogus") } + it("stores notice in the flash") { do_post; flash[:notice].should_not be_nil } + end + + describe 'handling POST to undo with invalid undo item accepting JSON' do + before do + @item = mock_model(UndoItem) + @item.stub!(:process!).and_raise(UndoFailed) + UndoItem.stub!(:find).and_return(@item) + end + + def do_post + request.env["HTTP_REFERER"] = "/bogus" + session[:logged_in] = true + post :undo, :id => 1, :format => 'json' + end + + it("renders json") { do_post; response.should have_text(/message/) } + end end spec/controllers/admin/undo_items_controller_spec.rb @@ -9,7 +9,7 @@ describe DeleteCommentUndo do item.stub!(:transaction).and_yield item.stub!(:destroy) - Comment.should_receive(:create!).with('a' => 'b') + Comment.should_receive(:create).with('a' => 'b').and_return(mock("comment", :new_record? => false)) item.process! end end @@ -18,7 +18,17 @@ describe DeleteCommentUndo do it 'raises' do pending("figure out why should_raise doesn't work") Comment.stub!(:find_by_id).and_return(Object.new) - lambda { DeleteCommentUndo.process! }.should_raise('Comment already exists') + lambda { DeleteCommentUndo.process! }.should_raise(UndoFailed) + end + end + + describe '#process! with invalid comment' do + it 'raises' do + pending("figure out why should_raise doesn't work") + Comment.stub!(:find_by_id).and_return(nil) + + Comment.should_receive(:create).with('a' => 'b').and_return(mock("comment", :new_record? => true)) + lambda { DeleteCommentUndo.process! }.should_raise(UndoFailed) end end spec/models/delete_comment_undo_spec.rb 90dc474b93942b40d4a55140ed63517598262951 Xavier Shay xavier@rhnh.net http://github.com/xaviershay/enki/commit/b28f2fc710dd2997bb400bdeb24f0099b429196a b28f2fc710dd2997bb400bdeb24f0099b429196a 2008-04-28T01:37:19-07:00 2008-04-28T01:37:19-07:00 Don't blow up on invalid undos 3c1cd40e7940236698b1294ce1f7092ba0b344a0 Xavier Shay xavier@rhnh.net