Skip to content

Commit 7d10c02

Browse files
authored
fix(sidekiq): fix failing integration spec (#2809)
* fix(sidekiq): fix failing integration spec * chore(sidekiq): establish SIDEKIQ_VERSION const
1 parent d45e53f commit 7d10c02

File tree

2 files changed

+13
-3
lines changed

2 files changed

+13
-3
lines changed

sentry-sidekiq/spec/isolated/rails_spec.rb

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,14 @@
1212
# which checks if Railtie is defined to properly set things up
1313
require_relative "../spec_helper"
1414

15+
# This is needed to prevent Sidekiq 6.5 crash
16+
if SIDEKIQ_VERSION >= Gem::Version.new("6.5") && SIDEKIQ_VERSION < Gem::Version.new("7.0")
17+
# NoMethodError:
18+
# undefined method 'broadcast' for class ActiveSupport::Logger
19+
# /workspace/sentry/vendor/gems/3.4.5/gems/sidekiq-6.5.7/lib/sidekiq/rails.rb:46:in 'block (2 levels) in <class:Rails>'
20+
Rails.logger = Logger.new($stdout)
21+
end
22+
1523
class TestApp < Rails::Application
1624
end
1725

sentry-sidekiq/spec/spec_helper.rb

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -9,9 +9,11 @@
99
# this enables sidekiq's server mode
1010
require "sidekiq/cli"
1111

12-
MIN_SIDEKIQ_6 = Gem::Version.new(Sidekiq::VERSION) >= Gem::Version.new("6.0")
13-
WITH_SIDEKIQ_7 = Gem::Version.new(Sidekiq::VERSION) >= Gem::Version.new("7.0")
14-
WITH_SIDEKIQ_8 = Gem::Version.new(Sidekiq::VERSION) >= Gem::Version.new("8.0.0")
12+
SIDEKIQ_VERSION = Gem::Version.new(Sidekiq::VERSION)
13+
14+
MIN_SIDEKIQ_6 = SIDEKIQ_VERSION >= Gem::Version.new("6.0")
15+
WITH_SIDEKIQ_7 = SIDEKIQ_VERSION >= Gem::Version.new("7.0")
16+
WITH_SIDEKIQ_8 = SIDEKIQ_VERSION >= Gem::Version.new("8.0.0")
1517
WITH_SIDEKIQ_6 = MIN_SIDEKIQ_6 && !WITH_SIDEKIQ_7
1618

1719
require "sidekiq/embedded" if WITH_SIDEKIQ_7

0 commit comments

Comments
 (0)