Update tests

Author: janfaracik

src/main/frontend/pipeline-console-view/pipeline-console/main/ConsoleLogCard.spec.tsx

@@ -50,7 +50,6 @@ describe("ConsoleLogCard", () => {
     handleMoreConsoleClick: () => {
       console.log("handleMoreConsoleClick triggered");
     },
-    scrollParentId: "test-parent",
   } as ConsoleLogCardProps;
 
   it("renders step header only when not expanded", async () => {

src/main/frontend/pipeline-console-view/pipeline-console/main/ConsoleLogCard.tsx

@@ -143,5 +143,4 @@ export type ConsoleLogCardProps = {
   isExpanded: boolean;
   handleStepToggle: (nodeId: string) => void;
   handleMoreConsoleClick: (nodeId: string, startByte: number) => void;
-  scrollParentId: string;
 };

src/main/frontend/pipeline-console-view/pipeline-console/main/PipelineConsole.tsx

@@ -40,7 +40,6 @@ export default function PipelineConsole() {
           expandedSteps={expandedSteps}
           handleStepToggle={handleStepToggle}
           handleMoreConsoleClick={handleMoreConsoleClick}
-          scrollParentId="stage-view-pane"
         />
       </div>
     </SplitView>

src/main/frontend/pipeline-console-view/pipeline-console/main/StageView.spec.tsx

@@ -2,74 +2,60 @@
 
 (global as any).TextEncoder = require("util").TextEncoder;
 
-import "@testing-library/jest-dom";
 import React from "react";
-import { StepLogBufferInfo } from "./PipelineConsoleModel";
-import { render } from "@testing-library/react";
-import StageView, { StageViewProps } from "./StageView";
-import { ConsoleLogCardProps } from "./ConsoleLogCard";
-import {
-  defaultStagesList,
-  findStageSteps,
-  allSuccessfulStepList,
-} from "./TestData";
-
-const TestComponent = (props: StageViewProps) => {
-  return (
-    <div id="test-parent">
-      <StageView {...props} />
-    </div>
-  );
+import { act, render, screen } from "@testing-library/react";
+import StageView from "./StageView";
+import { Result, StageInfo, StepInfo } from "./PipelineConsoleModel";
+
+const mockStage: StageInfo = {
+  id: 1,
+  name: "Build Stage",
+  state: Result.success,
+  skeleton: false,
+  completePercent: 100,
+  children: [],
+  type: "STAGE",
+  title: "Build",
+  pauseDurationMillis: 0,
+  startTimeMillis: Date.now(),
+  totalDurationMillis: 10000,
+  agent: "",
+  url: "",
 };
 
-window.HTMLElement.prototype.scrollBy = jest.fn();
-
-jest.mock("./ConsoleLogCard", () => {
-  return {
-    ConsoleLogCard: jest.fn((props: ConsoleLogCardProps) => {
-      return (
-        <div>
-          <div>SimpleConsoleLogCard...</div>
-          <div>Hello, world!</div>
-        </div>
-      );
-    }),
-  };
-});
+const mockSteps: StepInfo[] = [
+  {
+    id: "step-1",
+    title: "Step 1",
+    stageId: "stage-1",
+    state: Result.running,
+    name: "",
+    completePercent: 0,
+    type: "",
+    pauseDurationMillis: 0,
+    startTimeMillis: 0,
+    totalDurationMillis: 0,
+  },
+];
 
 describe("StageView", () => {
-  const baseStage = defaultStagesList[0];
-  const stageSteps = findStageSteps(allSuccessfulStepList, baseStage.id);
-  const expandedStepId = stageSteps[0].id;
-  const baseBuffer: StepLogBufferInfo = {
-    lines: ["Hello, world!"],
-    startByte: 0,
-    endByte: 13,
-  };
-
-  const stepBuffers: Map<string, StepLogBufferInfo> = new Map<
-    string,
-    StepLogBufferInfo
-  >();
-  stepBuffers.set(expandedStepId, baseBuffer);
-
-  const DefaultTestProps = {
-    stage: baseStage,
-    steps: stageSteps,
-    stepBuffers: stepBuffers,
-    selectedStage: `${baseStage.id}`,
-    expandedSteps: [],
-    handleStepToggle: () => {
-      console.log("handleStepToggle triggered");
-    },
-    handleMoreConsoleClick: () => {
-      console.log("handleMoreConsoleClick triggered");
-    },
-    scrollParentId: "dummy-id",
-  } as StageViewProps;
+  it("renders StageDetails and StageSteps with provided props", async () => {
+    await act(async () => {
+      render(
+        <StageView
+          stage={mockStage}
+          steps={mockSteps}
+          stepBuffers={new Map()}
+          expandedSteps={["step-1"]}
+          handleStepToggle={jest.fn()}
+          handleMoreConsoleClick={jest.fn()}
+        />,
+      );
+    });
 
-  it("renders step view", async () => {
-    const { findByText } = render(<StageView {...DefaultTestProps} />);
-    expect(findByText(/Hello, world!/));
+    expect(screen.getByRole("heading", { level: 2 })).toHaveTextContent(
+      "Build Stage",
+    );
+    expect(screen.getByText("Step 1")).toBeInTheDocument();
   });
 });

src/main/frontend/pipeline-console-view/pipeline-console/main/StageView.tsx

@@ -15,7 +15,6 @@ export default function StageView(props: StageViewProps) {
         expandedSteps={props.expandedSteps}
         handleStepToggle={props.handleStepToggle}
         handleMoreConsoleClick={props.handleMoreConsoleClick}
-        scrollParentId={props.scrollParentId}
       />
     </>
   );
@@ -28,6 +27,4 @@ export interface StageViewProps {
   expandedSteps: string[];
   handleStepToggle: (nodeId: string) => void;
   handleMoreConsoleClick: (nodeId: string, startByte: number) => void;
-  // Id of the element whose scroll bar we wish to use.
-  scrollParentId: string;
 }

src/main/frontend/pipeline-console-view/pipeline-console/main/hooks/use-steps-poller.spec.ts

@@ -53,9 +53,7 @@ it("selects default step if URL param is missing", async () => {
     useStepsPoller({ currentRunPath: "/run/1", previousRunPath: undefined }),
   );
 
-  await waitFor(() =>
-    expect(result.current.expandedSteps).toContain("step-2")
-  );
+  await waitFor(() => expect(result.current.expandedSteps).toContain("step-2"));
 
   const { openStage, expandedSteps } = result.current;
 
@@ -69,9 +67,7 @@ it("selects the step from URL on initial load", async () => {
     useStepsPoller({ currentRunPath: "/run/1", previousRunPath: undefined }),
   );
 
-  await waitFor(() =>
-    expect(result.current.expandedSteps).toContain("step-1")
-  );
+  await waitFor(() => expect(result.current.expandedSteps).toContain("step-1"));
 
   const { openStage, expandedSteps } = result.current;
 
@@ -85,15 +81,15 @@ it("switches to next stage when current one finishes", async () => {
     { id: "s2", title: "Step 2", stageId: "stage-2", state: "queued" },
   ];
 
-  (model.getRunSteps as jest.Mock).mockImplementation(() => Promise.resolve(currentSteps));
+  (model.getRunSteps as jest.Mock).mockImplementation(() =>
+    Promise.resolve(currentSteps),
+  );
 
   const { result } = renderHook(() =>
     useStepsPoller({ currentRunPath: "/run/1" }),
   );
 
-  await waitFor(() =>
-    expect(result.current.openStage?.id).toBe("stage-1")
-  );
+  await waitFor(() => expect(result.current.openStage?.id).toBe("stage-1"));
 
   // Simulate stage-1 finishing and stage-2 becoming active
   currentSteps = [
@@ -102,9 +98,7 @@ it("switches to next stage when current one finishes", async () => {
   ];
   (model.getRunSteps as jest.Mock).mockResolvedValue(currentSteps);
 
-  await waitFor(() =>
-    expect(result.current.openStage?.id).toBe("stage-1")
-  );
+  await waitFor(() => expect(result.current.openStage?.id).toBe("stage-1"));
 
   expect(result.current.expandedSteps).toContain("s1");
 });
@@ -114,9 +108,7 @@ it("expands and collapses step when toggled", async () => {
     useStepsPoller({ currentRunPath: "/run/1" }),
   );
 
-  await waitFor(() =>
-    expect(result.current.expandedSteps).toContain("step-2")
-  );
+  await waitFor(() => expect(result.current.expandedSteps).toContain("step-2"));
 
   act(() => result.current.handleStepToggle("step-2"));
   expect(result.current.expandedSteps).not.toContain("step-2");

src/main/frontend/pipeline-console-view/pipeline-console/main/hooks/use-steps-poller.ts

@@ -80,7 +80,6 @@ export function useStepsPoller(props: RunPollerProps) {
       }
 
       setOpenStage(selected);
-      console.log("init - Setting to ", expanded)
       setExpandedSteps(expanded);
       return true;
     },
@@ -136,7 +135,6 @@ export function useStepsPoller(props: RunPollerProps) {
           setOpenStage(defaultStep.stageId);
 
           if (defaultStep.stageId) {
-            console.log("dEFAULTTTT", defaultStep.stageId);
             setExpandedSteps((prev) => [...prev, defaultStep.id]);
             updateStepConsoleOffset(defaultStep.id, false, 0 - LOG_FETCH_SIZE);
           }
@@ -190,7 +188,6 @@ export function useStepsPoller(props: RunPollerProps) {
       const newlyExpandedSteps = lastStep ? [lastStep.id] : [];
 
       setOpenStage(nodeId);
-      console.log("ini2t - Setting to ", newlyExpandedSteps)
       setExpandedSteps((prev) => [...prev, ...newlyExpandedSteps]);
 
       if (lastStep) {
@@ -203,11 +200,9 @@ export function useStepsPoller(props: RunPollerProps) {
   const handleStepToggle = (nodeId: string) => {
     setUserManuallySetNode(true);
     if (!expandedSteps.includes(nodeId)) {
-      console.log("step toggle - Setting to ", nodeId)
       setExpandedSteps((prev) => [...prev, nodeId]);
       updateStepConsoleOffset(nodeId, false, 0 - LOG_FETCH_SIZE);
     } else {
-      console.log("step toggle 2 - Setting to ", nodeId)
       setExpandedSteps((prev) => prev.filter((id) => id !== nodeId));
     }
   };

src/main/frontend/pipeline-console-view/pipeline-console/main/stage-steps.tsx

@@ -12,7 +12,6 @@ export default function StageSteps({
   handleStepToggle,
   expandedSteps,
   handleMoreConsoleClick,
-  scrollParentId,
 }: StageStepsProps) {
   if (steps.length === 0) {
     return null;
@@ -39,7 +38,6 @@ export default function StageSteps({
             isExpanded={expandedSteps.includes(stepItemData.id)}
             handleMoreConsoleClick={handleMoreConsoleClick}
             key={`step-console-card-${stepItemData.id}`}
-            scrollParentId={scrollParentId}
           />
         );
       })}
@@ -55,6 +53,4 @@ interface StageStepsProps {
   expandedSteps: string[];
   handleStepToggle: (nodeId: string) => void;
   handleMoreConsoleClick: (nodeId: string, startByte: number) => void;
-  // Id of the element whose scroll bar we wish to use.
-  scrollParentId: string;
 }