Skip to content

Commit fa661d4

Browse files
committed
fix build
1 parent c946d5d commit fa661d4

File tree

3 files changed

+19
-22
lines changed

3 files changed

+19
-22
lines changed

.github/workflows/ci_jruby.yml

-1
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,6 @@ jobs:
3939
rails:
4040
- activerecord_7.0
4141
- activerecord_6.1
42-
- activerecord_6.0
4342
adapter:
4443
- 'sqlite3:///:memory:'
4544
- mysql2://root:root@0/closure_tree_test

Rakefile

+13-18
Original file line numberDiff line numberDiff line change
@@ -8,24 +8,18 @@ RSpec::Core::RakeTask.new(:spec) do |task|
88
task.pattern = 'spec/closure_tree/*_spec.rb'
99
end
1010

11-
task default: [:spec, :test]
11+
task default: %i[spec test]
1212

1313
namespace :spec do
1414
desc 'Run all spec variants'
1515
task :all do
1616
rake = 'bin/rake'
17-
fail unless system("#{rake} spec:generators")
1817

19-
[['', ''], ['db_prefix_', ''], ['', '_db_suffix'], ['abc_', '_123']].each do |prefix, suffix|
18+
[['', ''], ['db_prefix_', ''], ['', '_db_suffix'], %w[abc_ _123]].each do |prefix, suffix|
2019
env = "DB_PREFIX=#{prefix} DB_SUFFIX=#{suffix}"
21-
fail unless system("#{rake} spec #{env}")
20+
raise unless system("#{rake} spec #{env}")
2221
end
2322
end
24-
25-
desc 'Run generator specs'
26-
RSpec::Core::RakeTask.new(:generators) do |task|
27-
task.pattern = 'spec/generators/*_spec.rb'
28-
end
2923
end
3024

3125
Rake::TestTask.new do |t|
@@ -35,13 +29,14 @@ Rake::TestTask.new do |t|
3529
t.verbose = true
3630
end
3731

38-
require 'github_changelog_generator/task'
39-
GitHubChangelogGenerator::RakeTask.new :changelog do |config|
40-
config.user = 'ClosureTree'
41-
config.project = 'closure_tree'
42-
config.issues = false
43-
config.future_release = '5.2.0'
44-
config.since_tag = 'v7.4.0'
32+
if RUBY_ENGINE == 'ruby'
33+
require 'github_changelog_generator/task'
34+
GitHubChangelogGenerator::RakeTask.new :changelog do |config|
35+
config.user = 'ClosureTree'
36+
config.project = 'closure_tree'
37+
config.issues = false
38+
config.future_release = '5.2.0'
39+
config.since_tag = 'v7.4.0'
40+
end
4541
end
46-
47-
task :default => "spec:all"
42+
task default: 'spec:all'

spec/spec_helper.rb

+6-3
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
# frozen_string_literal: true
22

3-
require 'simplecov'
3+
44
require 'database_cleaner'
55
require 'closure_tree/test/matcher'
66
require 'tmpdir'
@@ -13,8 +13,11 @@
1313

1414

1515
# Start Simplecov
16-
SimpleCov.start do
17-
add_filter 'spec/'
16+
if RUBY_ENGINE == 'ruby'
17+
require 'simplecov'
18+
SimpleCov.start do
19+
add_filter '/spec/'
20+
end
1821
end
1922

2023
ActiveRecord::Base.configurations = {

0 commit comments

Comments
 (0)