fix tests

Author: baev

packages/allure-cypress/src/utils.ts

@@ -13,7 +13,7 @@ export const DEFAULT_RUNTIME_CONFIG = {
  * @returns An array of popped items. The first popped item becomes the first element of this array.
  */
 export const popUntilFindIncluded = <T>(items: T[], pred: (value: T) => boolean) => {
-  const index = items.findIndex(pred);
+  const index = items.findLastIndex(pred);
   return index !== -1 ? toReversed(items.splice(index)) : [];
 };
 

packages/allure-cypress/test/spec/runtime/modern/steps.test.ts

@@ -80,6 +80,42 @@ it("nested steps", async () => {
   expect(tests[0].steps[0].steps[0].steps).toContainEqual(expect.objectContaining({ name: "baz" }));
 });
 
+it("keeps the parent step active for later runtime siblings", async () => {
+  const { tests } = await runCypressInlineTest({
+    "cypress/e2e/sample.cy.js": ({ allureCommonsModulePath }) => `
+    import { logStep, step } from "${allureCommonsModulePath}";
+
+    it("step", () => {
+      step("outer", () => {
+        logStep("inner");
+        logStep("sibling");
+      });
+    });
+  `,
+  });
+
+  expect(tests).toHaveLength(1);
+  expect(tests[0].steps).toMatchObject([
+    {
+      name: "outer",
+      status: Status.PASSED,
+      stage: Stage.FINISHED,
+      steps: [
+        {
+          name: "inner",
+          status: Status.PASSED,
+          stage: Stage.FINISHED,
+        },
+        {
+          name: "sibling",
+          status: Status.PASSED,
+          stage: Stage.FINISHED,
+        },
+      ],
+    },
+  ]);
+});
+
 it("stage runtime api", async () => {
   const { tests } = await runCypressInlineTest({
     "cypress/e2e/sample.cy.js": ({ allureCommonsModulePath }) => `

packages/allure-js-commons/src/sdk/reporter/ReporterRuntime.ts

@@ -40,13 +40,7 @@ import type {
   TestScope,
   Writer,
 } from "./types.js";
-import {
-  deepClone,
-  formatLinks,
-  getTestResultHistoryId,
-  getTestResultTestCaseId,
-  randomUuid,
-} from "./utils.js";
+import { deepClone, formatLinks, getTestResultHistoryId, getTestResultTestCaseId, randomUuid } from "./utils.js";
 import { buildAttachmentFileName } from "./utils/attachments.js";
 import { resolveWriter } from "./writer/loader.js";
 

packages/allure-playwright/test/spec/runtime/modern/steps.spec.ts

@@ -114,12 +114,12 @@ it("handles runtime stages", async () => {
   const runtimeSteps = tests[0].steps.filter((step) => step.name === "stage 1" || step.name === "stage 2");
   expect(runtimeSteps).toHaveLength(2);
 
-  const collectStepNames = (steps: typeof runtimeSteps[number]["steps"]): string[] =>
+  const collectStepNames = (steps: (typeof runtimeSteps)[number]["steps"]): string[] =>
     steps.flatMap((step) => [step.name, ...collectStepNames(step.steps)]);
   const findStepByName = (
-    steps: typeof tests[0]["steps"],
+    steps: (typeof tests)[0]["steps"],
     name: string,
-  ): (typeof tests[0]["steps"])[number] | undefined => {
+  ): (typeof tests)[0]["steps"][number] | undefined => {
     for (const step of steps) {
       if (step.name === name) {
         return step;