Alias spy.reset to spy.resetHistory

docs/release-source/release/spies.md

@@ -390,10 +390,13 @@ Array of return values, `spy.returnValues[0]` is the return value of the first c
 If the call did not explicitly return a value, the value at the call's location in `.returnValues` will be `undefined`.
 
 
-#### `spy.reset()`
+#### `spy.resetHistory()`
 
 Resets the state of a spy.
 
+#### `spy.reset();`
+
+Alias for `spy.resetHistory();`
 
 #### `spy.restore()`
 

lib/sinon/spy.js

@@ -100,7 +100,7 @@ var uuid = 0;
 var spyApi = {
     formatters: require("./spy-formatters"),
 
-    reset: function () {
+    resetHistory: function () {
         if (this.invoking) {
             var err = new Error("Cannot reset Sinon function while invoking it. " +
                                 "Move the call to .reset outside of the callback.");
@@ -413,6 +413,8 @@ function delegateToCalls(method, matchAny, actual, notCalled) {
     };
 }
 
+spyApi.reset = spyApi.resetHistory;
+
 delegateToCalls("calledOn", true);
 delegateToCalls("alwaysCalledOn", false, "calledOn");
 delegateToCalls("calledWith", true);

test/spy-test.js

@@ -2539,16 +2539,24 @@ describe("spy", function () {
     });
 
     describe(".reset", function () {
+        it("is alias for resetHistory", function () {
+            var spy = createSpy();
+
+            assert.same(spy.reset, spy.resetHistory);
+        });
+    });
+
+    describe(".resetHistory", function () {
         it("return same object", function () {
             var spy = createSpy();
-            var reset = spy.reset();
+            var reset = spy.resetHistory();
 
             assert(reset === spy);
         });
 
         it("throws if called during spy invocation", function () {
             var spy = createSpy(function () {
-                spy.reset();
+                spy.resetHistory();
             });
 
             assert.exception(spy, "InvalidResetException");