katello 4.16.3 → 4.17.0.rc1

data/webpack/scenes/ContentViews/components/NeedsPublishIcon.scss

@@ -1,9 +1,9 @@
 .determinate-needs-publish {
-  color: var(--pf-global--primary-color--100);
+  color: var(--pf-v5-global--primary-color--100);
   margin-left: 9px;
 }
 
 .indeterminate-needs-publish {
-  color: var(--pf-global--disabled-color--200);
+  color: var(--pf-v5-global--disabled-color--200);
   margin-left: 9px;
 }

data/webpack/scenes/ContentViews/components/contentViewIcon.scss

@@ -2,19 +2,32 @@
   display: flex;
   align-items: center;
   align-content: center;
+  gap: 6px;
 
   .composite-component-count {
-    min-width: 10px;
+    min-width: 12px;
     text-align: center;
   }
 }
 
 .svg-icon-composite {
-  margin: 0 6px;
+  margin: 0 9px;
   display: block;
 }
 
 .svg-icon-component {
   margin: 0 9px;
   display: block;
-}
+}
+
+.svg-icon-rolling {
+  margin: 0 9px;
+  display: block;
+}
+
+.svg-centered-container:has(.svg-icon-component), 
+.svg-centered-container:has(.svg-icon-rolling) {
+  > span:last-child {
+    margin-left: 4px;
+  }
+}

data/webpack/scenes/ContentViews/expansions/DetailsExpansion.js

@@ -6,7 +6,7 @@ import RelatedCompositeContentViewsModal from './RelatedCompositeContentViewsMod
 import RelatedContentViewComponentsModal from './RelatedContentViewComponentsModal';
 
 const DetailsExpansion = ({
-  cvId, cvName, cvComposite, activationKeys, hosts, relatedCVCount, relatedCompositeCVs,
+  cvId, cvName, cvComposite, cvRolling, activationKeys, hosts, relatedCVCount, relatedCompositeCVs,
 }) => {
   const activationKeyCount = activationKeys.length;
   const hostCount = hosts.length;
@@ -15,6 +15,9 @@ const DetailsExpansion = ({
   const hostsPageUrl = `${baseHostsPageUrl}?search=${encodeURIComponent(`content_view_id=${cvId}`)}`;
 
   const relatedContentViewModal = () => {
+    if (cvRolling) {
+      return <></>;
+    }
     if (cvComposite) {
       return (
         <>
@@ -53,6 +56,7 @@ DetailsExpansion.propTypes = {
   hosts: PropTypes.arrayOf(PropTypes.shape({})),
   cvName: PropTypes.string,
   cvComposite: PropTypes.bool,
+  cvRolling: PropTypes.bool,
   relatedCompositeCVs: PropTypes.arrayOf(PropTypes.shape({})),
   relatedCVCount: PropTypes.number,
 };
@@ -62,6 +66,7 @@ DetailsExpansion.defaultProps = {
   hosts: [],
   cvName: '',
   cvComposite: false,
+  cvRolling: false,
   relatedCompositeCVs: [],
   relatedCVCount: 0,
 

data/webpack/scenes/ContentViews/expansions/RelatedCompositeContentViewsModal.js

@@ -3,7 +3,7 @@ import { Link } from 'react-router-dom';
 import { translate as __ } from 'foremanReact/common/I18n';
 import PropTypes from 'prop-types';
 import { Modal, ModalVariant, Button, Flex, FlexItem } from '@patternfly/react-core';
-import { TableComposable, Thead, Tbody, Tr, Th, Td } from '@patternfly/react-table';
+import { Table /* data-codemods */, Thead, Tbody, Tr, Th, Td } from '@patternfly/react-table';
 import { EnterpriseIcon } from '@patternfly/react-icons';
 import { urlBuilder } from '../../../__mocks__/foremanReact/common/urlHelpers';
 
@@ -44,7 +44,7 @@ const RelatedCompositeContentViewsModal = ({
         }}
         appendTo={document.body}
       >
-        <TableComposable
+        <Table
           aria-label={`${cvId}_table`}
           ouiaId={`${cvId}_table`}
           variant="compact"
@@ -65,7 +65,7 @@ const RelatedCompositeContentViewsModal = ({
               </Tr>
             ))}
           </Tbody>
-        </TableComposable>
+        </Table>
       </Modal>
     </>
   );

data/webpack/scenes/ContentViews/expansions/__tests__/contentViewComponentsModal.test.js

@@ -37,7 +37,8 @@ test('Can call API and show Related Content Views Components Modal', async (done
   await patientlyWaitFor(() => expect(getByText('Related content views')).toBeInTheDocument());
 
   assertNockRequest(autocompleteScope);
-  assertNockRequest(scope, done);
+  assertNockRequest(scope);
+  done();
 });
 
 test('Can call API and show Related Composite Content Views Modal', async () => {

data/webpack/scenes/Hosts/ChangeContentSource/components/ContentSourceForm.js

@@ -8,12 +8,14 @@ import {
   Form,
   Grid,
   GridItem,
-  Select,
-  SelectOption,
-  SelectVariant,
   TextContent,
   Text,
 } from '@patternfly/react-core';
+import {
+  Select,
+  SelectOption,
+  SelectVariant,
+} from '@patternfly/react-core/deprecated';
 import { translate as __ } from 'foremanReact/common/I18n';
 import PropTypes from 'prop-types';
 import { useAPI } from 'foremanReact/common/hooks/API/APIHooks';

data/webpack/scenes/Hosts/ChangeContentSource/components/ContentSourceTemplate.js

@@ -97,14 +97,15 @@ const ContentSourceTemplate = ({ template, hostCount }) => {
         <CodeBlock actions={actions} className="cs_template_code margin-top-20">
           <CodeBlockCode>
             {__('Change content source')}
-            <ExpandableSection isExpanded={isExpanded} isDetached>
+            <ExpandableSection contentId="code-block-expand-content" toggleId="code-block-expand-toggle" isExpanded={isExpanded} isDetached >
               {template}
             </ExpandableSection>
           </CodeBlockCode>
           <ExpandableSectionToggle
             isExpanded={isExpanded}
             onToggle={() => setIsExpanded(!isExpanded)}
-            contentId="code-block-expand"
+            contentId="code-block-expand-content"
+            toggleId="code-block-expand-toggle"
             direction="up"
           >
             {isExpanded ? 'Show less' : 'Show more'}

data/webpack/scenes/Hosts/ChangeContentSource/components/FormField.js

@@ -16,7 +16,7 @@ const FormField = ({
       <FormSelect
         ouiaId={`${id}_select`}
         value={value}
-        onChange={v => onChange(v)}
+        onChange={(_event, v) => onChange(v)}
         className="without_select2"
         isDisabled={isDisabled}
         id={`${id}_select`}

data/webpack/scenes/Hosts/ChangeContentSource/components/HostsModal.js

@@ -29,7 +29,7 @@ const HostsModal = ({
       <SearchInput
         placeholder={__('Search')}
         value={search}
-        onChange={v => setSearch(v)}
+        onChange={(e, v) => setSearch(v)}
         onClear={() => setSearch('')}
       />
       <List isPlain isBordered className="margin-top-16">

data/webpack/scenes/RedHatRepositories/components/EnabledRepository/EnabledRepositoryContent.js

@@ -9,7 +9,7 @@ const EnabledRepositoryContent = ({
 }) => (
   <Spinner loading={loading} inline>
     <OverlayTrigger
-      overlay={<Tooltip id={disableTooltipId}>{canDisable ? __('Disable') : __('Cannot be disabled because it is part of a published content view')}</Tooltip>}
+      overlay={<Tooltip id={disableTooltipId}>{canDisable ? __('Disable') : __('Cannot be disabled because it is part of a content view')}</Tooltip>}
       placement="bottom"
       trigger={['hover', 'focus']}
       rootClose={false}

data/webpack/scenes/RedHatRepositories/components/EnabledRepository/__tests__/__snapshots__/EnabledRepositoryContent.test.js.snap

@@ -16,7 +16,7 @@ exports[`Enabled Repositories Content Component should render 1`] = `
         id="disable-1"
         placement="right"
       >
-        Cannot be disabled because it is part of a published content view
+        Cannot be disabled because it is part of a content view
       </Tooltip>
     }
     placement="bottom"

data/webpack/scenes/RedHatRepositories/index.scss

@@ -33,7 +33,7 @@
         .foreman-search-bar {
           flex-grow: 1;
           margin-left: 0.7rem;
-          .pf-c-search-input {
+          .pf-v5-c-search-input {
             width: 100%;
           }
         }

data/webpack/scenes/SmartProxy/ExpandableCvDetails.js

@@ -2,7 +2,7 @@ import React from 'react';
 import PropTypes from 'prop-types';
 import { useDispatch } from 'react-redux';
 import { translate as __ } from 'foremanReact/common/I18n';
-import { TableComposable, Thead, Tr, Th, Tbody, Td } from '@patternfly/react-table';
+import { Table /* data-codemods */, Thead, Tr, Th, Tbody, Td } from '@patternfly/react-table';
 import { CheckCircleIcon, TimesCircleIcon } from '@patternfly/react-icons';
 import LongDateTime from 'foremanReact/components/common/dates/LongDateTime';
 import { urlBuilder } from 'foremanReact/common/urlHelpers';
@@ -32,14 +32,27 @@ const ExpandableCvDetails = ({
     },
   });
 
+  const anyRepoInEnv = (repositories) => {
+    if (repositories && Object.values(repositories)) {
+      return Object.values(repositories).some(repo => repo.metadata.env_id === envId);
+    }
+    return false;
+  };
+
+  const getSyncedToCapsuleStatus = (upToDate, versionId) => {
+    if (upToDate) return upToDate;
+    if (anyRepoInEnv(contentCounts?.content_view_versions?.[versionId]?.repositories)) return 'partial';
+    return false;
+  };
+
   return (
-    <TableComposable
+    <Table
       aria-label="expandable-content-views"
       ouiaId="expandable-content-views"
     >
       <Thead>
         <Tr ouiaId="column-headers">
-          <Th />
+          <Th aria-label="select header" />
           {columnHeaders.map(col => (
             <Th
               key={col}
@@ -51,10 +64,16 @@ const ExpandableCvDetails = ({
       </Thead>
       {contentViews.map((cv, rowIndex) => {
         const {
-          id, name: cvName, composite, up_to_date: upToDate,
+          id, name: cvName, composite, rolling, up_to_date: upToDate,
           cvv_id: versionId, cvv_version: version, repositories,
         } = cv;
-        const upToDateVal = upToDate ? <CheckCircleIcon style={{ color: 'green' }} /> : <TimesCircleIcon style={{ color: 'red' }} />;
+        let upToDateVal;
+        if (upToDate === true) {
+          upToDateVal = <CheckCircleIcon style={{ color: 'green' }} />;
+        } else {
+          upToDateVal = <TimesCircleIcon style={{ color: 'red' }} />;
+        }
+
         const isExpanded = tableRowIsExpanded(versionId);
         return (
           <Tbody key={`${id} + ${versionId}`}isExpanded={isExpanded}>
@@ -72,6 +91,7 @@ const ExpandableCvDetails = ({
               <Td>
                 <ContentViewIcon
                   composite={composite}
+                  rolling={rolling}
                   description={<a href={cv.default ? urlBuilder('products', '') : urlBuilder('content_views', '', id)}>{cvName}</a>}
                 />
               </Td>
@@ -92,7 +112,7 @@ const ExpandableCvDetails = ({
                 <ExpandedSmartProxyRepositories
                   contentCounts={contentCounts?.content_view_versions?.[versionId]?.repositories}
                   repositories={repositories}
-                  syncedToCapsule={upToDate}
+                  syncedToCapsule={getSyncedToCapsuleStatus(upToDate, versionId)}
                   envId={envId}
                 />
               </Td>
@@ -101,7 +121,7 @@ const ExpandableCvDetails = ({
         );
       })}
 
-    </TableComposable>
+    </Table>
 
   );
 };

data/webpack/scenes/SmartProxy/ExpandedSmartProxyRepositories.js

@@ -40,7 +40,7 @@ const ExpandedSmartProxyRepositories = ({
   const dataListCellListsNotSynced = (repo) => {
     const cellList = [];
     /* eslint-disable max-len */
-    cellList.push(<DataListCell key={`${repo.id}-name`}><span><a href={`/products/${repo.product_id}/repositories/${repo.library_id}/`}>{repo.name}</a></span></DataListCell>);
+    cellList.push(<DataListCell key={`${repo.id}-name`}><span><a href={`/products/${repo.product_id}/repositories/${repo.library_id || repo.id}/`}>{repo.name}</a></span></DataListCell>);
     cellList.push(<DataListCell key={`${repo.id}-type`}><RepoIcon type={repo.content_type} identifier={repo.id} /></DataListCell>);
     cellList.push(<DataListCell key={`${repo.id}-rpm`}><span><InactiveText text="N/A" /></span></DataListCell>);
     cellList.push(<DataListCell key={`${repo.id}-count`}><InactiveText text="N/A" /></DataListCell>);
@@ -84,6 +84,52 @@ const ExpandedSmartProxyRepositories = ({
     );
   };
 
+  const getUnsyncedRepositoriesDataListItems = () => {
+    const countedRepoLibraryIds = Object.values(envContentCounts).map(count =>
+      count.metadata.library_instance_id);
+    const repositoriesNotSynced = repositories.filter(repo =>
+      !countedRepoLibraryIds.includes(repo.library_id || repo.id));
+    if (repositoriesNotSynced?.length) {
+      return repositoriesNotSynced.map((repo, index) => {
+        if (!envContentCounts[repo.id]) {
+          return (
+            <DataListItem key={`${repo.id}-${index}`}>
+              <DataListItemRow>
+                <DataListItemCells
+                  dataListCells={dataListCellListsNotSynced(repo)}
+                />
+              </DataListItemRow>
+            </DataListItem>
+          );
+        }
+        return <></>;
+      });
+    }
+    return <></>;
+  };
+
+  if (syncedToCapsule === 'partial') {
+    return (
+      <DataList aria-label="Expanded repository details" isCompact>
+        <DataListItem key="headers" >
+          <DataListItemRow>
+            <DataListItemCells dataListCells={[
+              <DataListCell key="primary content">
+                <b>{__('Repository')}</b>
+              </DataListCell>,
+              <DataListCell key="Type"><b>{__('Type')}</b></DataListCell>,
+              <DataListCell key="Package count"><b>{__('Packages')}</b></DataListCell>,
+              <DataListCell key="Additional content"><b>{__('Additional content')}</b></DataListCell>,
+            ]}
+            />
+          </DataListItemRow>
+        </DataListItem>
+        {getDataListItems()}
+        {getUnsyncedRepositoriesDataListItems()}
+      </DataList>
+    );
+  }
+
   if (syncedToCapsule) {
     return (
       <DataList aria-label="Expanded repository details" isCompact>
@@ -142,7 +188,10 @@ const ExpandedSmartProxyRepositories = ({
 ExpandedSmartProxyRepositories.propTypes = {
   contentCounts: PropTypes.shape({}),
   repositories: PropTypes.arrayOf(PropTypes.shape({})),
-  syncedToCapsule: PropTypes.bool,
+  syncedToCapsule: PropTypes.oneOfType([
+    PropTypes.bool,
+    PropTypes.string, // The API can return true/false or 'partial' for partially synced CVs
+  ]),
   envId: PropTypes.oneOfType([
     PropTypes.number,
     PropTypes.string, // The API can sometimes return strings

data/webpack/scenes/SmartProxy/SmartProxyExpandableTable.js

@@ -75,7 +75,7 @@ const SmartProxyExpandableTable = ({ smartProxyId, organizationId }) => {
     >
       <Thead>
         <Tr ouiaId="cvTableHeaderRow">
-          <Th key="expand-carat" />
+          <Th key="expand-carat" aria-label="expand table header" />
           {columnHeaders.map(col => (
             <Th
               key={col}
@@ -83,7 +83,7 @@ const SmartProxyExpandableTable = ({ smartProxyId, organizationId }) => {
               {col}
             </Th>
           ))}
-          <Th key="action-menu" />
+          <Th key="action-menu" aria-label="action menu table header" />
         </Tr>
       </Thead>
       {

data/webpack/scenes/SmartProxy/__tests__/SmartProxyContentTest.js

@@ -1,5 +1,5 @@
 import React from 'react';
-import { renderWithRedux, patientlyWaitFor, within } from 'react-testing-lib-wrapper';
+import { renderWithRedux, patientlyWaitFor, fireEvent, within, act } from 'react-testing-lib-wrapper';
 
 import { nockInstance, assertNockRequest } from '../../../test-utils/nockWrapper';
 import api from '../../../services/api';
@@ -47,7 +47,8 @@ test('Can display Smart proxy content table and expand env and cv details', asyn
   expect(getAllByText(/7 errata/i)[0]).toBeInTheDocument();
   expect(getAllByText(/14 Module streams/i)[0]).toBeInTheDocument();
   expect(getAllByText(/2 Package groups/i)[0]).toBeInTheDocument();
-  assertNockRequest(detailsScope, done);
+  assertNockRequest(detailsScope);
+  done();
 });
 
 test('Handles empty content_counts and displays N/A for Packages and Additional content', async (done) => {
@@ -100,17 +101,19 @@ test('Can call content count refresh for environment', async (done) => {
     .reply(202);
 
   const {
-    getByText, queryAllByLabelText,
+    getByText, getAllByLabelText,
   } = renderWithRedux(contentTable);
   await patientlyWaitFor(() => expect(getByText('Environment')).toBeInTheDocument());
-  const envRowActions = queryAllByLabelText('Actions')[0];
-  envRowActions.click();
+  expect(getAllByLabelText('Kebab toggle')[0]).toHaveAttribute('aria-expanded', 'false');
+  fireEvent.click(getAllByLabelText('Kebab toggle')[0]);
+  expect(getAllByLabelText('Kebab toggle')[0]).toHaveAttribute('aria-expanded', 'true');
   await patientlyWaitFor(() => expect(getByText('Refresh counts')).toBeInTheDocument());
   const refreshEnv = getByText('Refresh counts');
   refreshEnv.click();
 
   assertNockRequest(detailsScope);
   assertNockRequest(countsEnvRefreshScope, done);
+  act(done);
 });
 
 test('Can call content count refresh for content view', async (done) => {
@@ -128,7 +131,7 @@ test('Can call content count refresh for content view', async (done) => {
 
 
   const {
-    getByText, getAllByText, getByLabelText, queryAllByLabelText,
+    getByText, getAllByText, getByLabelText, getAllByLabelText,
   } = renderWithRedux(contentTable);
   await patientlyWaitFor(() => expect(getByText('Environment')).toBeInTheDocument());
   const tdEnvExpand = getByLabelText('expand-env-1');
@@ -138,13 +141,15 @@ test('Can call content count refresh for content view', async (done) => {
   expect(getAllByText('Last published')[0]).toBeInTheDocument();
   expect(getAllByText('Repository')[0]).toBeInTheDocument();
   expect(getAllByText('Synced')[0]).toBeInTheDocument();
-  const cvRowActions = queryAllByLabelText('Actions')[1];
-  cvRowActions.click();
+  expect(getAllByLabelText('Kebab toggle')[1]).toHaveAttribute('aria-expanded', 'false');
+  fireEvent.click(getAllByLabelText('Kebab toggle')[1]);
+  expect(getAllByLabelText('Kebab toggle')[1]).toHaveAttribute('aria-expanded', 'true');
 
   await patientlyWaitFor(() => expect(getByText('Refresh counts')).toBeInTheDocument());
   const refreshCvCounts = getByText('Refresh counts');
   refreshCvCounts.click();
 
-  assertNockRequest(detailsScope, done);
+  assertNockRequest(detailsScope);
   assertNockRequest(countsCVRefreshScope, done);
+  act(done);
 });

data/webpack/scenes/Subscriptions/Manifest/CdnConfigurationTab/CdnConfigurationForm.scss

@@ -1,5 +1,5 @@
 #cdn-configuration {
-  .pf-c-form__group.pf-m-action {
+  .pf-v5-c-form__group.pf-m-action {
     margin-top: 0px;
   }
 }

data/webpack/scenes/Subscriptions/Manifest/CdnConfigurationTab/CustomCdnTypeForm.js

@@ -92,7 +92,7 @@ const CustomCdnTypeForm = ({
           aria-label="cdn-url"
           type="text"
           value={url || ''}
-          onChange={value => setUrl(value)}
+          onChange={(_event, value) => setUrl(value)}
           isDisabled={updatingCdnConfiguration}
         />
       </FormGroup>
@@ -105,7 +105,7 @@ const CustomCdnTypeForm = ({
           aria-label="cdn-ssl-ca-content-credential"
           value={sslCaCredentialValue || ''}
           isDisabled={updatingCdnConfiguration}
-          onChange={value => setSslCaCredentialId(value)}
+          onChange={(_event, value) => setSslCaCredentialId(value)}
         >
           <FormSelectOption label={__('N/A')} />
           {contentCredentials.map(cred =>

data/webpack/scenes/Subscriptions/Manifest/CdnConfigurationTab/NetworkSyncForm.js

@@ -156,7 +156,7 @@ const NetworkSyncForm = ({
             aria-label="cdn-url"
             type="text"
             value={url || ''}
-            onChange={value => setUrl(value)}
+            onChange={(_event, value) => setUrl(value)}
             isDisabled={updatingCdnConfiguration}
           />
         </FormGroup>
@@ -169,7 +169,7 @@ const NetworkSyncForm = ({
             aria-label="cdn-username"
             type="text"
             value={username || ''}
-            onChange={value => setUsername(value)}
+            onChange={(_event, value) => setUsername(value)}
             isDisabled={updatingCdnConfiguration}
           />
         </FormGroup>
@@ -197,7 +197,7 @@ const NetworkSyncForm = ({
             type="text"
             value={upstreamOrganizationLabel || ''}
             isDisabled={updatingCdnConfiguration}
-            onChange={setUpstreamOrganizationLabel}
+            onChange={(_event, val) => setUpstreamOrganizationLabel(val)}
           />
         </FormGroup>
         <FormGroup
@@ -209,7 +209,7 @@ const NetworkSyncForm = ({
             type="text"
             value={upstreamLifecycleEnvironmentLabel || ''}
             isDisabled={updatingCdnConfiguration}
-            onChange={setUpstreamLifecycleEnvironmentLabel}
+            onChange={(_event, val) => setUpstreamLifecycleEnvironmentLabel(val)}
           />
         </FormGroup>
         <FormGroup
@@ -221,7 +221,7 @@ const NetworkSyncForm = ({
             type="text"
             value={upstreamContentViewLabel || ''}
             isDisabled={updatingCdnConfiguration}
-            onChange={setUpstreamContentViewLabel}
+            onChange={(_event, val) => setUpstreamContentViewLabel(val)}
           />
         </FormGroup>
         <FormGroup
@@ -233,7 +233,7 @@ const NetworkSyncForm = ({
             aria-label="cdn-ssl-ca-content-credential"
             value={sslCaCredentialValue || ''}
             isDisabled={updatingCdnConfiguration}
-            onChange={value => setSslCaCredentialId(value)}
+            onChange={(_event, value) => setSslCaCredentialId(value)}
           >
             <FormSelectOption label={__('Select one')} isDisabled isPlaceholder />
             {contentCredentials.map(cred =>

data/webpack/scenes/Subscriptions/Manifest/CdnConfigurationTab/__tests__/CdnTypeForm.test.js

@@ -38,5 +38,6 @@ test('Can update to cdn type', async (done) => {
 
   const updateButton = getByLabelText(updateButtonName);
   fireEvent.click(updateButton);
-  assertNockRequest(updateCdnConfigurationRequest, done);
+  assertNockRequest(updateCdnConfigurationRequest);
+  done();
 });

data/webpack/scenes/Subscriptions/Manifest/CdnConfigurationTab/__tests__/CustomCdnTypeForm.test.js

@@ -66,7 +66,8 @@ test('Can update the custom cdn server configuration', async (done) => {
   const updateButton = getByLabelText(updateButtonName);
   fireEvent.click(updateButton);
 
-  assertNockRequest(updateCdnConfigurationRequest, done);
+  assertNockRequest(updateCdnConfigurationRequest);
+  done();
 });
 
 test('the form shall reflect the given cdnConfiguration', () => {

data/webpack/scenes/Subscriptions/Manifest/CdnConfigurationTab/__tests__/ExportSyncForm.test.js

@@ -39,6 +39,7 @@ test('Can update to Airgapped type', async (done) => {
 
   const updateButton = getByLabelText(updateButtonName);
   fireEvent.click(updateButton);
-  assertNockRequest(updateCdnConfigurationRequest, done);
+  assertNockRequest(updateCdnConfigurationRequest);
+  done();
 });
 

data/webpack/scenes/Subscriptions/Manifest/CdnConfigurationTab/__tests__/NetworkSyncForm.test.js

@@ -88,7 +88,8 @@ test('Can update the upstream server configuration', async (done) => {
   const updateButton = getByLabelText(updateButtonName);
   fireEvent.click(updateButton);
 
-  assertNockRequest(updateCdnConfigurationRequest, done);
+  assertNockRequest(updateCdnConfigurationRequest);
+  done();
 });
 
 test('the form shall reflect the given cdnConfiguration', () => {