File tree Expand file tree Collapse file tree 2 files changed +6
-2
lines changed Expand file tree Collapse file tree 2 files changed +6
-2
lines changed Original file line number Diff line number Diff line change @@ -38,6 +38,7 @@ Bug Fixes:
38
38
(Takumi Shotoku, #2188 )
39
39
* Prevent a ` WrongScopeError ` being thrown during loading fixtures on Rails
40
40
6.1 development version. (Edouard Chin, #2215 )
41
+ * Fix Mocha mocking support with ` should ` . (Phil Pirozhkov, #2256 )
41
42
42
43
Breaking Changes:
43
44
Original file line number Diff line number Diff line change 1
- require "rspec/mocks"
1
+ # We require the minimum amount of rspec-mocks possible to avoid
2
+ # conflicts with other mocking frameworks.
3
+ # See: https://github.com/rspec/rspec-rails/issues/2252
4
+ require "rspec/mocks/argument_matchers"
2
5
require "rspec/rails/matchers/active_job"
3
6
4
7
module RSpec
@@ -11,7 +14,7 @@ module Matchers
11
14
class HaveEnqueuedMail < ActiveJob ::HaveEnqueuedJob
12
15
MAILER_JOB_METHOD = 'deliver_now' . freeze
13
16
14
- include RSpec ::Mocks ::ExampleMethods
17
+ include RSpec ::Mocks ::ArgumentMatchers
15
18
16
19
def initialize ( mailer_class , method_name )
17
20
super ( nil )
You can’t perform that action at this time.
0 commit comments