Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Chore: Sidekiq 6.5 compatibility #715

Merged
merged 1 commit into from
Jun 9, 2022
Merged

Chore: Sidekiq 6.5 compatibility #715

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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 Appraisals
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,3 +35,7 @@ end
appraise "sidekiq-6.4" do
gem "sidekiq", "~> 6.4.0"
end

appraise "sidekiq-6.5" do
gem "sidekiq", "~> 6.5.0"
end
27 changes: 27 additions & 0 deletions gemfiles/sidekiq_6.5.gemfile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,27 @@
# This file was generated by Appraisal

source "https://rubygems.org"

gem "appraisal"
gem "gem-release"
gem "github-markup"
gem "rack-test"
gem "rake", "13.0.3"
gem "reek", ">= 5.3"
gem "rspec"
gem "rspec-benchmark"
gem "rspec-html-matchers"
gem "rspec-its"
gem "rubocop-mhenrixon"
gem "simplecov-sublime", ">= 0.21.2", require: false
gem "sinatra"
gem "timecop"
gem "yard"
gem "sidekiq", "~> 6.5.0"

platforms :mri do
gem "concurrent-ruby-ext"
gem "hiredis"
end

gemspec path: "../"
2 changes: 2 additions & 0 deletions lib/sidekiq_unique_jobs/middleware/client.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,8 @@ module Middleware
#
# @author Mikael Henriksson <mikael@mhenrixon.com>
class Client
include Sidekiq::ClientMiddleware if defined?(Sidekiq::ClientMiddleware)

# prepend "SidekiqUniqueJobs::Middleware"
# @!parse prepends SidekiqUniqueJobs::Middleware
prepend SidekiqUniqueJobs::Middleware
Expand Down
2 changes: 2 additions & 0 deletions lib/sidekiq_unique_jobs/middleware/server.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,8 @@ module Middleware
#
# @author Mikael Henriksson <mikael@mhenrixon.com>
class Server
include Sidekiq::ClientMiddleware if defined?(Sidekiq::ServerMiddleware)
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@mhenrixon Shouldn't this include ServerMiddleware?

Copy link
Owner Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Fixed it now


# prepend "SidekiqUniqueJobs::Middleware"
# @!parse prepends SidekiqUniqueJobs::Middleware
prepend SidekiqUniqueJobs::Middleware
Expand Down
1 change: 0 additions & 1 deletion spec/spec_helper.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,6 @@

require "sidekiq"
require "sidekiq/api"
require "sidekiq/util"
require "sidekiq-unique-jobs"
require "timecop"
require "sidekiq_unique_jobs/testing"
Expand Down