Class.new in AR test subclass ApplicationRecord

Before they were subclassing ActiveRecord::Base. With the introduction
of ApplicationRecord, these tests should actually be subclassing
ApplicationRecord.

Author: wangjohn

activerecord/test/cases/adapters/mysql/schema_test.rb

@@ -13,7 +13,7 @@ def setup
         table       = Post.table_name
         @db_name    = db
 
-        @omgpost = Class.new(ActiveRecord::Base) do
+        @omgpost = Class.new(ApplicationRecord) do
           self.table_name = "#{db}.#{table}"
           def self.name; 'Post'; end
         end

activerecord/test/cases/adapters/mysql2/schema_test.rb

@@ -13,7 +13,7 @@ def setup
         table       = Post.table_name
         @db_name    = db
 
-        @omgpost = Class.new(ActiveRecord::Base) do
+        @omgpost = Class.new(ApplicationRecord) do
           self.table_name = "#{db}.#{table}"
           def self.name; 'Post'; end
         end

activerecord/test/cases/associations/has_many_associations_test.rb

@@ -46,11 +46,11 @@ def setup
   end
 
   def test_anonymous_has_many
-    developer = Class.new(ActiveRecord::Base) {
+    developer = Class.new(ApplicationRecord) {
       self.table_name = 'developers'
       dev = self
 
-      developer_project = Class.new(ActiveRecord::Base) {
+      developer_project = Class.new(ApplicationRecord) {
         self.table_name = 'developers_projects'
         belongs_to :developer, :class => dev
       }

activerecord/test/cases/associations/has_many_through_associations_test.rb

@@ -38,7 +38,7 @@ def setup
   end
 
   def make_model(name)
-    Class.new(ActiveRecord::Base) { define_singleton_method(:name) { name } }
+    Class.new(ApplicationRecord) { define_singleton_method(:name) { name } }
   end
 
   def test_singleton_has_many_through

activerecord/test/cases/associations/inverse_associations_test.rb

@@ -105,15 +105,15 @@ def test_polymorphic_and_has_many_through_relationships_should_not_have_inverses
 class InverseAssociationTests < ActiveRecord::TestCase
   def test_should_allow_for_inverse_of_options_in_associations
     assert_nothing_raised(ArgumentError, 'ActiveRecord should allow the inverse_of options on has_many') do
-      Class.new(ActiveRecord::Base).has_many(:wheels, :inverse_of => :car)
+      Class.new(ApplicationRecord).has_many(:wheels, :inverse_of => :car)
     end
 
     assert_nothing_raised(ArgumentError, 'ActiveRecord should allow the inverse_of options on has_one') do
-      Class.new(ActiveRecord::Base).has_one(:engine, :inverse_of => :car)
+      Class.new(ApplicationRecord).has_one(:engine, :inverse_of => :car)
     end
 
     assert_nothing_raised(ArgumentError, 'ActiveRecord should allow the inverse_of options on belongs_to') do
-      Class.new(ActiveRecord::Base).belongs_to(:car, :inverse_of => :driver)
+      Class.new(ApplicationRecord).belongs_to(:car, :inverse_of => :driver)
     end
   end
 

activerecord/test/cases/associations/join_model_test.rb

@@ -742,7 +742,7 @@ def test_has_many_with_pluralize_table_names_false
     def find_post_with_dependency(post_id, association, association_name, dependency)
       class_name = "PostWith#{association.to_s.classify}#{dependency.to_s.classify}"
       Post.find(post_id).update_columns type: class_name
-      klass = Object.const_set(class_name, Class.new(ActiveRecord::Base))
+      klass = Object.const_set(class_name, Class.new(ApplicationRecord))
       klass.table_name = 'posts'
       klass.send(association, association_name, :as => :taggable, :dependent => dependency)
       klass.find(post_id)

activerecord/test/cases/associations_test.rb

@@ -82,7 +82,7 @@ def test_include_with_order_works
 
   def test_bad_collection_keys
     assert_raise(ArgumentError, 'ActiveRecord should have barked on bad collection keys') do
-      Class.new(ActiveRecord::Base).has_many(:wheels, :name => 'wheels')
+      Class.new(ApplicationRecord).has_many(:wheels, :name => 'wheels')
     end
   end
 

activerecord/test/cases/attribute_methods_test.rb

@@ -18,7 +18,7 @@ class AttributeMethodsTest < ActiveRecord::TestCase
 
   def setup
     @old_matchers = ActiveRecord::Base.send(:attribute_method_matchers).dup
-    @target = Class.new(ActiveRecord::Base)
+    @target = Class.new(ApplicationRecord)
     @target.table_name = 'topics'
   end
 
@@ -507,7 +507,7 @@ def test_typecast_attribute_from_select_to_true
 
   def test_raises_dangerous_attribute_error_when_defining_activerecord_method_in_model
     %w(save create_or_update).each do |method|
-      klass = Class.new ActiveRecord::Base
+      klass = Class.new ApplicationRecord
       klass.class_eval "def #{method}() 'defined #{method}' end"
       assert_raise ActiveRecord::DangerousAttributeError do
         klass.instance_method_already_implemented?(method)
@@ -767,7 +767,7 @@ def test_read_attribute_with_nil_should_not_asplode
   # that by defining a 'foo' method in the generated methods module for B.
   # (That module will be inserted between the two, e.g. [B, <GeneratedAttributes>, A].)
   def test_inherited_custom_accessors
-    klass = Class.new(ActiveRecord::Base) do
+    klass = Class.new(ApplicationRecord) do
       self.table_name = "topics"
       self.abstract_class = true
       def title; "omg"; end

activerecord/test/cases/base_test.rb

@@ -1064,7 +1064,7 @@ def test_set_table_name_symbol_converted_to_string
   end
 
   def test_quoted_table_name_after_set_table_name
-    klass = Class.new(ActiveRecord::Base)
+    klass = Class.new(ApplicationRecord)
 
     klass.table_name = "foo"
     assert_equal "foo", klass.table_name
@@ -1076,14 +1076,14 @@ def test_quoted_table_name_after_set_table_name
   end
 
   def test_set_table_name_with_inheritance
-    k = Class.new( ActiveRecord::Base )
+    k = Class.new(ApplicationRecord)
     def k.name; "Foo"; end
     def k.table_name; super + "ks"; end
     assert_equal "foosks", k.table_name
   end
 
   def test_sequence_name_with_abstract_class
-    ak = Class.new(ActiveRecord::Base)
+    ak = Class.new(ApplicationRecord)
     ak.abstract_class = true
     k = Class.new(ak)
     k.table_name = "projects"
@@ -1288,7 +1288,7 @@ def test_clear_cache!
   end
 
   def test_current_scope_is_reset
-    Object.const_set :UnloadablePost, Class.new(ActiveRecord::Base)
+    Object.const_set :UnloadablePost, Class.new(ApplicationRecord)
     UnloadablePost.send(:current_scope=, UnloadablePost.all)
 
     UnloadablePost.unloadable
@@ -1332,7 +1332,7 @@ def test_marshal_between_processes
       flunk "there should be no post constant"
     end
 
-    self.class.const_set("Post", Class.new(ActiveRecord::Base) {
+    self.class.const_set("Post", Class.new(ApplicationRecord) {
       has_many :comments
     })
 
@@ -1447,20 +1447,20 @@ def test_default_values_are_deeply_dupped
       scope = mock
       scope.expects(meth).with(:foo, :bar).returns(record)
 
-      klass = Class.new(ActiveRecord::Base)
+      klass = Class.new(ApplicationRecord)
       klass.stubs(:all => scope)
 
       assert_equal record, klass.public_send(meth, :foo, :bar)
     end
   end
 
   test "scoped can take a values hash" do
-    klass = Class.new(ActiveRecord::Base)
+    klass = Class.new(ApplicationRecord)
     assert_equal ['foo'], klass.all.merge!(select: 'foo').select_values
   end
 
   test "connection_handler can be overridden" do
-    klass = Class.new(ActiveRecord::Base)
+    klass = Class.new(ApplicationRecord)
     orig_handler = klass.connection_handler
     new_handler = ActiveRecord::ConnectionAdapters::ConnectionHandler.new
     thread_connection_handler = nil
@@ -1476,7 +1476,7 @@ def test_default_values_are_deeply_dupped
   end
 
   test "new threads get default the default connection handler" do
-    klass = Class.new(ActiveRecord::Base)
+    klass = Class.new(ApplicationRecord)
     orig_handler = klass.connection_handler
     handler = nil
 
@@ -1491,7 +1491,7 @@ def test_default_values_are_deeply_dupped
   end
 
   test "changing a connection handler in a main thread does not poison the other threads" do
-    klass = Class.new(ActiveRecord::Base)
+    klass = Class.new(ApplicationRecord)
     orig_handler = klass.connection_handler
     new_handler = ActiveRecord::ConnectionAdapters::ConnectionHandler.new
     after_handler = nil

activerecord/test/cases/connection_pool_test.rb

@@ -332,7 +332,7 @@ def test_pool_sets_connection_visitor
       # make sure exceptions are thrown when establish_connection
       # is called with an anonymous class
       def test_anonymous_class_exception
-        anonymous = Class.new(ActiveRecord::Base)
+        anonymous = Class.new(ApplicationRecord)
         handler = ActiveRecord::Base.connection_handler
 
         assert_raises(RuntimeError) {

activerecord/test/cases/defaults_test.rb

@@ -130,7 +130,7 @@ def test_mysql_text_not_null_defaults_strict
     end
 
     def with_text_blob_not_null_table
-      klass = Class.new(ActiveRecord::Base)
+      klass = Class.new(ApplicationRecord)
       klass.table_name = 'test_mysql_text_not_null_defaults'
       klass.connection.create_table klass.table_name do |t|
         t.column :non_null_text, :text, :null => false
@@ -147,7 +147,7 @@ def with_text_blob_not_null_table
     # MySQL uses an implicit default 0 rather than NULL unless in strict mode.
     # We use an implicit NULL so schema.rb is compatible with other databases.
     def test_mysql_integer_not_null_defaults
-      klass = Class.new(ActiveRecord::Base)
+      klass = Class.new(ApplicationRecord)
       klass.table_name = 'test_integer_not_null_default_zero'
       klass.connection.create_table klass.table_name do |t|
         t.column :zero, :integer, :null => false, :default => 0

activerecord/test/cases/dirty_test.rb

@@ -59,7 +59,7 @@ def test_attribute_changes
 
   def test_time_attributes_changes_with_time_zone
     in_time_zone 'Paris' do
-      target = Class.new(ActiveRecord::Base)
+      target = Class.new(ApplicationRecord)
       target.table_name = 'pirates'
 
       # New record - no changes.
@@ -86,7 +86,7 @@ def test_time_attributes_changes_with_time_zone
 
   def test_setting_time_attributes_with_time_zone_field_to_itself_should_not_be_marked_as_a_change
     in_time_zone 'Paris' do
-      target = Class.new(ActiveRecord::Base)
+      target = Class.new(ApplicationRecord)
       target.table_name = 'pirates'
 
       pirate = target.create
@@ -97,7 +97,7 @@ def test_setting_time_attributes_with_time_zone_field_to_itself_should_not_be_ma
 
   def test_time_attributes_changes_without_time_zone_by_skip
     in_time_zone 'Paris' do
-      target = Class.new(ActiveRecord::Base)
+      target = Class.new(ApplicationRecord)
       target.table_name = 'pirates'
 
       target.skip_time_zone_conversion_for_attributes = [:created_on]
@@ -125,7 +125,7 @@ def test_time_attributes_changes_without_time_zone_by_skip
   end
 
   def test_time_attributes_changes_without_time_zone
-    target = Class.new(ActiveRecord::Base)
+    target = Class.new(ApplicationRecord)
     target.table_name = 'pirates'
 
     target.time_zone_aware_attributes = false
@@ -207,7 +207,7 @@ def test_nullable_float_not_marked_as_changed_if_new_value_is_blank
 
   def test_nullable_datetime_not_marked_as_changed_if_new_value_is_blank
     in_time_zone 'Edinburgh' do
-      target = Class.new(ActiveRecord::Base)
+      target = Class.new(ApplicationRecord)
       target.table_name = 'topics'
 
       topic = target.create
@@ -572,7 +572,7 @@ def test_field_named_field
 
   def test_datetime_attribute_can_be_updated_with_fractional_seconds
     in_time_zone 'Paris' do
-      target = Class.new(ActiveRecord::Base)
+      target = Class.new(ApplicationRecord)
       target.table_name = 'topics'
 
       written_on = Time.utc(2012, 12, 1, 12, 0, 0).in_time_zone('Paris')

activerecord/test/cases/fixtures_test.rb

@@ -132,7 +132,7 @@ def test_inserts_with_pre_and_suffix
       ActiveRecord::Base.table_name_prefix = 'prefix_'
       ActiveRecord::Base.table_name_suffix = '_suffix'
 
-      other_topic_klass = Class.new(ActiveRecord::Base) do
+      other_topic_klass = Class.new(ApplicationRecord) do
         def self.name
           "OtherTopic"
         end
@@ -271,7 +271,7 @@ def test_fixtures
 
 class HasManyThroughFixture < ActiveSupport::TestCase
   def make_model(name)
-    Class.new(ActiveRecord::Base) { define_singleton_method(:name) { name } }
+    Class.new(ApplicationRecord) { define_singleton_method(:name) { name } }
   end
 
   def test_has_many_through

activerecord/test/cases/hot_compatibility_test.rb

@@ -4,7 +4,7 @@ class HotCompatibilityTest < ActiveRecord::TestCase
   self.use_transactional_fixtures = false
 
   setup do
-    @klass = Class.new(ActiveRecord::Base) do
+    @klass = Class.new(ApplicationRecord) do
       connection.create_table :hot_compatibilities do |t|
         t.string :foo
         t.string :bar

activerecord/test/cases/migration/change_schema_test.rb

@@ -268,7 +268,7 @@ def test_keeping_default_and_notnull_constraints_on_change
         connection.create_table :testings do |t|
           t.column :title, :string
         end
-        person_klass = Class.new(ActiveRecord::Base)
+        person_klass = Class.new(ApplicationRecord)
         person_klass.table_name = 'testings'
 
         person_klass.connection.add_column "testings", "wealth", :integer, :null => false, :default => 99

activerecord/test/cases/primary_keys_test.rb

@@ -143,18 +143,18 @@ def test_primary_key_returns_nil_if_it_does_not_exist
   end
 
   def test_quoted_primary_key_after_set_primary_key
-    k = Class.new( ActiveRecord::Base )
+    k = Class.new(ApplicationRecord)
     assert_equal k.connection.quote_column_name("id"), k.quoted_primary_key
     k.primary_key = "foo"
     assert_equal k.connection.quote_column_name("foo"), k.quoted_primary_key
   end
 
   def test_two_models_with_same_table_but_different_primary_key
-    k1 = Class.new(ActiveRecord::Base)
+    k1 = Class.new(ApplicationRecord)
     k1.table_name = 'posts'
     k1.primary_key = 'id'
 
-    k2 = Class.new(ActiveRecord::Base)
+    k2 = Class.new(ApplicationRecord)
     k2.table_name = 'posts'
     k2.primary_key = 'title'
 
@@ -170,10 +170,10 @@ def test_two_models_with_same_table_but_different_primary_key
   end
 
   def test_models_with_same_table_have_different_columns
-    k1 = Class.new(ActiveRecord::Base)
+    k1 = Class.new(ApplicationRecord)
     k1.table_name = 'posts'
 
-    k2 = Class.new(ActiveRecord::Base)
+    k2 = Class.new(ApplicationRecord)
     k2.table_name = 'posts'
 
     k1.columns.zip(k2.columns).each do |col1, col2|
@@ -190,7 +190,7 @@ def test_set_primary_key_with_no_connection
 
     connection = ActiveRecord::Base.remove_connection
 
-    model = Class.new(ActiveRecord::Base)
+    model = Class.new(ApplicationRecord)
     model.primary_key = 'foo'
 
     assert_equal 'foo', model.primary_key

activerecord/test/cases/scoping/named_scoping_test.rb

@@ -46,7 +46,7 @@ def test_delegates_finds_and_calculations_to_the_base_class
   end
 
   def test_method_missing_priority_when_delegating
-    klazz = Class.new(ActiveRecord::Base) do
+    klazz = Class.new(ApplicationRecord) do
       self.table_name = "topics"
       scope :since, Proc.new { where('written_on >= ?', Time.now - 1.day) }
       scope :to,    Proc.new { where('written_on <= ?', Time.now) }
@@ -270,7 +270,7 @@ def test_should_build_on_top_of_chained_scopes
   # has been done by evaluating a string with a plain def statement. For scope
   # names which contain spaces this approach doesn't work.
   def test_spaces_in_scope_names
-    klass = Class.new(ActiveRecord::Base) do
+    klass = Class.new(ApplicationRecord) do
       self.table_name = "topics"
       scope :"title containing space", -> { where("title LIKE '% %'") }
       scope :approved, -> { where(:approved => true) }
@@ -436,7 +436,7 @@ def test_scoped_are_lazy_loaded_if_table_still_does_not_exist
   end
 
   def test_eager_default_scope_relations_are_remove
-    klass = Class.new(ActiveRecord::Base)
+    klass = Class.new(ApplicationRecord)
     klass.table_name = 'posts'
 
     assert_raises(ArgumentError) do

activerecord/test/cases/serialization_test.rb

@@ -54,7 +54,7 @@ def test_include_root_in_json_allows_inheritance
     original_root_in_json = ActiveRecord::Base.include_root_in_json
     ActiveRecord::Base.include_root_in_json = true
 
-    klazz = Class.new(ActiveRecord::Base)
+    klazz = Class.new(ApplicationRecord)
     klazz.table_name = 'topics'
     assert klazz.include_root_in_json