chore: migrate last remaining tests of rspec

.github/workflows/ci.yml

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

.github/workflows/ci_jruby.yml

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

.github/workflows/ci_truffleruby.yml

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

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
-

Rakefile

@@ -1,32 +1,25 @@
 # frozen_string_literal: true
 
 require 'bundler/gem_tasks'
-require 'rspec/core/rake_task'
 require 'rake/testtask'
 
-RSpec::Core::RakeTask.new(:spec) do |task|
-  task.pattern = 'spec/closure_tree/*_spec.rb'
-end
+task default: :test
 
-task default: %i[spec test]
+Rake::TestTask.new do |t|
+  t.libs.push 'lib'
+  t.libs.push 'test'
+  t.pattern = 'test/**/*_test.rb'
+  t.verbose = true
+end
 
-namespace :spec do
-  desc 'Run all spec variants'
+namespace :test do
+  desc 'Run all test variants'
   task :all do
     rake = 'bin/rake'
 
     [['', ''], ['db_prefix_', ''], ['', '_db_suffix'], %w[abc_ _123]].each do |prefix, suffix|
       env = "DB_PREFIX=#{prefix} DB_SUFFIX=#{suffix}"
-      raise unless system("#{rake} spec #{env}")
+      raise unless system("#{rake} test #{env}")
     end
   end
 end
-
-Rake::TestTask.new do |t|
-  t.libs.push 'lib'
-  t.libs.push 'test'
-  t.pattern = 'test/**/*_test.rb'
-  t.verbose = true
-end
-
-task default: 'spec:all'

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[[email protected] [email protected]]
   gem.homepage    = 'https://github.com/ClosureTree/closure_tree/'
@@ -21,23 +21,20 @@ 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'
   gem.add_runtime_dependency 'with_advisory_lock', '>= 5.0.0', '< 6.0.0'
 
   gem.add_development_dependency 'appraisal'
   gem.add_development_dependency 'database_cleaner'
-  gem.add_development_dependency 'generator_spec'
   gem.add_development_dependency 'parallel'
   gem.add_development_dependency 'minitest'
   gem.add_development_dependency 'minitest-reporters'
-  gem.add_development_dependency 'rspec-instafail'
-  gem.add_development_dependency 'rspec-rails'
   gem.add_development_dependency 'simplecov'
   gem.add_development_dependency 'timecop'
   # gem.add_development_dependency 'byebug'

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: "../"

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