Assign window.testState at correct time

This fixes #836.

Author: badeball

CHANGELOG.md

@@ -2,6 +2,10 @@
 
 All notable changes to this project will be documented in this file.
 
+## Unreleased
+
+- Correctly assign `testState.pickleStep`, fixes [#836](https://github.com/badeball/cypress-cucumber-preprocessor/issues/836).
+
 ## v13.0.1
 
 - Support absolute paths in `stepDefinitions`, fixes [#832](https://github.com/badeball/cypress-cucumber-preprocessor/issues/832).

features/test_state.feature

@@ -56,13 +56,17 @@ Feature: window.testState
       Feature: a feature name
         Scenario: a scenario name
           Given a step
+          And another step
       """
     And a file named "cypress/e2e/a.js" with:
       """
       const { Given } = require("@badeball/cypress-cucumber-preprocessor");
       Given("a step", function() {
         expect(testState.pickleStep.text).to.equal("a step");
       });
+      Given("another step", function() {
+        expect(testState.pickleStep.text).to.equal("another step");
+      });
       """
     When I run cypress
     Then it passes

lib/create-tests.ts

@@ -352,11 +352,11 @@ function createPickle(
 
     for (const step of steps) {
       if (step.hook) {
-        delete window.testState.pickleStep;
-
         const hook = step.hook;
 
         cy.then(() => {
+          delete window.testState.pickleStep;
+
           Cypress.log({
             name: "step",
             displayName: hook.keyword,
@@ -402,8 +402,6 @@ function createPickle(
             remainingSteps.shift();
           });
       } else if (step.pickleStep) {
-        window.testState.pickleStep = step.pickleStep;
-
         const pickleStep = step.pickleStep;
 
         const text = assertAndReturn(
@@ -422,6 +420,8 @@ function createPickle(
         );
 
         cy.then(() => {
+          window.testState.pickleStep = step.pickleStep;
+
           Cypress.log({
             name: "step",
             displayName: assertAndReturn(