Remove ActiveRecord::Model

In the end I think the pain of implementing this seamlessly was not
worth the gain provided.

The intention was that it would allow plain ruby objects that might not
live in your main application to be subclassed and have persistence
mixed in. But I've decided that the benefit of doing that is not worth
the amount of complexity that the implementation introduced.

1 files changed, 0 insertions, 14 deletions

diff --git a/activerecord/test/cases/base_test.rb b/activerecord/test/cases/base_test.rb
index 0f859bf452..203e44857a 100644
--- a/activerecord/test/cases/base_test.rb
+++ b/activerecord/test/cases/base_test.rb
@@ -23,7 +23,6 @@ require 'models/edge'
 require 'models/joke'
 require 'models/bulb'
 require 'models/bird'
-require 'models/teapot'
 require 'rexml/document'
 require 'active_support/core_ext/exception'
 
@@ -1196,10 +1195,6 @@ class BasicsTest < ActiveRecord::TestCase
 
     # Concrete subclasses an abstract class which has a type column.
     assert !SubStiPost.descends_from_active_record?
-
-    assert Teapot.descends_from_active_record?
-    assert !OtherTeapot.descends_from_active_record?
-    assert CoolTeapot.descends_from_active_record?
   end
 
   def test_find_on_abstract_base_class_doesnt_use_type_condition
@@ -1453,15 +1448,6 @@ class BasicsTest < ActiveRecord::TestCase
     assert_equal scope, Bird.uniq
   end
 
-  def test_active_record_super
-    assert_equal ActiveRecord::Model, ActiveRecord::Base.active_record_super
-    assert_equal ActiveRecord::Base,  Topic.active_record_super
-    assert_equal Topic,               ImportantTopic.active_record_super
-    assert_equal ActiveRecord::Model, Teapot.active_record_super
-    assert_equal Teapot,              OtherTeapot.active_record_super
-    assert_equal ActiveRecord::Model, CoolTeapot.active_record_super
-  end
-
   def test_table_name_with_2_abstract_subclasses
     assert_equal "photos", Photo.table_name
   end