From df265924ae8a42f6503b263bc6df702b42018050 Mon Sep 17 00:00:00 2001
From: Ben Kucera <14625260+Bkucera@users.noreply.github.com>
Date: Mon, 10 Aug 2020 13:30:56 -0400
Subject: [PATCH] fix after merge: use most recent attempt for before/after
 hooks

---
 packages/driver/src/cypress/runner.js | 13 +++++++++----
 1 file changed, 9 insertions(+), 4 deletions(-)

diff --git a/packages/driver/src/cypress/runner.js b/packages/driver/src/cypress/runner.js
index 5776b1c8dec2..2f0178aa5919 100644
--- a/packages/driver/src/cypress/runner.js
+++ b/packages/driver/src/cypress/runner.js
@@ -859,13 +859,18 @@ const create = (specWindow, mocha, Cypress, cy) => {
 
     const suite = hook.parent
 
+    let foundTest
+
     if (hook.hookName === 'after all') {
-      return findLastTestInSuite(suite, isNotAlreadyRunTest)
+      foundTest = findLastTestInSuite(suite, isNotAlreadyRunTest)
+    } else if (hook.hookName === 'before all') {
+      foundTest = findTestInSuite(suite, isNotAlreadyRunTest)
     }
 
-    if (hook.hookName === 'before all') {
-      return findTestInSuite(suite, isNotAlreadyRunTest)
-    }
+    // if test has retried, we getTestById will give us the last attempt
+    foundTest = foundTest && getTestById(foundTest.id)
+
+    return foundTest
   }
 
   const onScriptError = (err) => {