foreman_webhooks 5.0.3 → 6.0.0

data/webpack/ForemanWebhooks/Routes/Webhooks/WebhooksIndexPage/__tests__/WebhooksIndexPage.test.js

@@ -1,32 +1,140 @@
 import React from 'react';
-import { testComponentSnapshotsWithFixtures } from '@theforeman/test';
+import { render, screen, fireEvent } from '@testing-library/react';
+import '@testing-library/jest-dom';
 import { Provider } from 'react-redux';
 import { createStore } from 'redux';
 
+import mockForemanTableIndexPage from './mocks/MockForemanTableIndexPage';
+
+import * as selectors from '../../WebhooksPageSelectors';
 import WebhooksIndexPage from '../WebhooksIndexPage';
+import {
+  spySelector,
+  webhooks as webhooksFixture,
+} from './WebhooksIndexPage.fixtures';
+
+jest.mock(
+  '../../Components/WebhookTable/Components/Formatters/nameToEditFormatter',
+  () => ({
+    __esModule: true,
+    default: () => () => null,
+  })
+);
+jest.mock(
+  '../../Components/WebhookTable/Components/Formatters/enabledCellFormatter',
+  () => ({
+    __esModule: true,
+    default: () => () => null,
+  })
+);
+jest.mock(
+  '../../Components/WebhookTable/Components/Formatters/actionCellFormatter',
+  () => ({
+    __esModule: true,
+    default: () => () => null,
+  })
+);
+
+jest.mock('foremanReact/components/PF4/TableIndexPage/TableIndexPage', () => ({
+  __esModule: true,
+  default: mockForemanTableIndexPage,
+}));
+
+jest.mock('../Components/WebhookCreateModal', () => ({
+  __esModule: true,
+  default: ({ isOpen, onCancel }) =>
+    isOpen ? (
+      <div data-testid="webhook-create-modal">
+        <button type="button" onClick={onCancel}>
+          Close create modal
+        </button>
+      </div>
+    ) : null,
+}));
+
+jest.mock('../Components/WebhookDeleteModal', () => ({
+  __esModule: true,
+  default: ({ modalState }) =>
+    modalState.isOpen ? (
+      <div data-testid="webhook-delete-modal">Delete modal</div>
+    ) : null,
+}));
+
+jest.mock('../Components/WebhookEditModal', () => ({
+  __esModule: true,
+  default: ({ modalState }) =>
+    modalState.isOpen ? (
+      <div data-testid="webhook-edit-modal">Edit modal</div>
+    ) : null,
+}));
+
+jest.mock('../Components/WebhookTestModal', () => ({
+  __esModule: true,
+  default: ({ modalState }) =>
+    modalState.isOpen ? (
+      <div data-testid="webhook-test-modal">Test modal</div>
+    ) : null,
+}));
 
-const fixtures = {
-  'render with minimal props': {
-    fetchAndPush: jest.fn(),
-    reloadWithSearch: jest.fn(),
-    handleCreateSubmit: jest.fn(),
-    isLoading: false,
-    hasError: false,
-    hasData: false,
-    itemCount: 0,
-    canCreate: true,
-    sort: {},
-    webhooks: [],
-  },
-};
+const store = createStore((state = {}) => state);
+
+const renderPage = () =>
+  render(
+    <Provider store={store}>
+      <WebhooksIndexPage />
+    </Provider>
+  );
 
 describe('WebhooksIndexPage', () => {
-  describe('redering', () => {
-    const webhooksPage = () => (
-      <Provider store={createStore((state = [], action) => state)}>
-        <WebhooksIndexPage />
-      </Provider>
-    );
-    testComponentSnapshotsWithFixtures(webhooksPage, fixtures);
+  beforeAll(() => {
+    spySelector(selectors);
+  });
+
+  beforeEach(() => {
+    jest.clearAllMocks();
+    selectors.selectWebhooks.mockImplementation(() => []);
+  });
+
+  it('renders the webhooks header', () => {
+    renderPage();
+
+    expect(
+      screen.getByRole('heading', { name: 'Webhooks' })
+    ).toBeInTheDocument();
+    expect(screen.getByTestId('webhooks-table-index')).toBeInTheDocument();
+  });
+
+  it('renders webhook rows from the store', () => {
+    selectors.selectWebhooks.mockImplementation(() => webhooksFixture);
+
+    renderPage();
+
+    expect(screen.getByText('my-webhook')).toBeInTheDocument();
+    expect(screen.getByText('your-webhook')).toBeInTheDocument();
+  });
+
+  it('opens the create modal when Create new is clicked', () => {
+    renderPage();
+
+    expect(
+      screen.queryByTestId('webhook-create-modal')
+    ).not.toBeInTheDocument();
+
+    fireEvent.click(screen.getByRole('button', { name: 'Create new' }));
+
+    expect(screen.getByTestId('webhook-create-modal')).toBeInTheDocument();
+  });
+
+  it('closes the create modal when cancel is triggered', () => {
+    renderPage();
+
+    fireEvent.click(screen.getByRole('button', { name: 'Create new' }));
+    expect(screen.getByTestId('webhook-create-modal')).toBeInTheDocument();
+
+    fireEvent.click(screen.getByRole('button', { name: 'Close create modal' }));
+
+    expect(
+      screen.queryByTestId('webhook-create-modal')
+    ).not.toBeInTheDocument();
   });
 });

data/webpack/ForemanWebhooks/Routes/Webhooks/WebhooksIndexPage/__tests__/integration.test.js

@@ -2,8 +2,12 @@ import React from 'react';
 import { IntegrationTestHelper } from '@theforeman/test';
 import { Router } from 'react-router-dom';
 import { createMemoryHistory } from 'history';
+import {
+  reducers as foremanApiReducers,
+  APIMiddleware,
+} from 'foremanReact/redux/API';
 
-import ConnectedWebhooksIndexPage from '../index';
+import ConnectedWebhooksIndexPage from '../WebhooksIndexPage';
 
 import * as selectors from '../../WebhooksPageSelectors';
 import * as editSelectors from '../Components/WebhookEditModalSelectors';
@@ -17,7 +21,10 @@ describe('WebhooksIndexPage - Integration Test', () => {
     const history = createMemoryHistory();
     history.push({ pathname: '/webhooks', search: '' });
 
-    const integrationTestHelper = new IntegrationTestHelper();
+    const integrationTestHelper = new IntegrationTestHelper(
+      foremanApiReducers,
+      [APIMiddleware]
+    );
 
     const component = integrationTestHelper.mount(
       <Router history={history}>
@@ -25,7 +32,7 @@ describe('WebhooksIndexPage - Integration Test', () => {
       </Router>
     );
 
-    expect(component.exists('WebhooksTable')).toEqual(true);
+    expect(component.find('table[role="grid"]').exists()).toEqual(true);
     expect(component.exists('WebhookCreateModal')).toEqual(true);
   });
 });

data/webpack/ForemanWebhooks/Routes/Webhooks/WebhooksIndexPage/__tests__/mocks/MockForemanTableIndexPage.js

@@ -0,0 +1,37 @@
+import React from 'react';
+import PropTypes from 'prop-types';
+import { useSelector } from 'react-redux';
+
+import { selectWebhooks } from '../../../WebhooksPageSelectors';
+
+function MockForemanTableIndexPage({ header, customCreateAction }) {
+  const rows = useSelector(selectWebhooks);
+  const onCreate = customCreateAction ? customCreateAction() : undefined;
+  return (
+    <div data-testid="webhooks-table-index">
+      <h1>{header}</h1>
+      <ul aria-label="webhook-rows">
+        {rows.map(row => (
+          <li key={row.id}>{row.name}</li>
+        ))}
+      </ul>
+      {onCreate ? (
+        <button type="button" onClick={onCreate}>
+          Create new
+        </button>
+      ) : null}
+    </div>
+  );
+}
+
+MockForemanTableIndexPage.propTypes = {
+  header: PropTypes.string,
+  customCreateAction: PropTypes.func,
+};
+
+MockForemanTableIndexPage.defaultProps = {
+  header: '',
+  customCreateAction: null,
+};
+
+export default MockForemanTableIndexPage;

data/webpack/ForemanWebhooks/Routes/Webhooks/constants.js

@@ -4,13 +4,13 @@ export const WEBHOOKS_PAGE_HIDE_LOADING = 'WEBHOOKS_PAGE_HIDE_LOADING';
 export const WEBHOOKS_PAGE_SHOW_LOADING = 'WEBHOOKS_PAGE_SHOW_LOADING';
 export const WEBHOOKS_PAGE_CLEAR_ERROR = 'WEBHOOKS_PAGE_CLEAR_ERROR';
 
-export const WEBHOOKS_API_PATH = '/api/v2/webhooks?include_permissions=true';
+export const WEBHOOKS_API_PATH = '/api/webhooks?include_permissions=true';
 export const WEBHOOKS_PATH = '/webhooks';
-export const WEBHOOKS_API_REQUEST_KEY = 'WEBHOOKS';
+export const WEBHOOKS_API_REQUEST_KEY = 'webhooks';
 
 export const WEBHOOK_TEMPLATES_API_PATH =
   '/api/v2/webhook_templates?include_permissions=true';
-export const WEBHOOKS_API_PLAIN_PATH = '/api/v2/webhooks';
+export const WEBHOOKS_API_PLAIN_PATH = '/api/webhooks';
 export const WEBHOOK_TEMPLATES_API_REQUEST_KEY = 'WEBHOOK_TEMPLATES';
 export const WEBHOOK_API_REQUEST_KEY = 'WEBHOOK';
 export const WEBHOOK_API_UPDATE_KEY = 'WEBHOOK_UPDATE';

data/webpack/test_setup.js

@@ -1,3 +1,6 @@
+// eslint-disable-next-line import/no-unresolved
+import 'foremanJSTestSetup';
+
 jest.mock('foremanReact/history', () => ({
   history: {
     action: 'PUSH',

metadata

@@ -1,56 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: foreman_webhooks
 version: !ruby/object:Gem::Version
-  version: 5.0.3
+  version: 6.0.0
 platform: ruby
 authors:
 - Timo Goebel
 bindir: bin
 cert_chain: []
 date: 1980-01-02 00:00:00.000000000 Z
-dependencies:
-- !ruby/object:Gem::Dependency
-  name: rake
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: rdoc
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: theforeman-rubocop
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 0.1.0
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 0.1.0
+dependencies: []
 description: Plugin for Foreman that allows to configure Webhooks.
 email:
 - mail@timogoebel.name
@@ -180,44 +138,31 @@ files:
 - test/test_plugin_helper.rb
 - test/unit/foreman_webhooks/webhook_service_test.rb
 - webpack/ForemanWebhooks/Routes/ForemanWebhooksRoutes.js
-- webpack/ForemanWebhooks/Routes/Webhooks/Components/WebhookForm/Components/FieldConstructor.js
 - webpack/ForemanWebhooks/Routes/Webhooks/Components/WebhookForm/Components/WebhookFormTabs.css
 - webpack/ForemanWebhooks/Routes/Webhooks/Components/WebhookForm/Components/WebhookFormTabs.js
-- webpack/ForemanWebhooks/Routes/Webhooks/Components/WebhookForm/Components/__tests__/FieldConstructor.test.js
 - webpack/ForemanWebhooks/Routes/Webhooks/Components/WebhookForm/WebhookForm.js
 - webpack/ForemanWebhooks/Routes/Webhooks/Components/WebhookForm/WebhookFormSelectors.js
 - webpack/ForemanWebhooks/Routes/Webhooks/Components/WebhookForm/__tests__/WebhookForm.test.js
 - webpack/ForemanWebhooks/Routes/Webhooks/Components/WebhookForm/constants.js
 - webpack/ForemanWebhooks/Routes/Webhooks/Components/WebhookForm/index.js
+- webpack/ForemanWebhooks/Routes/Webhooks/Components/WebhookTable/Components/ActionButtons/ActionButton.js
+- webpack/ForemanWebhooks/Routes/Webhooks/Components/WebhookTable/Components/Formatters/__tests__/actionCellFormatter.test.js
+- webpack/ForemanWebhooks/Routes/Webhooks/Components/WebhookTable/Components/Formatters/__tests__/enabledCellFormatter.test.js
+- webpack/ForemanWebhooks/Routes/Webhooks/Components/WebhookTable/Components/Formatters/__tests__/nameToEditFormatter.test.js
+- webpack/ForemanWebhooks/Routes/Webhooks/Components/WebhookTable/Components/Formatters/actionCellFormatter.js
+- webpack/ForemanWebhooks/Routes/Webhooks/Components/WebhookTable/Components/Formatters/enabledCellFormatter.js
+- webpack/ForemanWebhooks/Routes/Webhooks/Components/WebhookTable/Components/Formatters/nameToEditFormatter.js
 - webpack/ForemanWebhooks/Routes/Webhooks/WebhooksIndexPage/Components/WebhookCreateModal.js
 - webpack/ForemanWebhooks/Routes/Webhooks/WebhooksIndexPage/Components/WebhookDeleteModal.js
 - webpack/ForemanWebhooks/Routes/Webhooks/WebhooksIndexPage/Components/WebhookEditModal.js
 - webpack/ForemanWebhooks/Routes/Webhooks/WebhooksIndexPage/Components/WebhookEditModalSelectors.js
 - webpack/ForemanWebhooks/Routes/Webhooks/WebhooksIndexPage/Components/WebhookModal.scss
 - webpack/ForemanWebhooks/Routes/Webhooks/WebhooksIndexPage/Components/WebhookTestModal.js
-- webpack/ForemanWebhooks/Routes/Webhooks/WebhooksIndexPage/Components/WebhooksTable/Components/ActionButtons/ActionButton.js
-- webpack/ForemanWebhooks/Routes/Webhooks/WebhooksIndexPage/Components/WebhooksTable/Components/EmptyWebhooksTable/index.js
-- webpack/ForemanWebhooks/Routes/Webhooks/WebhooksIndexPage/Components/WebhooksTable/Components/EnabledCell.js
-- webpack/ForemanWebhooks/Routes/Webhooks/WebhooksIndexPage/Components/WebhooksTable/Components/Formatters/__tests__/__snapshots__/enabledCellFormatter.test.js.snap
-- webpack/ForemanWebhooks/Routes/Webhooks/WebhooksIndexPage/Components/WebhooksTable/Components/Formatters/__tests__/enabledCellFormatter.test.js
-- webpack/ForemanWebhooks/Routes/Webhooks/WebhooksIndexPage/Components/WebhooksTable/Components/Formatters/actionCellFormatter.js
-- webpack/ForemanWebhooks/Routes/Webhooks/WebhooksIndexPage/Components/WebhooksTable/Components/Formatters/enabledCellFormatter.js
-- webpack/ForemanWebhooks/Routes/Webhooks/WebhooksIndexPage/Components/WebhooksTable/Components/Formatters/index.js
-- webpack/ForemanWebhooks/Routes/Webhooks/WebhooksIndexPage/Components/WebhooksTable/Components/Formatters/nameToEditFormatter.js
-- webpack/ForemanWebhooks/Routes/Webhooks/WebhooksIndexPage/Components/WebhooksTable/Components/NameToEditCell.js
-- webpack/ForemanWebhooks/Routes/Webhooks/WebhooksIndexPage/Components/WebhooksTable/Components/__tests__/EnabledCell.test.js
-- webpack/ForemanWebhooks/Routes/Webhooks/WebhooksIndexPage/Components/WebhooksTable/Components/__tests__/__snapshots__/EnabledCell.test.js.snap
-- webpack/ForemanWebhooks/Routes/Webhooks/WebhooksIndexPage/Components/WebhooksTable/WebhooksTable.js
-- webpack/ForemanWebhooks/Routes/Webhooks/WebhooksIndexPage/Components/WebhooksTable/WebhooksTableSchema.js
-- webpack/ForemanWebhooks/Routes/Webhooks/WebhooksIndexPage/Components/WebhooksTable/__tests__/WebhooksTable.test.js
-- webpack/ForemanWebhooks/Routes/Webhooks/WebhooksIndexPage/Components/WebhooksTable/__tests__/__snapshots__/WebhooksTable.test.js.snap
-- webpack/ForemanWebhooks/Routes/Webhooks/WebhooksIndexPage/Components/WebhooksTable/index.js
 - webpack/ForemanWebhooks/Routes/Webhooks/WebhooksIndexPage/WebhooksIndexPage.js
 - webpack/ForemanWebhooks/Routes/Webhooks/WebhooksIndexPage/__tests__/WebhooksIndexPage.fixtures.js
 - webpack/ForemanWebhooks/Routes/Webhooks/WebhooksIndexPage/__tests__/WebhooksIndexPage.test.js
-- webpack/ForemanWebhooks/Routes/Webhooks/WebhooksIndexPage/__tests__/__snapshots__/WebhooksIndexPage.test.js.snap
 - webpack/ForemanWebhooks/Routes/Webhooks/WebhooksIndexPage/__tests__/integration.test.js
-- webpack/ForemanWebhooks/Routes/Webhooks/WebhooksIndexPage/index.js
+- webpack/ForemanWebhooks/Routes/Webhooks/WebhooksIndexPage/__tests__/mocks/MockForemanTableIndexPage.js
 - webpack/ForemanWebhooks/Routes/Webhooks/WebhooksPageActions.js
 - webpack/ForemanWebhooks/Routes/Webhooks/WebhooksPageHelpers.js
 - webpack/ForemanWebhooks/Routes/Webhooks/WebhooksPageSelectors.js
@@ -225,31 +170,6 @@ files:
 - webpack/ForemanWebhooks/Routes/Webhooks/__tests__/WebhooksPageSelectors.test.js
 - webpack/ForemanWebhooks/Routes/Webhooks/__tests__/__snapshots__/WebhooksPageSelectors.test.js.snap
 - webpack/ForemanWebhooks/Routes/Webhooks/constants.js
-- webpack/__mocks__/foremanReact/Root/Context/ForemanContext.js
-- webpack/__mocks__/foremanReact/common/HOC.js
-- webpack/__mocks__/foremanReact/common/I18n.js
-- webpack/__mocks__/foremanReact/common/helpers.js
-- webpack/__mocks__/foremanReact/common/urlHelpers.js
-- webpack/__mocks__/foremanReact/components/ForemanModal/ForemanModalActions.js
-- webpack/__mocks__/foremanReact/components/ForemanModal/ForemanModalHooks.js
-- webpack/__mocks__/foremanReact/components/ForemanModal/index.js
-- webpack/__mocks__/foremanReact/components/Layout/LayoutActions.js
-- webpack/__mocks__/foremanReact/components/Loading/Loading.js
-- webpack/__mocks__/foremanReact/components/Loading/index.js
-- webpack/__mocks__/foremanReact/components/PF4/TableIndexPage/TableIndexPage.js
-- webpack/__mocks__/foremanReact/components/Pagination/index.js
-- webpack/__mocks__/foremanReact/components/common/ActionButtons/ActionButtons.js
-- webpack/__mocks__/foremanReact/components/common/EmptyState.js
-- webpack/__mocks__/foremanReact/components/common/forms/ForemanForm.js
-- webpack/__mocks__/foremanReact/components/common/forms/FormField.js
-- webpack/__mocks__/foremanReact/components/common/table.js
-- webpack/__mocks__/foremanReact/constants.js
-- webpack/__mocks__/foremanReact/history.js
-- webpack/__mocks__/foremanReact/redux/API/APISelectors.js
-- webpack/__mocks__/foremanReact/redux/API/index.js
-- webpack/__mocks__/foremanReact/redux/actions/common/forms.js
-- webpack/__mocks__/foremanReact/redux/actions/toasts.js
-- webpack/__mocks__/foremanReact/routes/common/PageLayout/PageLayout.js
 - webpack/index.js
 - webpack/routes_index.js
 - webpack/test_setup.js
@@ -265,14 +185,17 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: 2.7.0
+      version: '3.0'
+  - - "<"
+    - !ruby/object:Gem::Version
+      version: '4'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 4.0.6
+rubygems_version: 4.0.10
 specification_version: 4
 summary: Configure webhooks for Foreman.
 test_files:
@@ -289,11 +212,10 @@ test_files:
 - test/models/webhook_test.rb
 - test/test_plugin_helper.rb
 - test/unit/foreman_webhooks/webhook_service_test.rb
-- webpack/ForemanWebhooks/Routes/Webhooks/Components/WebhookForm/Components/__tests__/FieldConstructor.test.js
 - webpack/ForemanWebhooks/Routes/Webhooks/Components/WebhookForm/__tests__/WebhookForm.test.js
-- webpack/ForemanWebhooks/Routes/Webhooks/WebhooksIndexPage/Components/WebhooksTable/Components/Formatters/__tests__/enabledCellFormatter.test.js
-- webpack/ForemanWebhooks/Routes/Webhooks/WebhooksIndexPage/Components/WebhooksTable/Components/__tests__/EnabledCell.test.js
-- webpack/ForemanWebhooks/Routes/Webhooks/WebhooksIndexPage/Components/WebhooksTable/__tests__/WebhooksTable.test.js
+- webpack/ForemanWebhooks/Routes/Webhooks/Components/WebhookTable/Components/Formatters/__tests__/actionCellFormatter.test.js
+- webpack/ForemanWebhooks/Routes/Webhooks/Components/WebhookTable/Components/Formatters/__tests__/enabledCellFormatter.test.js
+- webpack/ForemanWebhooks/Routes/Webhooks/Components/WebhookTable/Components/Formatters/__tests__/nameToEditFormatter.test.js
 - webpack/ForemanWebhooks/Routes/Webhooks/WebhooksIndexPage/__tests__/WebhooksIndexPage.fixtures.js
 - webpack/ForemanWebhooks/Routes/Webhooks/WebhooksIndexPage/__tests__/WebhooksIndexPage.test.js
 - webpack/ForemanWebhooks/Routes/Webhooks/WebhooksIndexPage/__tests__/integration.test.js