File tree Expand file tree Collapse file tree 6 files changed +8
-9
lines changed Expand file tree Collapse file tree 6 files changed +8
-9
lines changed Original file line number Diff line number Diff line change @@ -97,8 +97,8 @@ def total
97
97
if mocked_with_mocha?
98
98
Sidekiq ::Batch . stubs ( :new ) { RSpec ::Sidekiq ::NullBatch . new }
99
99
else
100
- allow ( Sidekiq ::Batch ) . to receive ( :new ) { RSpec ::Sidekiq ::NullBatch . new }
101
- allow ( Sidekiq ::Batch ::Status ) . to receive ( :new ) { RSpec ::Sidekiq ::NullStatus . new }
100
+ allow ( Sidekiq ::Batch ) . to receive ( :new ) { RSpec ::Sidekiq ::NullBatch . new }
101
+ allow ( Sidekiq ::Batch ::Status ) . to receive ( :new ) { RSpec ::Sidekiq ::NullStatus . new }
102
102
end
103
103
end
104
104
end
Original file line number Diff line number Diff line change @@ -32,4 +32,4 @@ def matches?(job)
32
32
end
33
33
end
34
34
end
35
- end
35
+ end
Original file line number Diff line number Diff line change @@ -25,10 +25,10 @@ def description
25
25
26
26
def failure_message
27
27
if !interval_matches? && @expected_interval
28
- "expected #{ @klass } to be unique for #{ @expected_interval } seconds, " \
28
+ "expected #{ @klass } to be unique for #{ @expected_interval } seconds, " \
29
29
"but its interval was #{ actual_interval } seconds"
30
30
elsif !expiration_matches?
31
- "expected #{ @klass } to be unique until #{ @expected_expiration } , " \
31
+ "expected #{ @klass } to be unique until #{ @expected_expiration } , " \
32
32
"but its unique_until was #{ actual_expiration || 'not specified' } "
33
33
else
34
34
"expected #{ @klass } to be unique in the queue"
@@ -60,7 +60,7 @@ def interval_matches?
60
60
end
61
61
62
62
def expiration_matches?
63
- @expected_expiration . nil? || actual_expiration == @expected_expiration
63
+ @expected_expiration . nil? || actual_expiration == @expected_expiration
64
64
end
65
65
66
66
def failure_message_when_negated
Original file line number Diff line number Diff line change @@ -25,7 +25,7 @@ class Status
25
25
end
26
26
27
27
describe 'NullStatus' do
28
- let ( :batch ) { Sidekiq ::Batch . new }
28
+ let ( :batch ) { Sidekiq ::Batch . new }
29
29
30
30
subject { batch . status }
31
31
Original file line number Diff line number Diff line change 28
28
ActiveJob ::Base . queue_adapter = :sidekiq
29
29
ActiveJob ::Base . logger . level = :warn
30
30
31
-
32
31
if config . sidekiq_gte_5 && !config . sidekiq_gte_7
33
32
require "active_record"
34
33
ActiveSupport . run_load_hooks ( :active_record , ActiveRecord ::Base )
Original file line number Diff line number Diff line change 1
1
# frozen_string_literal: true
2
2
3
3
class TestActionMailer < ActionMailer ::Base
4
- def testmail ( resource = nil )
4
+ def testmail ( resource = nil )
5
5
@resource = resource
6
6
mail ( to :
'[email protected] ' , subject :
'testmail' )
7
7
end
You can’t perform that action at this time.
0 commit comments