|
2 | 2 |
|
3 | 3 | require "spec_helper" |
4 | 4 |
|
5 | | -if Gem::Version.new(Rails.version) >= Gem::Version.new("7.1") |
| 5 | +if RAILS_VERSION >= 7.1 |
6 | 6 | require "solid_queue" |
7 | | -end |
8 | | - |
9 | | -RSpec.describe "Sentry + ActiveJob on SolidQueue", skip: Gem::Version.new(Rails.version) < Gem::Version.new("7.1") do |
10 | | - include ActiveSupport::Testing::TimeHelpers |
11 | | - include_context "active_job backend harness", adapter: :solid_queue |
12 | 7 |
|
13 | | - def boot_adapter(_adapter) |
14 | | - Sentry::Rails::Test::Application.load_queue_schema |
15 | | - end |
| 8 | + RSpec.describe "Sentry + ActiveJob on SolidQueue" do |
| 9 | + include ActiveSupport::Testing::TimeHelpers |
| 10 | + include_context "active_job backend harness", adapter: :solid_queue |
16 | 11 |
|
17 | | - def reset_adapter(_adapter) |
18 | | - [ |
19 | | - SolidQueue::ReadyExecution, |
20 | | - SolidQueue::ClaimedExecution, |
21 | | - SolidQueue::FailedExecution, |
22 | | - SolidQueue::BlockedExecution, |
23 | | - SolidQueue::ScheduledExecution, |
24 | | - SolidQueue::RecurringExecution, |
25 | | - SolidQueue::Process, |
26 | | - SolidQueue::Job |
27 | | - ].each(&:delete_all) |
28 | | - end |
| 12 | + def boot_adapter(_adapter) |
| 13 | + Sentry::Rails::Test::Application.load_queue_schema |
| 14 | + end |
29 | 15 |
|
30 | | - def drain(at: nil) |
31 | | - process = SolidQueue::Process.register( |
32 | | - kind: "Worker", |
33 | | - pid: ::Process.pid, |
34 | | - name: "spec-#{SecureRandom.hex(4)}" |
35 | | - ) |
| 16 | + def reset_adapter(_adapter) |
| 17 | + [ |
| 18 | + SolidQueue::ReadyExecution, |
| 19 | + SolidQueue::ClaimedExecution, |
| 20 | + SolidQueue::FailedExecution, |
| 21 | + SolidQueue::BlockedExecution, |
| 22 | + SolidQueue::ScheduledExecution, |
| 23 | + SolidQueue::RecurringExecution, |
| 24 | + SolidQueue::Process, |
| 25 | + SolidQueue::Job |
| 26 | + ].each(&:delete_all) |
| 27 | + end |
36 | 28 |
|
37 | | - travel_to(at || Time.current) do |
38 | | - SolidQueue::ScheduledExecution.dispatch_next_batch(100) |
39 | | - SolidQueue::ReadyExecution.claim("*", 100, process.id).each(&:perform) |
| 29 | + def drain(at: nil) |
| 30 | + process = SolidQueue::Process.register( |
| 31 | + kind: "Worker", |
| 32 | + pid: ::Process.pid, |
| 33 | + name: "spec-#{SecureRandom.hex(4)}" |
| 34 | + ) |
| 35 | + |
| 36 | + travel_to(at || Time.current) do |
| 37 | + SolidQueue::ScheduledExecution.dispatch_next_batch(100) |
| 38 | + SolidQueue::ReadyExecution.claim("*", 100, process.id).each(&:perform) |
| 39 | + end |
40 | 40 | end |
41 | | - end |
42 | 41 |
|
43 | | - it_behaves_like "a Sentry-instrumented ActiveJob backend" |
| 42 | + it_behaves_like "a Sentry-instrumented ActiveJob backend" |
| 43 | + end |
44 | 44 | end |
0 commit comments