Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 4 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,4 +1,8 @@
# Change Log

## 2.4.1
- Fix crash when worker does not define #perform method

## 2.4.0
- Switch rspec to test for mutiple sidekiq version
- Support both sidekiq 8 and 7
Expand Down
2 changes: 1 addition & 1 deletion lib/sidekiq_adhoc_job/utils/class_inspector.rb
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,7 @@ def has_rest_parameter?(method_name)
end

def klass_method(method)
return method if method.owner == klass_name
return method if method.owner == klass_name || !method.super_method

klass_method(method.super_method)
end
Expand Down
2 changes: 1 addition & 1 deletion lib/sidekiq_adhoc_job/version.rb
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
# frozen_string_literal: true

module SidekiqAdhocJob
VERSION = '2.4.0'
VERSION = '2.4.1'
end
47 changes: 33 additions & 14 deletions spec/sidekiq_adhoc_job/utils/class_inspector_spec.rb
Original file line number Diff line number Diff line change
Expand Up @@ -9,12 +9,12 @@

describe '#parameters' do
it do
expect(inspector.parameters(:perform)).to eq({
key: [:dryrun],
keyreq: [:type],
opt: %i[retry_job retries interval name options],
req: %i[id overwrite]
})
expect(inspector.parameters(:perform)).to eq(
key: [:dryrun],
keyreq: [:type],
opt: %i[retry_job retries interval name options],
req: %i[id overwrite]
)
end
end

Expand All @@ -23,10 +23,10 @@

describe '#parameters' do
it 'returns the parameters of the original method' do
expect(inspector.parameters(:perform)).to eq({
opt: %i[retry_job retries interval],
req: %i[id overwrite]
})
expect(inspector.parameters(:perform)).to eq(
opt: %i[retry_job retries interval],
req: %i[id overwrite]
)
end
end
end
Expand All @@ -36,10 +36,29 @@

describe '#parameters' do
it 'returns the parameters of the method on the target class' do
expect(inspector.parameters(:perform)).to eq({
opt: %i[retry_job retries interval],
req: %i[id overwrite]
})
expect(inspector.parameters(:perform)).to eq(
opt: %i[retry_job retries interval],
req: %i[id overwrite]
)
end
end
end

context "with an inherited class without redefining method" do
before do
stub_const("TempWorker", Class.new(SidekiqAdhocJob::Test::DummyWorker))
end

let(:klass) { TempWorker }

describe "#parameters" do
it "returns the parameters of the parent method" do
expect(inspector.parameters(:perform)).to eq(
key: [:dryrun],
keyreq: [:type],
opt: [:retry_job, :retries, :interval, :name, :options],
req: [:id, :overwrite]
)
end
end
end
Expand Down