From 90a5cd2254656763064284c83b1751edf23b8bc9 Mon Sep 17 00:00:00 2001 From: Raphael Sofaer Date: Wed, 10 Aug 2011 17:40:38 -0700 Subject: [PATCH] Get rid of error on aspect_memberships destroy if someone has noscript on or something --- app/controllers/aspect_memberships_controller.rb | 2 +- spec/controllers/aspect_memberships_controller_spec.rb | 10 ++++++++++ 2 files changed, 11 insertions(+), 1 deletion(-) diff --git a/app/controllers/aspect_memberships_controller.rb b/app/controllers/aspect_memberships_controller.rb index 6bb565d1d..14e0ab907 100644 --- a/app/controllers/aspect_memberships_controller.rb +++ b/app/controllers/aspect_memberships_controller.rb @@ -22,11 +22,11 @@ class AspectMembershipsController < ApplicationController flash.now[:notice] = I18n.t 'aspect_memberships.destroy.success' respond_with do |format| - format.all{ } format.json{ render :json => { :person_id => @person_id, :aspect_ids => @contact.aspects.map{|a| a.id} } } + format.html{ redirect_to :back } end else diff --git a/spec/controllers/aspect_memberships_controller_spec.rb b/spec/controllers/aspect_memberships_controller_spec.rb index b190f728d..e94bad8dc 100644 --- a/spec/controllers/aspect_memberships_controller_spec.rb +++ b/spec/controllers/aspect_memberships_controller_spec.rb @@ -93,6 +93,16 @@ describe AspectMembershipsController do @aspect0.reload @aspect0.contacts.include?(@contact).should be false end + it 'does not 500 on an html request' do + alice.add_contact_to_aspect(@contact, @aspect1) + delete :destroy, + :id => 123, + :person_id => bob.person.id, + :aspect_id => @aspect0.id + response.should redirect_to :back + @aspect0.reload + @aspect0.contacts.include?(@contact).should be false + end context 'aspect membership does not exist' do it 'person does not exist' do