Skip to content

Commit

Permalink
Add railties to use zeitwerk
Browse files Browse the repository at this point in the history
specs about autoload needs zeitwerk which raitlies depends on

ref https://github.com/willnet/delayed_job/runs/3856963931?check_suite_focus=true
  • Loading branch information
willnet committed Dec 13, 2021
1 parent 56ae068 commit 069b642
Show file tree
Hide file tree
Showing 3 changed files with 18 additions and 17 deletions.
5 changes: 4 additions & 1 deletion Gemfile
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@ platforms :jruby do
elsif ENV['RAILS_VERSION']
gem 'railties', "~> #{ENV['RAILS_VERSION']}"
else
gem 'railties', ['>= 3.0', '< 7.0']
gem 'railties', ['>= 3.0', '< 7.1']
end
end

Expand All @@ -49,12 +49,15 @@ group :test do
if ENV['RAILS_VERSION'] == 'edge'
gem 'actionmailer', :github => 'rails/rails'
gem 'activerecord', :github => 'rails/rails'
gem 'railties', :github => 'rails/rails'
elsif ENV['RAILS_VERSION']
gem 'actionmailer', "~> #{ENV['RAILS_VERSION']}"
gem 'activerecord', "~> #{ENV['RAILS_VERSION']}"
gem 'railties', "~> #{ENV['RAILS_VERSION']}"
else
gem 'actionmailer', ['>= 3.0', '< 7.1']
gem 'activerecord', ['>= 3.0', '< 7.1']
gem 'railties', ['>= 3.0', '< 7.1']
end

gem 'rspec', '>= 3'
Expand Down
18 changes: 10 additions & 8 deletions spec/delayed/command_spec.rb
Original file line number Diff line number Diff line change
Expand Up @@ -159,16 +159,18 @@
describe 'running worker pools defined by multiple --pool arguments' do
it 'should run the correct worker processes' do
command = Delayed::Command.new(['--pool=*:1', '--pool=test_queue:4', '--pool=mailers,misc:2'])
expect(FileUtils).to receive(:mkdir_p).with('./tmp/pids').once
pid_dir = File.expand_path('./tmp/pids')
log_dir = File.expand_path('./log')
expect(FileUtils).to receive(:mkdir_p).with(pid_dir).once

[
['delayed_job.0', {:quiet => true, :pid_dir => './tmp/pids', :log_dir => './log', :queues => []}],
['delayed_job.1', {:quiet => true, :pid_dir => './tmp/pids', :log_dir => './log', :queues => ['test_queue']}],
['delayed_job.2', {:quiet => true, :pid_dir => './tmp/pids', :log_dir => './log', :queues => ['test_queue']}],
['delayed_job.3', {:quiet => true, :pid_dir => './tmp/pids', :log_dir => './log', :queues => ['test_queue']}],
['delayed_job.4', {:quiet => true, :pid_dir => './tmp/pids', :log_dir => './log', :queues => ['test_queue']}],
['delayed_job.5', {:quiet => true, :pid_dir => './tmp/pids', :log_dir => './log', :queues => %w[mailers misc]}],
['delayed_job.6', {:quiet => true, :pid_dir => './tmp/pids', :log_dir => './log', :queues => %w[mailers misc]}]
['delayed_job.0', {:quiet => true, :pid_dir => pid_dir, :log_dir => log_dir, :queues => []}],
['delayed_job.1', {:quiet => true, :pid_dir => pid_dir, :log_dir => log_dir, :queues => ['test_queue']}],
['delayed_job.2', {:quiet => true, :pid_dir => pid_dir, :log_dir => log_dir, :queues => ['test_queue']}],
['delayed_job.3', {:quiet => true, :pid_dir => pid_dir, :log_dir => log_dir, :queues => ['test_queue']}],
['delayed_job.4', {:quiet => true, :pid_dir => pid_dir, :log_dir => log_dir, :queues => ['test_queue']}],
['delayed_job.5', {:quiet => true, :pid_dir => pid_dir, :log_dir => log_dir, :queues => %w[mailers misc]}],
['delayed_job.6', {:quiet => true, :pid_dir => pid_dir, :log_dir => log_dir, :queues => %w[mailers misc]}]
].each do |args|
expect(command).to receive(:run_process).with(*args).once
end
Expand Down
12 changes: 4 additions & 8 deletions spec/helper.rb
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,7 @@

require 'action_mailer'
require 'active_record'
require 'rails'

require 'delayed_job'
require 'delayed/backend/shared_spec'
Expand All @@ -36,14 +37,7 @@
end
ENV['RAILS_ENV'] = 'test'

# Trigger AR to initialize
ActiveRecord::Base # rubocop:disable Void

module Rails
def self.root
'.'
end
end
FakeApp = Class.new(Rails::Application)

Delayed::Worker.backend = :test

Expand Down Expand Up @@ -76,6 +70,8 @@ def whatever(n, _)
handle_asynchronously :whatever
end

FakeApp.initialize!

RSpec.configure do |config|
config.after(:each) do
Delayed::Worker.reset
Expand Down

0 comments on commit 069b642

Please sign in to comment.