Skip to content

Commit 1b10f5c

Browse files
authored
Merge pull request rails#47544 from skipkayhil/fix-delayed-job-tests-always-running
Fix all adapters running delayed_job_adapter_test
2 parents bde99e5 + 286f2f0 commit 1b10f5c

File tree

1 file changed

+6
-2
lines changed

1 file changed

+6
-2
lines changed

activejob/Rakefile

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -36,15 +36,19 @@ namespace :test do
3636
Rake::TestTask.new(adapter => "test:env:#{adapter}") do |t|
3737
t.description = "Run adapter tests for #{adapter}"
3838
t.libs << "test"
39-
t.test_files = FileList["test/cases/**/*_test.rb"]
39+
t.test_files = FileList["test/cases/**/*_test.rb"].reject {
40+
|x| x.include?("delayed_job") && adapter != "delayed_job"
41+
}
4042
t.verbose = true
4143
t.warning = true
4244
t.ruby_opts = ["--dev"] if defined?(JRUBY_VERSION)
4345
end
4446

4547
namespace :isolated do
4648
task adapter => "test:env:#{adapter}" do
47-
Dir.glob("#{__dir__}/test/cases/**/*_test.rb").all? do |file|
49+
Dir.glob("#{__dir__}/test/cases/**/*_test.rb").reject {
50+
|x| x.include?("delayed_job") && adapter != "delayed_job"
51+
}.all? do |file|
4852
sh(Gem.ruby, "-w", "-I#{__dir__}/lib", "-I#{__dir__}/test", file)
4953
end || raise("Failures")
5054
end

0 commit comments

Comments
 (0)