foreman-tasks 12.1.1 → 12.2.1

data/webpack/ForemanTasks/Components/TaskDetails/Components/__tests__/Dependencies.test.js

@@ -1,17 +1,20 @@
 import React from 'react';
-import { mount } from 'enzyme';
+import { render, screen, within } from '@testing-library/react';
+import '@testing-library/jest-dom';
+
 import Dependencies from '../Dependencies';
 
 describe('Dependencies', () => {
-  it('should render with no dependencies', () => {
-    const wrapper = mount(<Dependencies dependsOn={[]} blocks={[]} />);
-    expect(wrapper.find('Alert')).toHaveLength(1);
-    expect(wrapper.find('DependencyTable')).toHaveLength(2);
-    expect(wrapper.find('Table')).toHaveLength(0);
-    expect(wrapper.text()).toContain('None');
+  it('renders info alert and None for both tables when there are no tasks', () => {
+    render(<Dependencies dependsOn={[]} blocks={[]} />);
+    expect(
+      screen.getByRole('heading', { name: /task dependencies/i })
+    ).toBeInTheDocument();
+    const noneLabels = screen.getAllByText(/^none$/i);
+    expect(noneLabels.length).toBeGreaterThanOrEqual(2);
   });
 
-  it('should render with depends_on dependencies', () => {
+  it('renders depends_on tasks in the first table', () => {
     const dependsOn = [
       {
         id: '123',
@@ -28,16 +31,15 @@ describe('Dependencies', () => {
         result: 'pending',
       },
     ];
-    const wrapper = mount(<Dependencies dependsOn={dependsOn} blocks={[]} />);
-    expect(wrapper.find('Table')).toHaveLength(1);
-    expect(wrapper.find('Tbody').find('Tr')).toHaveLength(2);
-    expect(wrapper.text()).toContain('Foo Bar Action');
-    expect(wrapper.text()).toContain('Baz Qux Action');
-    expect(wrapper.text()).toContain('stopped');
-    expect(wrapper.text()).toContain('success');
+    render(<Dependencies dependsOn={dependsOn} blocks={[]} />);
+    const table = screen.getByRole('grid', { name: /depends on/i });
+    expect(within(table).getByText('Foo Bar Action')).toBeInTheDocument();
+    expect(within(table).getByText('Baz Qux Action')).toBeInTheDocument();
+    expect(within(table).getByText('stopped')).toBeInTheDocument();
+    expect(within(table).getByText('success')).toBeInTheDocument();
   });
 
-  it('should render with blocks dependencies', () => {
+  it('renders blocks in the second table', () => {
     const blocks = [
       {
         id: '789',
@@ -47,15 +49,14 @@ describe('Dependencies', () => {
         result: 'warning',
       },
     ];
-    const wrapper = mount(<Dependencies dependsOn={[]} blocks={blocks} />);
-    expect(wrapper.find('Table')).toHaveLength(1);
-    expect(wrapper.find('Tbody').find('Tr')).toHaveLength(1);
-    expect(wrapper.text()).toContain('Test Action');
-    expect(wrapper.text()).toContain('paused');
-    expect(wrapper.text()).toContain('warning');
+    render(<Dependencies dependsOn={[]} blocks={blocks} />);
+    const table = screen.getByRole('grid', { name: /^blocks$/i });
+    expect(within(table).getByText('Test Action')).toBeInTheDocument();
+    expect(within(table).getByText('paused')).toBeInTheDocument();
+    expect(within(table).getByText('warning')).toBeInTheDocument();
   });
 
-  it('should render with both dependency types', () => {
+  it('renders both tables when dependsOn and blocks are present', () => {
     const dependsOn = [
       {
         id: '123',
@@ -81,12 +82,11 @@ describe('Dependencies', () => {
         result: 'error',
       },
     ];
-    const wrapper = mount(
-      <Dependencies dependsOn={dependsOn} blocks={blocks} />
-    );
-    expect(wrapper.find('Table')).toHaveLength(2);
-    expect(wrapper.text()).toContain('Foo Action');
-    expect(wrapper.text()).toContain('Bar Action');
-    expect(wrapper.text()).toContain('Baz Action');
+    render(<Dependencies dependsOn={dependsOn} blocks={blocks} />);
+    expect(screen.getByRole('grid', { name: /depends on/i })).toBeInTheDocument();
+    expect(screen.getByText('Foo Action')).toBeInTheDocument();
+    expect(screen.getByRole('grid', { name: /^blocks$/i })).toBeInTheDocument();
+    expect(screen.getByText('Bar Action')).toBeInTheDocument();
+    expect(screen.getByText('Baz Action')).toBeInTheDocument();
   });
 });

data/webpack/ForemanTasks/Components/TaskDetails/Components/__tests__/Errors.test.js

@@ -1,36 +1,59 @@
-import { testComponentSnapshotsWithFixtures } from '@theforeman/test';
+import React from 'react';
+import { render, screen } from '@testing-library/react';
+import '@testing-library/jest-dom';
 
 import Errors from '../Errors';
 
-const fixtures = {
-  'render without Props': {},
-  'render with Props': {
-    executionPlan: {
-      state: 'paused',
-      cancellable: false,
-    },
-    failedSteps: [
-      {
-        error: {
-          exception_class: 'RuntimeError',
-          message:
-            'Action Actions::Katello::EventQueue::Monitor is already active',
-          backtrace: [
-            "/home/vagrant/.gem/ruby/gems/dynflow-1.2.3/lib/dynflow/action/singleton.rb:15:in `rescue in singleton_lock!'",
-            "/home/vagrant/.gem/ruby/gems/dynflow-1.2.3/lib/dynflow/action/singleton.rb:12:in `singleton_lock!'",
-          ],
-        },
-        action_class: 'Actions::Katello::EventQueue::Monitor',
-        state: 'error',
-        input:
-          '{"locale"=>"en",\n "current_request_id"=>nil,\n "current_user_id"=>4,\n "current_organization_id"=>nil,\n "current_location_id"=>nil}\n',
-        output: '{}\n',
-      },
+const failedStepFixture = {
+  error: {
+    exception_class: 'RuntimeError',
+    message: 'Action Actions::Katello::EventQueue::Monitor is already active',
+    backtrace: [
+      "/home/vagrant/.gem/ruby/gems/dynflow-1.2.3/lib/dynflow/action/singleton.rb:15:in `rescue in singleton_lock!'",
+      "/home/vagrant/.gem/ruby/gems/dynflow-1.2.3/lib/dynflow/action/singleton.rb:12:in `singleton_lock!'",
     ],
   },
+  action_class: 'Actions::Katello::EventQueue::Monitor',
+  state: 'error',
+  input:
+    '{"locale"=>"en",\n "current_request_id"=>nil,\n "current_user_id"=>4,\n "current_organization_id"=>nil,\n "current_location_id"=>nil}\n',
+  output: '{}\n',
 };
 
 describe('Errors', () => {
-  describe('rendering', () =>
-    testComponentSnapshotsWithFixtures(Errors, fixtures));
+  it('renders warning when execution plan is missing', () => {
+    render(<Errors failedSteps={[]} executionPlan={null} />);
+    expect(
+      screen.getByText(/execution plan data not available/i)
+    ).toBeInTheDocument();
+  });
+
+  it('renders success state when there are no failed steps', () => {
+    render(<Errors failedSteps={[]} executionPlan={{ state: 'paused' }} />);
+    const noErrors = screen.getAllByText(/^no errors$/i);
+    expect(noErrors.length).toBeGreaterThanOrEqual(1);
+  });
+
+  it('renders failed step details when failedSteps is non-empty', () => {
+    const { container } = render(
+      <Errors
+        executionPlan={{ state: 'paused', cancellable: false }}
+        failedSteps={[failedStepFixture]}
+      />
+    );
+    const stepAlert = container.querySelector(
+      '[data-ouia-component-id="task-error-0"]'
+    );
+    expect(stepAlert).toBeInTheDocument();
+    expect(stepAlert).toHaveClass('pf-m-inline');
+    expect(
+      screen.getByText('Actions::Katello::EventQueue::Monitor')
+    ).toBeInTheDocument();
+    expect(screen.getByText(/runtimeerror/i)).toBeInTheDocument();
+    expect(
+      screen.getByText(
+        /action actions::katello::eventqueue::monitor is already active/i
+      )
+    ).toBeInTheDocument();
+  });
 });

data/webpack/ForemanTasks/Components/TaskDetails/Components/__tests__/Raw.test.js

@@ -1,27 +1,49 @@
-import { testComponentSnapshotsWithFixtures } from '@theforeman/test';
+import React from 'react';
+import { render, screen } from '@testing-library/react';
+import '@testing-library/jest-dom';
 
 import Raw from '../Raw';
 
-const fixtures = {
-  'render without Props': {},
-  'render with Props': {
-    startedAt: '2019-06-17 16:04:09 +0300',
-    endedAt: '2019-06-17 16:05:09 +0300',
-    id: '6b0d6db2-e9ab-40da-94e5-b6842ac50bd0',
-    label: 'Actions::Katello::EventQueue::Monitor',
-    input: {
-      locale: 'en',
-      current_request_id: 1,
-      current_user_id: 4,
-      current_organization_id: 2,
-      current_location_id: 3,
-    },
-    output: {},
-    externalId: 'test',
-  },
-};
-
 describe('Raw', () => {
-  describe('rendering', () =>
-    testComponentSnapshotsWithFixtures(Raw, fixtures));
+  it('renders id and label when minimal props are given', () => {
+    render(
+      <Raw
+        id="x"
+        label=""
+        startedAt=""
+        endedAt=""
+        input={[]}
+        output={{}}
+        externalId=""
+      />
+    );
+    expect(screen.getByText('x')).toBeInTheDocument();
+  });
+
+  it('renders raw task fields from props', () => {
+    render(
+      <Raw
+        startedAt="2019-06-17 16:04:09 +0300"
+        endedAt="2019-06-17 16:05:09 +0300"
+        id="6b0d6db2-e9ab-40da-94e5-b6842ac50bd0"
+        label="Actions::Katello::EventQueue::Monitor"
+        input={{
+          locale: 'en',
+          current_request_id: 1,
+          current_user_id: 4,
+          current_organization_id: 2,
+          current_location_id: 3,
+        }}
+        output={{}}
+        externalId="test"
+      />
+    );
+    expect(
+      screen.getByText('6b0d6db2-e9ab-40da-94e5-b6842ac50bd0')
+    ).toBeInTheDocument();
+    expect(
+      screen.getByText('Actions::Katello::EventQueue::Monitor')
+    ).toBeInTheDocument();
+    expect(screen.getByText(/"locale":/)).toBeInTheDocument();
+  });
 });

data/webpack/ForemanTasks/Components/TaskDetails/Components/__tests__/RunningSteps.test.js

@@ -1,36 +1,68 @@
-import { testComponentSnapshotsWithFixtures } from '@theforeman/test';
+import React from 'react';
+import { render, screen, fireEvent } from '@testing-library/react';
+import '@testing-library/jest-dom';
 
 import RunningSteps from '../RunningSteps';
 
-const minProps = {
+const baseProps = {
   id: 'task-id1',
   taskReload: true,
   cancelStep: jest.fn(),
   taskReloadStart: jest.fn(),
 };
-const fixtures = {
-  'render with min Props': minProps,
-  'render with Props': {
-    ...minProps,
-    executionPlan: {
-      state: 'paused',
-      cancellable: false,
-    },
-    runningSteps: [
-      {
-        cancellable: false,
-        id: 1,
-        action_class: 'test',
-        state: 'paused',
-        input:
-          '{"locale"=>"en",\n "current_request_id"=>nil,\n "current_user_id"=>4,\n "current_organization_id"=>nil,\n "current_location_id"=>nil}\n',
-        output: '{}\n',
-      },
-    ],
-  },
+
+const sampleStep = {
+  cancellable: false,
+  id: 1,
+  action_class: 'test',
+  state: 'paused',
+  input:
+    '{"locale"=>"en",\n "current_request_id"=>nil,\n "current_user_id"=>4,\n "current_organization_id"=>nil,\n "current_location_id"=>nil}\n',
+  output: '{}\n',
 };
 
 describe('RunningSteps', () => {
-  describe('rendering', () =>
-    testComponentSnapshotsWithFixtures(RunningSteps, fixtures));
+  it('renders empty message when there are no running steps', () => {
+    render(<RunningSteps {...baseProps} runningSteps={[]} />);
+    expect(screen.getByText(/no running steps/i)).toBeInTheDocument();
+  });
+
+  it('renders running step fields and Cancel when step is cancellable', () => {
+    const cancelStep = jest.fn();
+    render(
+      <RunningSteps
+        {...baseProps}
+        cancelStep={cancelStep}
+        runningSteps={[
+          {
+            ...sampleStep,
+            cancellable: true,
+            id: 99,
+          },
+        ]}
+      />
+    );
+    expect(
+      screen.getByRole('heading', { name: 'Warning alert: Running step 1' })
+    ).toBeInTheDocument();
+    expect(screen.getByText('test')).toBeInTheDocument();
+    expect(screen.getByText('paused')).toBeInTheDocument();
+    fireEvent.click(screen.getByRole('button', { name: /cancel/i }));
+    expect(cancelStep).toHaveBeenCalledWith('task-id1', 99);
+  });
+
+  it('uses sprintf so each running step title shows a 1-based step index', () => {
+    render(
+      <RunningSteps
+        {...baseProps}
+        runningSteps={[sampleStep, { ...sampleStep, id: 2, state: 'running' }]}
+      />
+    );
+    expect(
+      screen.getByRole('heading', { name: 'Warning alert: Running step 1' })
+    ).toBeInTheDocument();
+    expect(
+      screen.getByRole('heading', { name: 'Warning alert: Running step 2' })
+    ).toBeInTheDocument();
+  });
 });

data/webpack/ForemanTasks/Components/TaskDetails/Components/__tests__/Task.test.js

@@ -1,26 +1,46 @@
-import { testComponentSnapshotsWithFixtures } from '@theforeman/test';
+import React from 'react';
+import { render, screen } from '@testing-library/react';
+import '@testing-library/jest-dom';
 import { STATUS } from 'foremanReact/constants';
+
 import Task from '../Task';
 
-const fixtures = {
-  'render with minimal Props': {
-    id: 'test',
-    taskReloadStart: jest.fn(),
-    taskProgressToggle: jest.fn(),
-  },
-  'render with some Props': {
-    id: 'test',
-    state: 'paused',
-    hasSubTasks: true,
-    dynflowEnableConsole: true,
-    parentTask: 'parent-id',
-    taskReload: true,
-    canEdit: true,
-    status: STATUS.RESOLVED,
-    taskProgressToggle: jest.fn(),
-    taskReloadStart: jest.fn(),
-  },
-};
+describe('Task', () => {
+  it('renders task controls from TaskButtons with minimal props', () => {
+    render(
+      <Task
+        id="test"
+        taskReloadStart={jest.fn()}
+        taskProgressToggle={jest.fn()}
+      />
+    );
+    expect(
+      screen.getByRole('button', { name: /start auto-reloading/i })
+    ).toBeInTheDocument();
+  });
 
-describe('Task rendering', () =>
-  testComponentSnapshotsWithFixtures(Task, fixtures));
+  it('renders parent task and sub tasks links when provided', () => {
+    render(
+      <Task
+        id="test"
+        state="paused"
+        hasSubTasks
+        dynflowEnableConsole
+        parentTask="parent-id"
+        taskReload
+        canEdit
+        status={STATUS.RESOLVED}
+        taskProgressToggle={jest.fn()}
+        taskReloadStart={jest.fn()}
+      />
+    );
+    expect(screen.getByRole('link', { name: /parent task/i })).toHaveAttribute(
+      'href',
+      '/foreman_tasks/tasks/parent-id'
+    );
+    expect(screen.getByRole('link', { name: /sub tasks/i })).toHaveAttribute(
+      'href',
+      '/foreman_tasks/tasks/test/sub_tasks'
+    );
+  });
+});

data/webpack/ForemanTasks/Components/TaskDetails/Components/__tests__/TaskInfo.test.js

@@ -1,59 +1,50 @@
-import { testComponentSnapshotsWithFixtures } from '@theforeman/test';
+import React from 'react';
+import { render, screen } from '@testing-library/react';
+import '@testing-library/jest-dom';
 
-import TaskInfo from '../TaskInfo';
+jest.mock('foremanReact/components/common/dates/RelativeDateTime', () => {
+  const RelativeDateTime = ({ date, defaultValue }) => (
+    <span>{date || defaultValue}</span>
+  );
+  return RelativeDateTime;
+});
 
-const fixtures = {
-  'render without Props': { id: 'test' },
-  'render with Props': {
-    id: 'test',
-    startAt: '2019-06-17 16:04:09 +0300',
-    label: 'Actions::Katello::EventQueue::Monitor',
-    pending: true,
-    action: 'Monitor Event Queue',
-    username: 'admin',
-    startedAt: '2019-06-17 16:04:09 +0300',
-    endedAt: null,
-    state: 'paused',
-    result: 'error',
-    progress: 0.5,
-    input: {
-      locale: 'en',
-      current_request_id: null,
-      current_timezone: 'Asia/Jerusalem',
-      current_user_id: 4,
-      current_organization_id: null,
-      current_location_id: null,
-    },
-    output: {},
-    humanized: {
-      action: 'Monitor Event Queue',
-      input: '',
-      output: '',
-      errors: [
-        'Action Actions::Katello::EventQueue::Monitor is already active',
-      ],
-    },
-    cli_example: null,
-    executionPlan: {
-      state: 'paused',
-      cancellable: false,
-    },
-    help:
-      "A paused task represents a process that has not finished properly. Any task in paused state can lead to potential inconsistency and needs to be resolved.\nThe recommended approach is to investigate the error messages below and in 'errors' tab, address the primary cause of the issue and resume the task.",
-    hasSubTasks: false,
-    locks: [
-      {
-        name: 'task_owner',
-        exclusive: false,
-        resource_type: 'User',
-        resource_id: 4,
-      },
-    ],
-    username_path: '<a href="/users/4-admin/edit">admin</a>',
-  },
-};
+import TaskInfo from '../TaskInfo';
 
 describe('TaskInfo', () => {
-  describe('rendering', () =>
-    testComponentSnapshotsWithFixtures(TaskInfo, fixtures));
+  it('renders default metadata labels when given minimal props', () => {
+    render(<TaskInfo id="test" />);
+    expect(screen.getByText(/name:/i)).toBeInTheDocument();
+    expect(screen.getByText(/start at:/i)).toBeInTheDocument();
+    expect(screen.getByText(/result:/i)).toBeInTheDocument();
+  });
+
+  it('renders task fields and troubleshooting when full props are provided', () => {
+    render(
+      <TaskInfo
+        id="test"
+        startAt="2019-06-17 16:04:09 +0300"
+        label="Actions::Katello::EventQueue::Monitor"
+        action="Monitor Event Queue"
+        username="admin"
+        startedAt="2019-06-17 16:04:09 +0300"
+        endedAt={null}
+        state="paused"
+        result="error"
+        progress={0.5}
+        help={
+          "A paused task represents a process that has not finished properly. Any task in paused state can lead to potential inconsistency and needs to be resolved.\nThe recommended approach is to investigate the error messages below and in 'errors' tab, address the primary cause of the issue and resume the task."
+        }
+        output={{}}
+        usernamePath=""
+      />
+    );
+    expect(screen.getByText('Monitor Event Queue')).toBeInTheDocument();
+    expect(screen.getByText(/troubleshooting/i)).toBeInTheDocument();
+    expect(
+      screen.getByText(/a paused task represents a process/i)
+    ).toBeInTheDocument();
+    expect(screen.getByText(/^paused$/)).toBeInTheDocument();
+    expect(screen.getByText(/^error$/)).toBeInTheDocument();
+  });
 });

data/webpack/ForemanTasks/Components/TaskDetails/TaskDetails.js

@@ -1,6 +1,6 @@
-import React, { useEffect } from 'react';
+import React, { useEffect, useState } from 'react';
 import PropTypes from 'prop-types';
-import { Tab, Tabs } from 'patternfly-react';
+import { Tabs, Tab, TabTitleText } from '@patternfly/react-core';
 import { translate as __, sprintf } from 'foremanReact/common/I18n';
 import { STATUS } from 'foremanReact/constants';
 import MessageBox from 'foremanReact/components/common/MessageBox';
@@ -31,6 +31,7 @@ const TaskDetails = ({
 }) => {
   const id = getTaskID();
   const { taskReload, status, isLoading } = props;
+  const [activeTabKey, setActiveTabKey] = useState(1);
 
   useEffect(() => {
     taskReloadStart(id);
@@ -58,27 +59,42 @@ const TaskDetails = ({
   }
   const resumable = executionPlan ? executionPlan.state === 'paused' : false;
   const cancellable = executionPlan ? executionPlan.cancellable : false;
+  const lockRecords = locks.concat(links);
+
+  const taskComponentProps = {
+    ...props,
+    cancellable,
+    resumable,
+    id,
+    status,
+    taskProgressToggle,
+    taskReloadStart,
+  };
+
   return (
     <div className="task-details-react well">
-      <Tabs defaultActiveKey={1} animation={false} id="task-details-tabs">
-        <Tab eventKey={1} title={__('Task')}>
-          {isLoading ? (
-            <TaskSkeleton />
-          ) : (
-            <Task
-              {...{
-                ...props,
-                cancellable,
-                resumable,
-                id,
-                status,
-                taskProgressToggle,
-                taskReloadStart,
-              }}
-            />
-          )}
+      <Tabs
+        id="task-details-tabs"
+        ouiaId="task-details-tabs"
+        activeKey={activeTabKey}
+        onSelect={(_event, tabKey) => setActiveTabKey(tabKey)}
+        mountOnEnter
+      >
+        <Tab
+          eventKey={1}
+          title={<TabTitleText>{__('Task')}</TabTitleText>}
+          aria-label={__('Task')}
+          ouiaId="task-details-tab-task"
+        >
+          {isLoading ? <TaskSkeleton /> : <Task {...taskComponentProps} />}
         </Tab>
-        <Tab eventKey={2} disabled={isLoading} title={__('Running Steps')}>
+        <Tab
+          eventKey={2}
+          title={<TabTitleText>{__('Running Steps')}</TabTitleText>}
+          isDisabled={isLoading}
+          aria-label={__('Running Steps')}
+          ouiaId="task-details-tab-running-steps"
+        >
           <RunningSteps
             runningSteps={runningSteps}
             id={id}
@@ -87,16 +103,40 @@ const TaskDetails = ({
             taskReloadStart={taskReloadStart}
           />
         </Tab>
-        <Tab eventKey={3} disabled={isLoading} title={__('Errors')}>
+        <Tab
+          eventKey={3}
+          title={<TabTitleText>{__('Errors')}</TabTitleText>}
+          isDisabled={isLoading}
+          aria-label={__('Errors')}
+          ouiaId="task-details-tab-errors"
+        >
           <Errors executionPlan={executionPlan} failedSteps={failedSteps} />
         </Tab>
-        <Tab eventKey={4} disabled={isLoading} title={__('Locks')}>
-          <Locks locks={locks.concat(links)} />
+        <Tab
+          eventKey={4}
+          title={<TabTitleText>{__('Locks')}</TabTitleText>}
+          isDisabled={isLoading}
+          aria-label={__('Locks')}
+          ouiaId="task-details-tab-locks"
+        >
+          <Locks locks={lockRecords} />
         </Tab>
-        <Tab eventKey={5} disabled={isLoading} title={__('Dependencies')}>
+        <Tab
+          eventKey={5}
+          title={<TabTitleText>{__('Dependencies')}</TabTitleText>}
+          isDisabled={isLoading}
+          aria-label={__('Dependencies')}
+          ouiaId="task-details-tab-dependencies"
+        >
           <Dependencies dependsOn={dependsOn} blocks={blocks} />
         </Tab>
-        <Tab eventKey={6} disabled={isLoading} title={__('Raw')}>
+        <Tab
+          eventKey={6}
+          title={<TabTitleText>{__('Raw')}</TabTitleText>}
+          isDisabled={isLoading}
+          aria-label={__('Raw')}
+          ouiaId="task-details-tab-raw"
+        >
           <Raw
             id={id}
             label={props.label}