Skip to content

fix(sidekiq): fix failing integration spec #2809

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

Merged
solnic merged 2 commits into from
Dec 10, 2025
Merged

fix(sidekiq): fix failing integration spec #2809

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
4e0f7d1
fix(sidekiq): fix failing integration spec
solnic Dec 10, 2025
48f223a
chore(sidekiq): establish SIDEKIQ_VERSION const
solnic Dec 10, 2025
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
8 changes: 8 additions & 0 deletions sentry-sidekiq/spec/isolated/rails_spec.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,14 @@
# which checks if Railtie is defined to properly set things up
require_relative "../spec_helper"

# This is needed to prevent Sidekiq 6.5 crash
if SIDEKIQ_VERSION >= Gem::Version.new("6.5") && SIDEKIQ_VERSION < Gem::Version.new("7.0")
# NoMethodError:
# undefined method 'broadcast' for class ActiveSupport::Logger
# /workspace/sentry/vendor/gems/3.4.5/gems/sidekiq-6.5.7/lib/sidekiq/rails.rb:46:in 'block (2 levels) in <class:Rails>'
Rails.logger = Logger.new($stdout)
end

class TestApp < Rails::Application
end

Expand Down
8 changes: 5 additions & 3 deletions sentry-sidekiq/spec/spec_helper.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,9 +9,11 @@
# this enables sidekiq's server mode
require "sidekiq/cli"

MIN_SIDEKIQ_6 = Gem::Version.new(Sidekiq::VERSION) >= Gem::Version.new("6.0")
WITH_SIDEKIQ_7 = Gem::Version.new(Sidekiq::VERSION) >= Gem::Version.new("7.0")
WITH_SIDEKIQ_8 = Gem::Version.new(Sidekiq::VERSION) >= Gem::Version.new("8.0.0")
SIDEKIQ_VERSION = Gem::Version.new(Sidekiq::VERSION)

MIN_SIDEKIQ_6 = SIDEKIQ_VERSION >= Gem::Version.new("6.0")
WITH_SIDEKIQ_7 = SIDEKIQ_VERSION >= Gem::Version.new("7.0")
WITH_SIDEKIQ_8 = SIDEKIQ_VERSION >= Gem::Version.new("8.0.0")
WITH_SIDEKIQ_6 = MIN_SIDEKIQ_6 && !WITH_SIDEKIQ_7

require "sidekiq/embedded" if WITH_SIDEKIQ_7
Expand Down
Loading