remove more reference

Author: seuros

.github/workflows/ci.yml

@@ -11,7 +11,7 @@ on:
 
 
 jobs:
-  rspec:
+  test:
     runs-on: ubuntu-latest
     services:
       mysql:
@@ -63,7 +63,7 @@ jobs:
           BUNDLE_GEMFILE: gemfiles/${{ matrix.rails }}.gemfile
           RAILS_ENV: test
 
-      - name: RSpec
+      - name: Test
         env:
           RAILS_VERSION: ${{ matrix.rails }}
           DB_ADAPTER: ${{ matrix.adapter }}

.github/workflows/ci_jruby.yml

@@ -13,7 +13,7 @@ concurrency:
   cancel-in-progress: true
 
 jobs:
-  rspec:
+  test:
     runs-on: ubuntu-latest
     services:
       mysql:
@@ -59,7 +59,7 @@ jobs:
           BUNDLE_GEMFILE: gemfiles/${{ matrix.rails }}.gemfile
           RAILS_ENV: test
 
-      - name: RSpec
+      - name: Test
         env:
           RAILS_VERSION: ${{ matrix.rails }}
           DB_ADAPTER: ${{ matrix.adapter }}

.github/workflows/ci_truffleruby.yml

@@ -13,7 +13,7 @@ concurrency:
   cancel-in-progress: true
 
 jobs:
-  rspec:
+  test:
     runs-on: ubuntu-latest
     services:
       mysql:
@@ -62,7 +62,7 @@ jobs:
           BUNDLE_GEMFILE: gemfiles/${{ matrix.rails }}.gemfile
           RAILS_ENV: test
 
-      - name: RSpec
+      - name: Test
         env:
           RAILS_VERSION: ${{ matrix.rails }}
           DB_ADAPTER: ${{ matrix.adapter }}

Appraisals

@@ -2,6 +2,8 @@
 
 appraise 'activerecord-7.1' do
   gem 'activerecord', '~> 7.1.0'
+  gem 'railties'
+
   platforms :ruby, :truffleruby do
     gem 'mysql2'
     gem 'pg'
@@ -17,45 +19,33 @@ end
 
 appraise 'activerecord-7.2' do
   gem 'activerecord', '~> 7.2.0'
+  gem 'railties'
+
   platforms :ruby do
     gem 'mysql2'
     gem 'pg'
     gem 'sqlite3'
   end
-
-  platforms :jruby do
-    gem 'activerecord-jdbcmysql-adapter'
-    gem 'activerecord-jdbcpostgresql-adapter'
-    gem 'activerecord-jdbcsqlite3-adapter'
-  end
 end
 
 appraise 'activerecord-8.0' do
   gem 'activerecord', '~> 8.0.0'
+  gem 'railties'
+
   platforms :ruby do
     gem 'mysql2'
     gem 'pg'
     gem 'sqlite3'
   end
-
-  platforms :jruby do
-    gem 'activerecord-jdbcmysql-adapter'
-    gem 'activerecord-jdbcpostgresql-adapter'
-    gem 'activerecord-jdbcsqlite3-adapter'
-  end
 end
 
 appraise 'activerecord-edge' do
   gem 'activerecord', github: 'rails/rails'
+  gem 'railties', github: 'rails/rails'
+
   platforms :ruby do
     gem 'mysql2'
     gem 'pg'
     gem 'sqlite3'
   end
-
-  platforms :jruby do
-    gem 'activerecord-jdbcmysql-adapter'
-    gem 'activerecord-jdbcpostgresql-adapter'
-    gem 'activerecord-jdbcsqlite3-adapter'
-  end
 end

Gemfile

@@ -3,4 +3,3 @@
 source 'https://rubygems.org'
 
 gemspec
-

closure_tree.gemspec

@@ -4,7 +4,7 @@ require_relative 'lib/closure_tree/version'
 
 Gem::Specification.new do |gem|
   gem.name        = 'closure_tree'
-  gem.version     = ::ClosureTree::VERSION
+  gem.version     = ClosureTree::VERSION
   gem.authors     = ['Matthew McEachen', 'Abdelkader Boudih']
   gem.email       = %w[matthew+github@mceachen.org terminale@gmail.com]
   gem.homepage    = 'https://github.com/ClosureTree/closure_tree/'
@@ -21,10 +21,10 @@ Gem::Specification.new do |gem|
   }
 
   gem.files         = `git ls-files`.split($/).reject do |f|
-    f.match(%r{^(spec|img|gemfiles)})
+    f.match(%r{^(test|img|gemfiles)})
   end
 
-  gem.test_files  = gem.files.grep(%r{^spec/})
+  gem.test_files  = gem.files.grep(%r{^test/})
   gem.required_ruby_version = '>= 3.3.0'
 
   gem.add_runtime_dependency 'activerecord', '>= 7.1.0'

gemfiles/activerecord_7.1.gemfile

@@ -3,6 +3,7 @@
 source "https://rubygems.org"
 
 gem "activerecord", "~> 7.1.0"
+gem "railties"
 
 platforms :ruby, :truffleruby do
   gem "mysql2"

gemfiles/activerecord_7.2.gemfile

@@ -3,17 +3,12 @@
 source "https://rubygems.org"
 
 gem "activerecord", "~> 7.2.0"
+gem "railties"
 
 platforms :ruby do
   gem "mysql2"
   gem "pg"
   gem "sqlite3"
 end
 
-platforms :jruby do
-  gem "activerecord-jdbcmysql-adapter"
-  gem "activerecord-jdbcpostgresql-adapter"
-  gem "activerecord-jdbcsqlite3-adapter"
-end
-
 gemspec path: "../"

gemfiles/activerecord_8.0.gemfile

@@ -3,17 +3,12 @@
 source "https://rubygems.org"
 
 gem "activerecord", "~> 8.0.0"
+gem "railties"
 
 platforms :ruby do
   gem "mysql2"
   gem "pg"
   gem "sqlite3"
 end
 
-platforms :jruby do
-  gem "activerecord-jdbcmysql-adapter"
-  gem "activerecord-jdbcpostgresql-adapter"
-  gem "activerecord-jdbcsqlite3-adapter"
-end
-
 gemspec path: "../"

gemfiles/activerecord_edge.gemfile

@@ -3,17 +3,12 @@
 source "https://rubygems.org"
 
 gem "activerecord", github: "rails/rails"
+gem "railties", github: "rails/rails"
 
 platforms :ruby do
   gem "mysql2"
   gem "pg"
   gem "sqlite3"
 end
 
-platforms :jruby do
-  gem "activerecord-jdbcmysql-adapter"
-  gem "activerecord-jdbcpostgresql-adapter"
-  gem "activerecord-jdbcsqlite3-adapter"
-end
-
 gemspec path: "../"

test/test_helper.rb

@@ -12,6 +12,7 @@
 require 'support/query_counter'
 require 'parallel'
 require 'timecop'
+require 'rails'
 
 ActiveRecord::Base.configurations = {
   default_env: {
@@ -71,21 +72,21 @@ def exceed_query_limit(num, &block)
   end
 
   class QueryCounter
-  attr_reader :query_count
+    attr_reader :query_count
 
-  def initialize
-    @query_count = 0
-  end
+    def initialize
+      @query_count = 0
+    end
 
-  def to_proc
-    lambda(&method(:callback))
-  end
+    def to_proc
+      lambda(&method(:callback))
+    end
 
-  def callback(name, start, finish, message_id, values)
-    @query_count += 1 unless %w(CACHE SCHEMA).include?(values[:name])
+    def callback(name, start, finish, message_id, values)
+      @query_count += 1 unless %w(CACHE SCHEMA).include?(values[:name])
+    end
   end
 end
-end
 
 # Configure parallel tests
 Thread.abort_on_exception = true