From 97e00f9ee3eadd5b244dae5cc555dd3775c20060 Mon Sep 17 00:00:00 2001 From: zhitomirskiyi Date: Wed, 23 Feb 2011 12:00:42 -0800 Subject: [PATCH] changed the delete to a destroy on retraction, also removed a puts --- app/models/post.rb | 2 +- app/models/retraction.rb | 2 +- spec/helpers/application_helper_spec.rb | 1 - 3 files changed, 2 insertions(+), 3 deletions(-) diff --git a/app/models/post.rb b/app/models/post.rb index 20d1b4ed6..769cff44a 100644 --- a/app/models/post.rb +++ b/app/models/post.rb @@ -23,7 +23,7 @@ class Post < ActiveRecord::Base cattr_reader :per_page @@per_page = 10 - before_destroy :propogate_retraction + after_destroy :propogate_retraction def user_refs self.post_visibilities.count diff --git a/app/models/retraction.rb b/app/models/retraction.rb index d671d0909..c1717e4b0 100644 --- a/app/models/retraction.rb +++ b/app/models/retraction.rb @@ -42,7 +42,7 @@ class Retraction def perform receiving_user Rails.logger.debug "Performing retraction for #{post_guid}" self.target.unsocket_from_user receiving_user if target.respond_to? :unsocket_from_user - self.target.delete + self.target.destroy target.post_visibilities.delete_all Rails.logger.info("event=retraction status=complete type=#{self.type} guid=#{self.post_guid}") end diff --git a/spec/helpers/application_helper_spec.rb b/spec/helpers/application_helper_spec.rb index 8191b2228..e8932e2c1 100644 --- a/spec/helpers/application_helper_spec.rb +++ b/spec/helpers/application_helper_spec.rb @@ -121,7 +121,6 @@ describe ApplicationHelper do start_url ="http://www.youtube.com/watch?v=" + video_id url = start_url + "&a=GxdCwVVULXdvEBKmx_f5ywvZ0zZHHHDU&list=ML&playnext=1" res = markdownify(url) - pp res res.match(/href="