Download as
Browse Code »

Commit cccac6a3ecdce779469c8ca205a5e5cffa537b28

Authored by Braulio Bhavamitra
2 parents 9807e0ad 8d612e1b
Exists in master and in 29 other branches add_member_task_reject_details, admin_visible_profile, article-list-template, community_notifications, contact_admin_translation, event_fixes, fix_comments_pagination, fix_rails4_organization_ratings, fix_sign_up_form, follow_step_fix, forum_topic_creation, mirror_block_improvements, multi_env_on_remote_user, new_security, noosfero_spb_ci, organization_ratings_improvements, organization_ratings_link_to_profile_stable-spb-1.3, organization_ratings_translations_fix, profile_api_improvements, ratings_minor_fixes, remote_user_fix, send_email_to_admins, stable-spb-1.3, stable-spb-1.3-fixes, stable-spb-1.4, stable-spb-1.5, suggest_rejected_value, web_steps_improvements, xss_terminate_custom_options

Merge branch 'image-destroy' into 'master' 

Image destroy

See merge request !479
Showing 2 changed files with 12 additions and 2 deletions   Show diff stats
lib/acts_as_having_image.rb
  Diff comments   View file @cccac6a
@@ -2,7 +2,7 @@ module ActsAsHavingImage @@ -2,7 +2,7 @@ module ActsAsHavingImage
2 2
3 module ClassMethods 3 module ClassMethods
4 def acts_as_having_image 4 def acts_as_having_image
5 - belongs_to :image 5 + belongs_to :image, dependent: :destroy
6 scope :with_image, :conditions => [ "#{table_name}.image_id IS NOT NULL" ] 6 scope :with_image, :conditions => [ "#{table_name}.image_id IS NOT NULL" ]
7 scope :without_image, :conditions => [ "#{table_name}.image_id IS NULL" ] 7 scope :without_image, :conditions => [ "#{table_name}.image_id IS NULL" ]
8 self.send(:include, ActsAsHavingImage) 8 self.send(:include, ActsAsHavingImage)
@@ -19,4 +19,4 @@ module ActsAsHavingImage @@ -19,4 +19,4 @@ module ActsAsHavingImage
19 19
20 end 20 end
21 21
22 -ActiveRecord::Base.extend(ActsAsHavingImage::ClassMethods) 22 -ActiveRecord::Base.extend(ActsAsHavingImage::ClassMethods)
  23 +ActiveRecord::Base.extend(ActsAsHavingImage::ClassMethods)
23 \ No newline at end of file 24 \ No newline at end of file
test/unit/profile_test.rb
  Diff comments   View file @cccac6a
@@ -110,6 +110,16 @@ class ProfileTest < ActiveSupport::TestCase @@ -110,6 +110,16 @@ class ProfileTest < ActiveSupport::TestCase
110 assert_equal total - mine, Article.count 110 assert_equal total - mine, Article.count
111 end 111 end
112 112
  113 + should 'remove images when removing profile' do
  114 + profile = build(Profile, :image_builder => {:uploaded_data => fixture_file_upload('/files/rails.png', 'image/png')})
  115 + image = profile.image
  116 + image.save!
  117 + profile.destroy
  118 + assert_raise ActiveRecord::RecordNotFound do
  119 + image.reload
  120 + end
  121 + end
  122 +
113 def test_should_avoid_reserved_identifiers 123 def test_should_avoid_reserved_identifiers
114 Profile::RESERVED_IDENTIFIERS.each do |identifier| 124 Profile::RESERVED_IDENTIFIERS.each do |identifier|
115 assert_invalid_identifier identifier 125 assert_invalid_identifier identifier