refactor: extract case run attempt into a method (#2175)

Co-authored-by: David Goss <[email protected]>
cucumber · Nov 12, 2022 · 1d5d345 · 1d5d345
1 parent 4ea3227
commit 1d5d345
Showing 1 changed file with 66 additions and 52 deletions.
diff --git a/src/runtime/test_case_runner.ts b/src/runtime/test_case_runner.ts
@@ -181,59 +181,12 @@ export default class TestCaseRunner {
   async run(): Promise<messages.TestStepResultStatus> {
     for (let attempt = 0; attempt < this.maxAttempts; attempt++) {
       const moreAttemptsRemaining = attempt + 1 < this.maxAttempts
-      this.currentTestCaseStartedId = this.newId()
-      const testCaseStarted: messages.Envelope = {
-        testCaseStarted: {
-          attempt,
-          testCaseId: this.testCase.id,
-          id: this.currentTestCaseStartedId,
-          timestamp: this.stopwatch.timestamp(),
-        },
-      }
-      this.eventBroadcaster.emit('envelope', testCaseStarted)
-      // used to determine whether a hook is a Before or After
-      let didWeRunStepsYet = false
-      for (const testStep of this.testCase.testSteps) {
-        await this.aroundTestStep(testStep.id, async () => {
-          if (doesHaveValue(testStep.hookId)) {
-            const hookParameter: ITestCaseHookParameter = {
-              gherkinDocument: this.gherkinDocument,
-              pickle: this.pickle,
-              testCaseStartedId: this.currentTestCaseStartedId,
-            }
-            if (didWeRunStepsYet) {
-              hookParameter.result = this.getWorstStepResult()
-              hookParameter.willBeRetried =
-                this.getWorstStepResult().status ===
-                  messages.TestStepResultStatus.FAILED && moreAttemptsRemaining
-            }
-            return await this.runHook(
-              findHookDefinition(testStep.hookId, this.supportCodeLibrary),
-              hookParameter,
-              !didWeRunStepsYet
-            )
-          } else {
-            const pickleStep = this.pickle.steps.find(
-              (pickleStep) => pickleStep.id === testStep.pickleStepId
-            )
-            const testStepResult = await this.runStep(pickleStep, testStep)
-            didWeRunStepsYet = true
-            return testStepResult
-          }
-        })
-      }
 
-      const willBeRetried =
-        this.getWorstStepResult().status ===
-          messages.TestStepResultStatus.FAILED && moreAttemptsRemaining
-      const testCaseFinished: messages.Envelope = {
-        testCaseFinished: {
-          testCaseStartedId: this.currentTestCaseStartedId,
-          timestamp: this.stopwatch.timestamp(),
-          willBeRetried,
-        },
-      }
-      this.eventBroadcaster.emit('envelope', testCaseFinished)
+      const willBeRetried = await this.runAttempt(
+        attempt,
+        moreAttemptsRemaining
+      )
+
       if (!willBeRetried) {
         break
       }
@@ -242,6 +195,67 @@ export default class TestCaseRunner {
     return this.getWorstStepResult().status
   }
 
+  async runAttempt(
+    attempt: number,
+    moreAttemptsRemaining: boolean
+  ): Promise<boolean> {
+    this.currentTestCaseStartedId = this.newId()
+    const testCaseStarted: messages.Envelope = {
+      testCaseStarted: {
+        attempt,
+        testCaseId: this.testCase.id,
+        id: this.currentTestCaseStartedId,
+        timestamp: this.stopwatch.timestamp(),
+      },
+    }
+    this.eventBroadcaster.emit('envelope', testCaseStarted)
+    // used to determine whether a hook is a Before or After
+    let didWeRunStepsYet = false
+    for (const testStep of this.testCase.testSteps) {
+      await this.aroundTestStep(testStep.id, async () => {
+        if (doesHaveValue(testStep.hookId)) {
+          const hookParameter: ITestCaseHookParameter = {
+            gherkinDocument: this.gherkinDocument,
+            pickle: this.pickle,
+            testCaseStartedId: this.currentTestCaseStartedId,
+          }
+          if (didWeRunStepsYet) {
+            hookParameter.result = this.getWorstStepResult()
+            hookParameter.willBeRetried =
+              this.getWorstStepResult().status ===
+                messages.TestStepResultStatus.FAILED && moreAttemptsRemaining
+          }
+          return await this.runHook(
+            findHookDefinition(testStep.hookId, this.supportCodeLibrary),
+            hookParameter,
+            !didWeRunStepsYet
+          )
+        } else {
+          const pickleStep = this.pickle.steps.find(
+            (pickleStep) => pickleStep.id === testStep.pickleStepId
+          )
+          const testStepResult = await this.runStep(pickleStep, testStep)
+          didWeRunStepsYet = true
+          return testStepResult
+        }
+      })
+    }
+
+    const willBeRetried =
+      this.getWorstStepResult().status ===
+        messages.TestStepResultStatus.FAILED && moreAttemptsRemaining
+    const testCaseFinished: messages.Envelope = {
+      testCaseFinished: {
+        testCaseStartedId: this.currentTestCaseStartedId,
+        timestamp: this.stopwatch.timestamp(),
+        willBeRetried,
+      },
+    }
+    this.eventBroadcaster.emit('envelope', testCaseFinished)
+
+    return willBeRetried
+  }
+
   async runHook(
     hookDefinition: TestCaseHookDefinition,
     hookParameter: ITestCaseHookParameter,