moved duplicate testing code over to test_helpers

stefankroes · Mar 29, 2023 · c4832d8 · c4832d8
1 parent fd0b86d
commit c4832d8
Show file tree

Hide file tree

Showing 4 changed files with 25 additions and 48 deletions.
diff --git a/test/concerns/materialized_path2_test.rb b/test/concerns/materialized_path2_test.rb
@@ -97,27 +97,4 @@ def test_ancestry_validation_exclude_self
       end
     end
   end
-
-  private
-
-  def assert_ancestry(node, value, child: :skip, db: :value)
-    if value.nil?
-      assert_nil node.ancestry
-    else
-      assert_equal value, node.ancestry
-    end
-
-    db = value if db == :value
-    if db.nil?
-      assert_nil node.ancestry_in_database
-    else
-      assert_equal db, node.ancestry_in_database
-    end
-
-    if child.nil?
-      assert_nil node.child_ancestry
-    elsif child != :skip
-      assert_equal child, node.child_ancestry
-    end
-  end
 end
diff --git a/test/concerns/materialized_path_test.rb b/test/concerns/materialized_path_test.rb
@@ -99,28 +99,4 @@ def test_ancestry_validation_exclude_self
       end
     end
   end
-
-  private
-
-  def assert_ancestry(node, value, child: :skip, db: :value)
-    column_name = node.class.ancestry_column
-    if value.nil?
-      assert_nil node.send(column_name)
-    else
-      assert_equal value, node.send(column_name)
-    end
-
-    db = value if db == :value
-    if db.nil?
-      assert_nil node.send("#{column_name}_in_database")
-    else
-      assert_equal db, node.send("#{column_name}_in_database")
-    end
-
-    if child.nil?
-      assert_nil node.child_ancestry
-    elsif child != :skip
-      assert_equal child, node.child_ancestry
-    end
-  end
 end
diff --git a/test/environment.rb b/test/environment.rb
@@ -11,8 +11,9 @@
 
 require 'active_support'
 require 'active_support/test_case'
+require 'test_helpers'
 ActiveSupport.test_order = :random if ActiveSupport.respond_to?(:test_order=)
-
+ActiveSupport::TestCase.include(TestHelpers)
 require 'active_record'
 require 'logger'
 

diff --git a/test/test_helpers.rb b/test/test_helpers.rb
@@ -0,0 +1,23 @@
+module TestHelpers
+  def assert_ancestry(node, value, child: :skip, db: :value)
+    column_name = node.class.ancestry_column
+    if value.nil?
+      assert_nil node.send(column_name)
+    else
+      assert_equal value, node.send(column_name)
+    end
+
+    db = value if db == :value
+    if db.nil?
+      assert_nil node.send("#{column_name}_in_database")
+    else
+      assert_equal db, node.send("#{column_name}_in_database")
+    end
+
+    if child.nil?
+      assert_nil node.child_ancestry
+    elsif child != :skip
+      assert_equal child, node.child_ancestry
+    end
+  end
+end