diff --git a/sentry-sidekiq/spec/isolated/rails_spec.rb b/sentry-sidekiq/spec/isolated/rails_spec.rb index 1a64c376b..7fad22de8 100644 --- a/sentry-sidekiq/spec/isolated/rails_spec.rb +++ b/sentry-sidekiq/spec/isolated/rails_spec.rb @@ -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 ' + Rails.logger = Logger.new($stdout) +end + class TestApp < Rails::Application end diff --git a/sentry-sidekiq/spec/spec_helper.rb b/sentry-sidekiq/spec/spec_helper.rb index 35454aac9..5ac2349ac 100644 --- a/sentry-sidekiq/spec/spec_helper.rb +++ b/sentry-sidekiq/spec/spec_helper.rb @@ -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