Removed the version of ActiveRecord::Base#destroyed? that was added in a44a1257d879311d88c2d10c366ab0d6561f903a.

Because José Valim was cheeky enough to already add it to the master branch.

2 files changed, 0 insertions, 7 deletions

diff --git a/activerecord/lib/active_record/base.rb b/activerecord/lib/active_record/base.rb
index 2f6e3e8ffd..afa4185c60 100755
--- a/activerecord/lib/active_record/base.rb
+++ b/activerecord/lib/active_record/base.rb
@@ -2813,11 +2813,6 @@ module ActiveRecord #:nodoc:
         @attributes.frozen?
       end
 
-      # Returns +true+ if the record has been destroyed.
-      def destroyed?
-        @destroyed
-      end
-
       # Returns duplicated record with unfreezed attributes.
       def dup
         obj = super
diff --git a/activerecord/test/cases/base_test.rb b/activerecord/test/cases/base_test.rb
index 3f61e1148d..8421a8fb07 100755
--- a/activerecord/test/cases/base_test.rb
+++ b/activerecord/test/cases/base_test.rb
@@ -529,7 +529,6 @@ class BasicsTest < ActiveRecord::TestCase
     topic = Topic.find(1)
     assert_equal topic, topic.delete, 'topic.delete did not return self'
     assert topic.frozen?, 'topic not frozen after delete'
-    assert topic.destroyed?, 'topic not marked as being destroyed'
     assert_raise(ActiveRecord::RecordNotFound) { Topic.find(topic.id) }
   end
 
@@ -542,7 +541,6 @@ class BasicsTest < ActiveRecord::TestCase
     topic = Topic.find(1)
     assert_equal topic, topic.destroy, 'topic.destroy did not return self'
     assert topic.frozen?, 'topic not frozen after destroy'
-    assert topic.destroyed?, 'topic not marked as being destroyed'
     assert_raise(ActiveRecord::RecordNotFound) { Topic.find(topic.id) }
   end