fix again

Author: seuros

lib/closure_tree/test/matcher.rb

@@ -85,7 +85,3 @@ def description
     end
   end
 end
-
-RSpec.configure do |c|
-  c.include ClosureTree::Test::Matcher, type: :model
-end

test/closure_tree/matcher_test.rb

@@ -41,30 +41,33 @@ class MatcherTest < ActiveSupport::TestCase
 
   def assert_closure_tree(model, options = {})
     assert model.is_a?(Class), "Expected #{model} to be a Class"
-    assert model.included_modules.include?(ClosureTree::Model), 
-           "Expected #{model} to include ClosureTree::Model"
+    assert model.respond_to?(:_ct), 
+           "Expected #{model} to have closure_tree enabled"
 
     if options[:ordered]
       order_column = options[:ordered] == true ? :sort_order : options[:ordered]
-      assert model.closure_tree_options[:order], 
+      assert model._ct.options[:order], 
              "Expected #{model} to be ordered"
-      if order_column != true
-        assert_equal order_column.to_s, model.closure_tree_options[:order], 
+      if order_column != true && order_column != :sort_order
+        assert_equal order_column.to_s, model._ct.options[:order], 
                      "Expected #{model} to be ordered by #{order_column}"
       end
     end
 
     if options.key?(:with_advisory_lock)
       expected = options[:with_advisory_lock]
-      actual = model.closure_tree_options[:with_advisory_lock]
-      assert_equal expected, actual, 
-                   "Expected #{model} advisory lock to be #{expected}, but was #{actual}"
+      actual = model._ct.options[:with_advisory_lock]
+      if expected
+        assert actual, "Expected #{model} to have advisory lock"
+      else
+        refute actual, "Expected #{model} not to have advisory lock"
+      end
     end
   end
 
   def refute_closure_tree(model)
     assert model.is_a?(Class), "Expected #{model} to be a Class"
-    refute model.included_modules.include?(ClosureTree::Model), 
-           "Expected #{model} not to include ClosureTree::Model"
+    refute model.respond_to?(:_ct), 
+           "Expected #{model} not to have closure_tree enabled"
   end
 end

test/test_helper.rb

@@ -12,31 +12,34 @@
 require 'support/query_counter'
 require 'parallel'
 require 'timecop'
-require 'rails'
 
-ActiveRecord::Base.configurations = {
-  default_env: {
-    url: ENV.fetch('DATABASE_URL', "sqlite3://#{Dir.tmpdir}/#{SecureRandom.hex}.sqlite3"),
-    properties: { allowPublicKeyRetrieval: true } # for JRuby madness
-  }
-}
+# Configure the database based on environment
+database_url = ENV['DB_ADAPTER'] || ENV['DATABASE_URL'] || "sqlite3:///:memory:"
 
 ENV['WITH_ADVISORY_LOCK_PREFIX'] ||= SecureRandom.hex
 
-ActiveRecord::Base.establish_connection
+# Parse database URL and establish connection
+if database_url.start_with?('sqlite3://')
+  # SQLite needs special handling
+  if database_url == 'sqlite3:///:memory:'
+    ActiveRecord::Base.establish_connection(adapter: 'sqlite3', database: ':memory:')
+  else
+    # Create a temporary database file
+    db_file = File.join(Dir.tmpdir, "closure_tree_test_#{SecureRandom.hex}.sqlite3")
+    ActiveRecord::Base.establish_connection(adapter: 'sqlite3', database: db_file)
+  end
+else
+  # For MySQL and PostgreSQL, use the URL directly
+  ActiveRecord::Base.establish_connection(database_url)
+end
 
 def env_db
-  @env_db ||= if ActiveRecord::Base.respond_to?(:connection_db_config)
-                ActiveRecord::Base.connection_db_config.adapter
-              else
-                ActiveRecord::Base.connection_config[:adapter]
-              end.to_sym
+  @env_db ||= ActiveRecord::Base.connection_db_config.adapter.to_sym
 end
 
 ActiveRecord::Migration.verbose = false
 ActiveRecord::Base.table_name_prefix = ENV['DB_PREFIX'].to_s
 ActiveRecord::Base.table_name_suffix = ENV['DB_SUFFIX'].to_s
-ActiveRecord::Base.establish_connection
 
 # Use in specs to skip some tests
 def sqlite?
@@ -65,6 +68,14 @@ class Spec
 end
 
 class ActiveSupport::TestCase
+  setup do
+    DatabaseCleaner.start
+  end
+  
+  teardown do
+    DatabaseCleaner.clean
+  end
+
   def exceed_query_limit(num, &block)
     counter = QueryCounter.new
     ActiveSupport::Notifications.subscribed(counter.to_proc, 'sql.active_record', &block)