Retain spy function names and fix spy.named(name) (#1987)

sinonjs · Mar 4, 2019 · 19b3fc7 · 19b3fc7
1 parent 3275d18
commit 19b3fc7
Show file tree

Hide file tree

Showing 3 changed files with 38 additions and 2 deletions.
diff --git a/lib/sinon/spy.js b/lib/sinon/spy.js
@@ -152,6 +152,12 @@ function createProxy(func, proxyLength) {
             return p.invoke(func, this, slice(arguments));
         };
     }
+    var nameDescriptor = Object.getOwnPropertyDescriptor(func, "name");
+    if (nameDescriptor && nameDescriptor.configurable) {
+        // IE 11 functions don't have a name.
+        // Safari 9 has names that are not configurable.
+        Object.defineProperty(p, "name", nameDescriptor);
+    }
     extend.nonEnum(p, {
         isSinonProxy: true,
 
@@ -332,6 +338,13 @@ var spyApi = {
 
     named: function named(name) {
         this.displayName = name;
+        var nameDescriptor = Object.getOwnPropertyDescriptor(this, "name");
+        if (nameDescriptor && nameDescriptor.configurable) {
+            // IE 11 functions don't have a name.
+            // Safari 9 has names that are not configurable.
+            nameDescriptor.value = name;
+            Object.defineProperty(this, "name", nameDescriptor);
+        }
         return this;
     },
 

diff --git a/test/issues/issues-test.js b/test/issues/issues-test.js
@@ -111,7 +111,8 @@ describe("issues", function() {
         // IE 11 does not support the function name property
         if (bob.name) {
             it("should not rename spies", function() {
-                var expectedName = "proxy";
+                var nameDescriptor = Object.getOwnPropertyDescriptor(bob, "name");
+                var expectedName = nameDescriptor && nameDescriptor.configurable ? "bob" : "proxy";
                 var spy = sinon.spy(bob);
 
                 assert.equals(spy.name, expectedName);

diff --git a/test/spy-test.js b/test/spy-test.js
@@ -207,6 +207,16 @@ function spyNeverCalledTests(method) {
     };
 }
 
+function verifyFunctionName(func, expectedName) {
+    var descriptor = Object.getOwnPropertyDescriptor(func, "name");
+    if (descriptor && descriptor.configurable) {
+        // IE 11 functions don't have a name.
+        // Safari 9 has names that are not configurable.
+        assert.equals(descriptor.value, expectedName);
+        assert.equals(func.name, expectedName);
+    }
+}
+
 describe("spy", function() {
     it("does not throw if called without function", function() {
         refute.exception(function() {
@@ -423,10 +433,11 @@ describe("spy", function() {
     });
 
     describe(".named", function() {
-        it("sets displayName", function() {
+        it("sets name and displayName", function() {
             var spy = createSpy();
             var retval = spy.named("beep");
             assert.equals(spy.displayName, "beep");
+            verifyFunctionName(spy, "beep");
             assert.same(spy, retval);
         });
     });
@@ -506,6 +517,17 @@ describe("spy", function() {
             assert.exception(spy, err);
         });
 
+        it("retains function name", function() {
+            function test() {
+                return;
+            }
+
+            var spy = createSpy.create(test);
+
+            assert.equals(spy.displayName, "test");
+            verifyFunctionName(spy, "test");
+        });
+
         it("retains function length 0", function() {
             var spy = createSpy.create(function() {
                 return;