foreman_remote_execution 18.0.1 → 18.1.0

data/webpack/JobInvocationDetail/TemplateInvocationHelpers.js

@@ -0,0 +1,33 @@
+export const getLastOutputTimestamp = output =>
+  output.length ? output[output.length - 1].timestamp : null;
+
+export const normalizeOutput = output =>
+  output.reduce((normalized, lineSet) => {
+    const previousLineSet = normalized[normalized.length - 1];
+
+    if (
+      previousLineSet &&
+      previousLineSet.output_type === lineSet.output_type &&
+      !previousLineSet.output.endsWith('\n')
+    ) {
+      const firstCompleteLine = lineSet.output.match(/^[^\n]*\n/);
+      if (firstCompleteLine) {
+        normalized[normalized.length - 1] = {
+          ...previousLineSet,
+          output: previousLineSet.output + firstCompleteLine[0],
+        };
+
+        const remainder = lineSet.output.slice(firstCompleteLine[0].length);
+        if (remainder) normalized.push({ ...lineSet, output: remainder });
+        return normalized;
+      }
+    }
+
+    normalized.push(lineSet);
+    return normalized;
+  }, []);
+
+export const mergeOutput = (currentOutput, newOutput) => {
+  if (!newOutput.length) return currentOutput;
+  return normalizeOutput([...currentOutput, ...newOutput]);
+};

data/webpack/JobInvocationDetail/__tests__/JobInvocationDetailEmptyState.test.js

@@ -1,6 +1,6 @@
 import React from 'react';
 import { render, screen } from '@testing-library/react';
-import '@testing-library/jest-dom/extend-expect';
+import '@testing-library/jest-dom';
 import { createMemoryHistory } from 'history';
 import { Router } from 'react-router-dom';
 import JobInvocationEmptyState from '../JobInvocationEmptyState';

data/webpack/JobInvocationDetail/__tests__/MainInformation.test.js

@@ -245,12 +245,6 @@ describe('JobInvocationDetailPage', () => {
     expect(screen.getByText('Abort')).toBeInTheDocument();
     expect(screen.queryByText('Enable recurring')).not.toBeInTheDocument();
     expect(screen.queryByText('Cancel recurring')).not.toBeInTheDocument();
-    expect(
-      screen
-        .getByText('Legacy UI')
-        .closest('a')
-        .getAttribute('href')
-    ).toEqual(`/legacy/job_invocations/${jobId}`);
   });
 
   it('keeps toolbar buttons mounted while job invocation data is refreshing', async () => {

data/webpack/JobInvocationDetail/__tests__/OutputCodeBlock.test.js

@@ -1,6 +1,6 @@
 import React from 'react';
 import { render, screen, fireEvent } from '@testing-library/react';
-import '@testing-library/jest-dom/extend-expect';
+import '@testing-library/jest-dom';
 import { OutputCodeBlock } from '../TemplateInvocationComponents/OutputCodeBlock';
 import { jobInvocationOutput } from './fixtures';
 

data/webpack/JobInvocationDetail/__tests__/TableToolbarActions.test.js

@@ -1,4 +1,4 @@
-import '@testing-library/jest-dom/extend-expect';
+import '@testing-library/jest-dom';
 import { fireEvent, render, screen, waitFor } from '@testing-library/react';
 import axios from 'axios';
 import { foremanUrl } from 'foremanReact/common/helpers';

data/webpack/JobInvocationDetail/__tests__/TemplateInvocation.test.js

@@ -2,13 +2,16 @@ import React from 'react';
 import configureMockStore from 'redux-mock-store';
 import { Provider } from 'react-redux';
 import { render, screen, fireEvent } from '@testing-library/react';
-import '@testing-library/jest-dom/extend-expect';
+import '@testing-library/jest-dom';
+// eslint-disable-next-line import/no-extraneous-dependencies
+import API from 'foremanReact/API';
 import * as api from 'foremanReact/redux/API';
 import * as selectors from '../JobInvocationSelectors';
 import { TemplateInvocation } from '../TemplateInvocation';
 import { mockTemplateInvocationResponse } from './fixtures';
 
 jest.spyOn(api, 'get');
+jest.mock('foremanReact/API');
 jest.mock('../JobInvocationSelectors');
 
 jest.mock('foremanReact/components/ToastsList', () => ({
@@ -47,6 +50,7 @@ const mockProps = {
 
 describe('TemplateInvocation', () => {
   beforeEach(() => {
+    API.get.mockImplementation(() => new Promise(() => {}));
     selectors.selectTemplateInvocationStatus.mockImplementation(() => () =>
       'RESOLVED'
     );

data/webpack/JobInvocationDetail/__tests__/TemplateInvocationHelpers.test.js

@@ -0,0 +1,94 @@
+import {
+  getLastOutputTimestamp,
+  mergeOutput,
+  normalizeOutput,
+} from '../TemplateInvocationHelpers';
+
+describe('TemplateInvocationHelpers', () => {
+  describe('getLastOutputTimestamp', () => {
+    it('returns null for empty output', () => {
+      expect(getLastOutputTimestamp([])).toBeNull();
+    });
+
+    it('returns the timestamp of the last output chunk', () => {
+      expect(
+        getLastOutputTimestamp([
+          { timestamp: 1, output: 'first\n' },
+          { timestamp: 2, output: 'second\n' },
+        ])
+      ).toBe(2);
+    });
+  });
+
+  describe('normalizeOutput', () => {
+    it('joins lines split between chunks in one response', () => {
+      const result = normalizeOutput([
+        { timestamp: 1, output_type: 'stdout', output: 'hel' },
+        {
+          timestamp: 2,
+          output_type: 'stdout',
+          output: 'lo\r\nworld\r\n',
+        },
+      ]);
+
+      expect(result).toEqual([
+        { timestamp: 1, output_type: 'stdout', output: 'hello\r\n' },
+        { timestamp: 2, output_type: 'stdout', output: 'world\r\n' },
+      ]);
+    });
+  });
+
+  describe('mergeOutput', () => {
+    it('appends new chunks without changing existing objects', () => {
+      const existingChunk = { timestamp: 1, output: 'first\n' };
+      const newChunk = { timestamp: 2, output: 'second\n' };
+
+      const result = mergeOutput([existingChunk], [newChunk]);
+
+      expect(result).toEqual([existingChunk, newChunk]);
+      expect(result[0]).toBe(existingChunk);
+      expect(result[1]).toBe(newChunk);
+    });
+
+    it('joins a line split across two polling responses', () => {
+      const result = mergeOutput(
+        [{ timestamp: 1, output: 'partial ' }],
+        [{ timestamp: 2, output: 'line\nnext line\n' }]
+      );
+
+      expect(result).toEqual([
+        { timestamp: 1, output: 'partial line\n' },
+        { timestamp: 2, output: 'next line\n' },
+      ]);
+    });
+
+    it('does not join chunks of different output types', () => {
+      const result = mergeOutput(
+        [{ timestamp: 1, output_type: 'stdout', output: 'partial ' }],
+        [{ timestamp: 2, output_type: 'stderr', output: 'error\n' }]
+      );
+
+      expect(result).toEqual([
+        { timestamp: 1, output_type: 'stdout', output: 'partial ' },
+        { timestamp: 2, output_type: 'stderr', output: 'error\n' },
+      ]);
+    });
+
+    it('does not append an empty chunk after completing a split line', () => {
+      const result = mergeOutput(
+        [{ timestamp: 1, output_type: 'stdout', output: 'partial ' }],
+        [{ timestamp: 2, output_type: 'stdout', output: 'line\n' }]
+      );
+
+      expect(result).toEqual([
+        { timestamp: 1, output_type: 'stdout', output: 'partial line\n' },
+      ]);
+    });
+
+    it('returns the current output when there is nothing to append', () => {
+      const currentOutput = [{ timestamp: 1, output: 'first\n' }];
+
+      expect(mergeOutput(currentOutput, [])).toBe(currentOutput);
+    });
+  });
+});