From c2eaf62bb7de9a8b6dc275b3bda0031838d793fd Mon Sep 17 00:00:00 2001
From: Mihail Bodrov <bodrovmiha@yandex.ru>
Date: Tue, 23 Apr 2019 02:35:23 +0300
Subject: [PATCH 1/2] Fix getting function name for rare cases

---
 .../src/__tests__/asymmetricMatchers.test.js  | 41 +++++++++++++++++++
 packages/expect/src/jasmineUtils.ts           |  6 ++-
 2 files changed, 46 insertions(+), 1 deletion(-)

diff --git a/packages/expect/src/__tests__/asymmetricMatchers.test.js b/packages/expect/src/__tests__/asymmetricMatchers.test.js
index 9b1d55074cad..f0166e38d04b 100644
--- a/packages/expect/src/__tests__/asymmetricMatchers.test.js
+++ b/packages/expect/src/__tests__/asymmetricMatchers.test.js
@@ -42,6 +42,47 @@ test('Any.toAsymmetricMatcher()', () => {
   jestExpect(any(Number).toAsymmetricMatcher()).toBe('Any<Number>');
 });
 
+test('Any.toAsymmetricMatcher() with function name', () => {
+  [
+    ['someFunc', function someFunc() {}],
+    ['$someFunc', function $someFunc() {}],
+    [
+      '$someFunc2',
+      (function() {
+        function $someFunc2() {}
+        Object.defineProperty($someFunc2, 'name', {value: ''});
+        return $someFunc2;
+      })(),
+    ],
+    [
+      '$someAsyncFunc',
+      (function() {
+        async function $someAsyncFunc() {}
+        Object.defineProperty($someAsyncFunc, 'name', {value: ''});
+        return $someAsyncFunc;
+      })(),
+    ],
+    [
+      '$someGeneratorFunc',
+      (function() {
+        function* $someGeneratorFunc() {}
+        Object.defineProperty($someGeneratorFunc, 'name', {value: ''});
+        return $someGeneratorFunc;
+      })(),
+    ],
+    [
+      '$someFuncWithFakeToString',
+      (function() {
+        function $someFuncWithFakeToString() {}
+        $someFuncWithFakeToString.toString = () => 'Fake to string';
+        return $someFuncWithFakeToString;
+      })(),
+    ],
+  ].forEach(([name, fn]: [string, any]) => {
+    jestExpect(any(fn).toAsymmetricMatcher()).toBe(`Any<${name}>`);
+  });
+});
+
 test('Any throws when called with empty constructor', () => {
   jestExpect(() => any()).toThrow();
 });
diff --git a/packages/expect/src/jasmineUtils.ts b/packages/expect/src/jasmineUtils.ts
index 8c98416fbd66..3bf94b3cc3c8 100644
--- a/packages/expect/src/jasmineUtils.ts
+++ b/packages/expect/src/jasmineUtils.ts
@@ -37,6 +37,8 @@ export function equals(
   return eq(a, b, [], [], customTesters, strictCheck ? hasKey : hasDefinedKey);
 }
 
+const functionToString = Function.prototype.toString;
+
 function isAsymmetric(obj: any) {
   return !!obj && isA('Function', obj.asymmetricMatch);
 }
@@ -258,7 +260,9 @@ export function fnNameFor(func: Function) {
     return func.name;
   }
 
-  const matches = func.toString().match(/^\s*function\s*(\w*)\s*\(/);
+  const matches = functionToString
+    .call(func)
+    .match(/^(?:async)?\s*function\s*\*?\s*([\w$]+)\s*\(/);
   return matches ? matches[1] : '<anonymous>';
 }
 

From f6060c55de530fab75bfec7ac6911d9fb2e6209d Mon Sep 17 00:00:00 2001
From: Simen Bekkhus <sbekkhus91@gmail.com>
Date: Tue, 23 Apr 2019 09:54:04 +0200
Subject: [PATCH 2/2] Update CHANGELOG.md

---
 CHANGELOG.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index b4c5c7c9a190..2ae290315327 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -21,6 +21,7 @@
 - `[jest-jasmine2]` Fix describe return value warning being shown if the describe function throws ([#8335](https://github.com/facebook/jest/pull/8335))
 - `[jest-environment-jsdom]` Re-declare global prototype of JSDOMEnvironment ([#8352](https://github.com/facebook/jest/pull/8352))
 - `[jest-snapshot]` Handle arrays when merging snapshots ([#7089](https://github.com/facebook/jest/pull/7089))
+- `[expect]` Extract names of async and generator functions ([#8362](https://github.com/facebook/jest/pull/8362))
 
 ### Chore & Maintenance