File tree 3 files changed +16
-10
lines changed
3 files changed +16
-10
lines changed Original file line number Diff line number Diff line change @@ -181,5 +181,15 @@ def assertion_delegator
181
181
#
182
182
# @private
183
183
TestUnitAssertionAdapter = MinitestAssertionAdapter
184
+
185
+ # @private
186
+ module TaggedLoggingAdapter
187
+ require 'active_support/testing/tagged_logging'
188
+ include ActiveSupport ::Testing ::TaggedLogging
189
+
190
+ # Just a stub as TaggedLogging is calling `name`
191
+ def name
192
+ end
193
+ end
184
194
end
185
195
end
Original file line number Diff line number Diff line change @@ -12,11 +12,7 @@ module RailsExampleGroup
12
12
include RSpec ::Rails ::MinitestLifecycleAdapter
13
13
include RSpec ::Rails ::MinitestAssertionAdapter
14
14
include RSpec ::Rails ::FixtureSupport
15
-
16
- if ::Rails ::VERSION ::MAJOR >= 7
17
- require 'active_support/testing/tagged_logging'
18
- include ActiveSupport ::Testing ::TaggedLogging
19
- end
15
+ include RSpec ::Rails ::TaggedLoggingAdapter if ::Rails ::VERSION ::MAJOR >= 7
20
16
end
21
17
end
22
18
end
Original file line number Diff line number Diff line change 44
44
# This connection will do for database-independent bug reports
45
45
ActiveRecord ::Base . establish_connection ( adapter : "sqlite3" , database : ":memory:" )
46
46
47
+ class TestError < StandardError ; end
48
+
47
49
class TestJob < ActiveJob ::Base
48
- def perform ; end
50
+ def perform
51
+ raise TestError
52
+ end
49
53
end
50
54
51
- class TestError < StandardError ; end
52
-
53
55
RSpec . describe 'Foo' , type : :job do
54
56
include ::ActiveJob ::TestHelper
55
57
56
58
describe 'error raised in perform_enqueued_jobs with block' do
57
59
it 'raises the explicitly thrown error' do
58
- allow_any_instance_of ( TestJob ) . to receive ( :perform ) . and_raise ( TestError )
59
-
60
60
# Rails 6.1+ wraps unexpected errors in tests
61
61
expected_error = if Rails ::VERSION ::STRING . to_f >= 6.1
62
62
Minitest ::UnexpectedError . new ( TestError )
You can’t perform that action at this time.
0 commit comments