Merge branch 'master' of git://github.com/whatcould/acts_as_archive

xxx · Feb 21, 2010 · 7e78020 · 7e78020
2 parents 26a1639 + 06b8d8f
commit 7e78020
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 0 deletions.
diff --git a/lib/acts_as_archive/base/destroy.rb b/lib/acts_as_archive/base/destroy.rb
@@ -47,6 +47,7 @@ def destroy_without_callbacks
           unless new_record?
             self.class.copy_to_archive("#{self.class.primary_key} = #{id}")
           end
+          @destroyed = true
           freeze
         end
 

diff --git a/spec/acts_as_archive/base/destroy_spec.rb b/spec/acts_as_archive/base/destroy_spec.rb
@@ -93,6 +93,11 @@
           article_match?(original, copy)
         end
       end
+
+      it "should mark the object as destroyed" do
+        @articles[3].send(d)
+        @articles[3].destroyed?.should == true
+      end
     end
   end
 end