From 317c3ba69e1ee6d8afd0f996cf6b8cce74e99af9 Mon Sep 17 00:00:00 2001
From: Keenan Brock <keenan@thebrocks.net>
Date: Mon, 14 Jun 2021 14:02:17 -0400
Subject: [PATCH] fix tests and class definitions

Active record works better when defining a class rather than using anonymous classes
The with_model helper takes care of all the details.

A few of the STI examples did not properly handle undefining these temporary classes.

This PR properly undefines the temporary test classes
---
 test/concerns/sti_support_test.rb | 27 ++++++++++++++-------------
 1 file changed, 14 insertions(+), 13 deletions(-)

diff --git a/test/concerns/sti_support_test.rb b/test/concerns/sti_support_test.rb
index 33d18706..72ad788d 100644
--- a/test/concerns/sti_support_test.rb
+++ b/test/concerns/sti_support_test.rb
@@ -3,35 +3,36 @@
 class StiSupportTest < ActiveSupport::TestCase
   def test_sti_support
     AncestryTestDatabase.with_model :extra_columns => {:type => :string} do |model|
-      subclass1 = Object.const_set 'Subclass1', Class.new(model)
-      (class << subclass1; self; end).send :define_method, :model_name do; Struct.new(:human, :underscore).new 'Subclass1', 'subclass1'; end
-      subclass2 = Object.const_set 'Subclass2', Class.new(model)
-      (class << subclass2; self; end).send :define_method, :model_name do; Struct.new(:human, :underscore).new 'Subclass1', 'subclass1'; end
+      Object.const_set 'Subclass1', Class.new(model)
+      Object.const_set 'Subclass2', Class.new(model)
 
-      node1 = subclass1.create!
-      node2 = subclass2.create! :parent => node1
-      node3 = subclass1.create! :parent => node2
-      node4 = subclass2.create! :parent => node3
-      node5 = subclass1.create! :parent => node4
+      node1 = Subclass1.create!
+      node2 = Subclass2.create! :parent => node1
+      node3 = Subclass1.create! :parent => node2
+      node4 = Subclass2.create! :parent => node3
+      node5 = Subclass1.create! :parent => node4
 
       model.all.each do |node|
-        assert [subclass1, subclass2].include?(node.class)
+        assert [Subclass1, Subclass2].include?(node.class)
       end
 
       assert_equal [node2.id, node3.id, node4.id, node5.id], node1.descendants.map(&:id)
       assert_equal [node1.id, node2.id, node3.id, node4.id, node5.id], node1.subtree.map(&:id)
       assert_equal [node1.id, node2.id, node3.id, node4.id], node5.ancestors.map(&:id)
       assert_equal [node1.id, node2.id, node3.id, node4.id, node5.id], node5.path.map(&:id)
+
+      Object.send :remove_const, 'Subclass1'
+      Object.send :remove_const, 'Subclass2'
     end
   end
 
   def test_sti_support_with_from_subclass
     AncestryTestDatabase.with_model :extra_columns => {:type => :string} do |model|
       subclass1 = Object.const_set 'SubclassWithAncestry', Class.new(model)
-
       subclass1.has_ancestry
-
       subclass1.create!
+
+      Object.send :remove_const, 'SubclassWithAncestry'
     end
   end
-end
\ No newline at end of file
+end