[browsermedia#534] Bug Fix - Can't delete image/file blocks

Validations were preventing Image/File blocks from deleting, since they required a file.

Author: peakpg

lib/cms/behaviors/attaching.rb

@@ -120,7 +120,10 @@ def validates_attachment_size(name, options = {})
  def validates_attachment_presence(name, options = {})
  message = options[:message] || "Must provide at least one #{name}"
  validate(options) do |record|
- record.errors.add(:attachment, message) unless record.attachments.any? { |a| a.attachment_name == name.to_s }
+ return if record.deleted?
+ unless record.attachments.any? { |a| a.attachment_name == name.to_s }
+ record.errors.add(:attachment, message)
+ end
  end
  end
 

test/unit/models/image_block_test.rb

@@ -28,6 +28,7 @@ def teardown
  assert_equal :original_record_id, ImageBlock.version_foreign_key
  end
 
+
  end
 
  class PaperclipAttachmentsTest < ActiveSupport::TestCase
@@ -36,6 +37,31 @@ def setup
  @image.save!
  end
 
+ test "validates_attachment_presence should ensure blocks have uploaded files.'" do
+ image = ImageBlock.new
+ assert_equal false, image.valid?
+ assert_equal true, image.errors.messages.include?(:attachment)
+ assert_equal ["You must upload a file"], image.errors.messages[:attachment]
+ end
+
+
+ test "validates_attachment_presence doesn't fire when deleting a block'" do
+ image = ImageBlock.new(:name => "A valid name")
+ image.deleted = true
+ assert image.valid?, "A block being deleted doesn't need an attachment to be valid'"
+
+ end
+
+ test "Can delete a block" do
+ @image.destroy
+ assert @image.valid?
+ assert @image.deleted?
+
+ @image.reload
+ assert @image.attachments.empty?, "Should remove attachments"
+ assert_equal true, @image.deleted?, "The image should be deleted."
+ end
+
  test "#attachable_type" do
  assert_equal "Cms::AbstractFileBlock", @image.attachable_type
  end