method_double.rb in rspec-mocks-2.99.0.beta1

- old
+ new

@@ -145,11 +145,11 @@
             |`#{@method_name}` method to your partial mock object (#{@object})
             |for `and_call_original`. The superclass's `#{@method_name}` is being
             |used instead; however, it may not work correctly when executed due
             |to the fact that `self` will be #{@object.superclass}, not #{@object}.
             |
-            |Called from: #{caller[2]}
+            |Called from: #{CallerFilter.first_non_rspec_line}
           WARNING
 
           @object.superclass.method(@method_name)
         end
       end
@@ -195,10 +195,10 @@
       end
 
       # @private
       def restore_original_visibility
         return unless object_singleton_class.method_defined?(@method_name) || object_singleton_class.private_method_defined?(@method_name)
-        object_singleton_class.class_eval(@original_visibility, __FILE__, __LINE__)
+        object_singleton_class.class_eval(@original_visibility, __FILE__, __LINE__ + 1)
       end
 
       # @private
       def verify
         expectations.each {|e| e.verify_messages_received}