Ensure backtraces start at user code, not rspec-mocks code

Addresses #1592
rspec · Sep 17, 2024 · 3b45cd4 · 3b45cd4
1 parent 134b1ac
commit 3b45cd4
Showing 1 changed file with 10 additions and 0 deletions.
diff --git a/lib/rspec/mocks/error_generator.rb b/lib/rspec/mocks/error_generator.rb
@@ -328,10 +328,20 @@ def differ
       def __raise(message, backtrace_line=nil, source_id=nil)
         message = opts[:message] unless opts[:message].nil?
         exception = RSpec::Mocks::MockExpectationError.new(message)
+        filtered_backtrace!(exception)
         prepend_to_backtrace(exception, backtrace_line) if backtrace_line
         notify exception, :source_id => source_id
       end
 
+      def filtered_backtrace!(exception)
+        backtrace = exception.backtrace || caller
+        source = backtrace.rindex { |l| l =~ /#{File::SEPARATOR}rspec-mocks(-[^#{File::SEPARATOR}]+)?#{File::SEPARATOR}/ }
+        unless source.nil?
+          backtrace = backtrace[(source+1)..-1]
+        end
+        exception.set_backtrace(backtrace)
+      end
+
       if RSpec::Support::Ruby.jruby?
         def prepend_to_backtrace(exception, line)
           raise exception