Always verify mocks at the end of each example.

...even if the example has already failed.

Previously, we did not have a good way to display
multiple failures for a single example, but we
do now, so it’s simpler and more consistent to
always verify, and to provide the user with multiple
exceptions if there are multiple.

Author: myronmarston

lib/rspec/core/example.rb

@@ -408,7 +408,7 @@ def run_after_example
       end
 
       def verify_mocks
-        @example_group_instance.verify_mocks_for_rspec if mocks_need_verification?
+        @example_group_instance.verify_mocks_for_rspec
       rescue Exception => e
         if pending?
           execution_result.pending_fixed = false
@@ -419,10 +419,6 @@ def verify_mocks
         end
       end
 
-      def mocks_need_verification?
-        exception.nil? || execution_result.pending_fixed?
-      end
-
       def assign_generated_description
         if metadata[:description].empty? && (description = generate_description)
           metadata[:description] = description

spec/rspec/core/example_spec.rb

@@ -723,32 +723,35 @@ def expect_pending_result(example)
       expect(ex).to fail_with(RSpec::Mocks::MockExpectationError)
     end
 
-    it 'skips mock verification if the example has already failed' do
-      ex = nil
-      boom = StandardError.new("boom")
-
-      RSpec.describe do
-        ex = example do
-          dbl = double
-          expect(dbl).to receive(:Foo)
-          raise boom
-        end
-      end.run
+    context "when the example has already failed" do
+      it 'appends the mock error to a `MultipleExceptionError` so the user can see both' do
+        ex = nil
+        boom = StandardError.new("boom")
+
+        RSpec.describe do
+          ex = example do
+            dbl = double
+            expect(dbl).to receive(:Foo)
+            raise boom
+          end
+        end.run
 
-      expect(ex.exception).to be boom
+        expect(ex.exception).to be_a(RSpec::Core::MultipleExceptionError)
+        expect(ex.exception.all_exceptions).to match [boom, an_instance_of(RSpec::Mocks::MockExpectationError)]
+      end
     end
 
     it 'allows `after(:example)` hooks to satisfy mock expectations, since examples are not complete until their `after` hooks run' do
       ex = nil
 
       RSpec.describe do
-        let(:dbl) { double }
+        let(:the_dbl) { double }
 
         ex = example do
-          expect(dbl).to receive(:foo)
+          expect(the_dbl).to receive(:foo)
         end
 
-        after { dbl.foo }
+        after { the_dbl.foo }
       end.run
 
       expect(ex).to pass