fix tests

Author: seuros

.github/workflows/ci.yml

@@ -38,16 +38,22 @@ jobs:
       fail-fast: false
       matrix:
         ruby:
-          - '3.3'
+          - '3.4'
+          - 'jruby'
+          - 'truffleruby'
         rails:
-          - activerecord_8.0
-          - activerecord_7.2
-          - activerecord_7.1
-          - activerecord_edge
-        adapter:
-          - 'sqlite3:///:memory:'
-          - mysql2://root:root@0/closure_tree_test
-          - postgres://closure_tree:closure_tree@0/closure_tree_test
+          - '8.0'
+          - '7.2'
+          - '7.1'
+        exclude:
+          # JRuby doesn't support Rails 8.0 yet
+          - ruby: 'jruby'
+            rails: '7.2'
+          - ruby: 'jruby'
+            rails: '8.0'
+          # TruffleRuby also has compatibility issues with Rails 8.0
+          - ruby: 'truffleruby'
+            rails: '8.0'
 
     steps:
       - name: Checkout
@@ -60,14 +66,26 @@ jobs:
           bundler-cache: true
           rubygems: latest
         env:
-          BUNDLE_GEMFILE: gemfiles/${{ matrix.rails }}.gemfile
+          RAILS_VERSION: ${{ matrix.rails }}
           RAILS_ENV: test
 
+      - name: Setup databases
+        env:
+          RAILS_ENV: test
+          RAILS_VERSION: ${{ matrix.rails }}
+          DATABASE_URL_PG: postgres://postgres:postgres@127.0.0.1:5432/closure_tree_test
+          DATABASE_URL_MYSQL: mysql2://root:root@127.0.0.1:3306/closure_tree_test
+          DATABASE_URL_SQLITE3: 'sqlite3::memory:'
+        run: |
+          cd test/dummy
+          bundle exec rails db:schema:load
+
       - name: Test
         env:
           RAILS_ENV: test
           RAILS_VERSION: ${{ matrix.rails }}
-          DB_ADAPTER: ${{ matrix.adapter }}
-          BUNDLE_GEMFILE: gemfiles/${{ matrix.rails }}.gemfile
+          DATABASE_URL_PG: postgres://postgres:postgres@127.0.0.1:5432/closure_tree_test
+          DATABASE_URL_MYSQL: mysql2://root:root@127.0.0.1:3306/closure_tree_test
+          DATABASE_URL_SQLITE3: 'sqlite3::memory:'
           WITH_ADVISORY_LOCK_PREFIX: ${{ github.run_id }}
-        run: bin/rake
+        run: bin/rails test

.github/workflows/ci_jruby.yml

@@ -4,12 +4,21 @@ source 'https://rubygems.org'
 
 gemspec
 
-gem 'with_advisory_lock', github: 'closuretree/with_advisory_lock'
 gem 'railties'
-# Test with ActiveRecord 7.1 directly
-gem 'activerecord', '~> 7.1.0'
+gem 'with_advisory_lock', github: 'closuretree/with_advisory_lock'
+
+gem 'activerecord', "~> #{ENV['RAILS_VERSION'] || '8.0'}.0"
+
+platforms :ruby, :truffleruby do
+  # Database adapters
+  gem 'mysql2'
+  gem 'pg'
+  gem 'sqlite3'
+end
 
-# Database adapters
-gem 'sqlite3'
-gem 'pg'
-gem 'mysql2'
+platform :jruby do
+  # JRuby-specific gems
+  gem 'activerecord-jdbcmysql-adapter'
+  gem 'activerecord-jdbcpostgresql-adapter'
+  gem 'activerecord-jdbcsqlite3-adapter'
+end

.github/workflows/ci_truffleruby.yml

@@ -23,3 +23,8 @@ namespace :test do
     end
   end
 end
+
+
+require_relative 'test/dummy/config/application'
+
+Rails.application.load_tasks

Gemfile

@@ -1,6 +1,15 @@
 #!/usr/bin/env ruby
 # frozen_string_literal: true
 
+# This command will automatically be run when you run "rails" with Rails gems
+# installed from the root of your application.
+
+ENGINE_ROOT = File.expand_path('..', __dir__)
 APP_PATH = File.expand_path('../test/dummy/config/application', __dir__)
-require_relative '../test/dummy/config/boot'
-require 'rails/commands'
+
+# Set up gems listed in the Gemfile.
+ENV['BUNDLE_GEMFILE'] ||= File.expand_path('../Gemfile', __dir__)
+require 'bundler/setup' if File.exist?(ENV['BUNDLE_GEMFILE'])
+
+require 'rails/all'
+require 'rails/engine/commands'

Rakefile

@@ -0,0 +1,56 @@
+# frozen_string_literal: true
+
+require "test_helper"
+
+class LabelOrderValueTest < ActiveSupport::TestCase
+  def setup
+    Label.delete_all
+    LabelHierarchy.delete_all
+  end
+
+  test "should set order_value on roots for Label" do
+    root = Label.create(name: "root")
+    assert_equal 0, root.order_value
+  end
+
+  test "should set order_value with siblings for Label" do
+    root = Label.create(name: "root")
+    a = root.children.create(name: "a")
+    b = root.children.create(name: "b")
+    c = root.children.create(name: "c")
+    
+    assert_equal 0, a.order_value
+    assert_equal 1, b.order_value
+    assert_equal 2, c.order_value
+  end
+
+  test "should reset order_value when a node is moved to another location for Label" do
+    root = Label.create(name: "root")
+    a = root.children.create(name: "a")
+    b = root.children.create(name: "b")
+    c = root.children.create(name: "c")
+    
+    root2 = Label.create(name: "root2")
+    root2.add_child b
+    
+    assert_equal 0, a.order_value
+    assert_equal 0, b.order_value
+    assert_equal 1, c.reload.order_value
+  end
+
+  test "should set order_value on roots for LabelWithoutRootOrdering" do
+    root = LabelWithoutRootOrdering.create(name: "root")
+    assert_nil root.order_value
+  end
+
+  test "should set order_value with siblings for LabelWithoutRootOrdering" do
+    root = LabelWithoutRootOrdering.create(name: "root")
+    a = root.children.create(name: "a")
+    b = root.children.create(name: "b")
+    c = root.children.create(name: "c")
+    
+    assert_equal 0, a.order_value
+    assert_equal 1, b.order_value
+    assert_equal 2, c.order_value
+  end
+end

bin/rails

@@ -3,10 +3,14 @@
 require "test_helper"
 
 module CorrectOrderValue
-  def self.shared_examples(&block)
+  def self.shared_examples(model, expected_root_order_value)
     describe "correct order_value" do
       before do
-        instance_exec(&block)
+        @model = model
+        @expected_root_order_value = expected_root_order_value
+        # Clean up any existing data
+        @model.delete_all
+        @model.hierarchy_class.delete_all
         @root = @model.create(name: "root")
         @a, @b, @c = %w[a b c].map { |n| @root.children.create(name: n) }
       end
@@ -111,6 +115,11 @@ def create_preorder_tree(suffix = "")
   end
 
   describe "roots" do
+    before do
+      Label.delete_all
+      Label.hierarchy_class.delete_all
+    end
+    
     it "sorts alphabetically" do
       expected = (0..10).to_a
       expected.shuffle.each do |ea|
@@ -471,17 +480,11 @@ def roots_name_and_order
 
   describe "order_value must be set" do
     describe "with normal model" do
-      CorrectOrderValue.shared_examples do
-        @model = Label
-        @expected_root_order_value = 0
-      end
+      CorrectOrderValue.shared_examples(Label, 0)
     end
 
     describe "without root ordering" do
-      CorrectOrderValue.shared_examples do
-        @model = LabelWithoutRootOrdering
-        @expected_root_order_value = nil
-      end
+      CorrectOrderValue.shared_examples(LabelWithoutRootOrdering, nil)
     end
   end
 

test/closure_tree/label_order_value_test.rb

@@ -13,7 +13,7 @@ class MatcherTest < ActiveSupport::TestCase
   end
 
   test "be_a_closure_tree matcher" do
-    assert_closure_tree UUIDTag
+    assert_closure_tree UuidTag
     assert_closure_tree User
     assert_closure_tree Label, ordered: true
     assert_closure_tree Metal, ordered: :sort_order
@@ -23,7 +23,7 @@ class MatcherTest < ActiveSupport::TestCase
 
   test "ordered option" do
     assert_closure_tree Label, ordered: true
-    assert_closure_tree UUIDTag, ordered: true
+    assert_closure_tree UuidTag, ordered: true
     assert_closure_tree Metal, ordered: :sort_order
   end