katello 4.16.3 → 4.17.0.rc1

data/webpack/scenes/ContentViews/Delete/ContentViewDeleteWizard.js

@@ -2,7 +2,9 @@ import React, { useEffect, useState } from 'react';
 import { useSelector, useDispatch } from 'react-redux';
 import PropTypes from 'prop-types';
 import useDeepCompareEffect from 'use-deep-compare-effect';
-import { Wizard } from '@patternfly/react-core';
+import {
+  Wizard,
+} from '@patternfly/react-core/deprecated';
 import { translate as __ } from 'foremanReact/common/I18n';
 import { STATUS } from 'foremanReact/constants';
 import CVDeleteEnvironmentSelection from './Steps/CVDeleteEnvironmentsSelection';

data/webpack/scenes/ContentViews/Delete/Steps/CVDeleteEnvironmentsSelection.js

@@ -1,7 +1,7 @@
 import React, { useContext, useState, useEffect } from 'react';
 import { ExpandableSection, Flex, FlexItem } from '@patternfly/react-core';
 import { ExclamationTriangleIcon } from '@patternfly/react-icons';
-import { TableVariant, TableComposable, Thead, Tbody, Tr, Th, Td } from '@patternfly/react-table';
+import { TableVariant, Table /* data-codemods */, Thead, Tbody, Tr, Th, Td } from '@patternfly/react-table';
 import { translate as __ } from 'foremanReact/common/I18n';
 import { STATUS } from 'foremanReact/constants';
 import CVDeleteContext from '../CVDeleteContext';
@@ -60,14 +60,14 @@ const CVDeleteEnvironmentSelection = () => {
             <ExpandableSection
               key={version.id}
               toggleText={__(`Version ${version.version}`)}
-              onToggle={expanded => setExpanded(index, expanded)}
+              onToggle={(_event, expanded) => setExpanded(index, expanded)}
               isExpanded={versionExpanded[index]}
             >
               {(version?.environments.length !== 0) ?
-                <TableComposable ouiaId="cv-delete-env-select-table" variant={TableVariant.compact}>
+                <Table ouiaId="cv-delete-env-select-table" variant={TableVariant.compact}>
                   <Thead>
                     <Tr ouiaId="cv-delete-env-select-table-header">
-                      <Th />
+                      <Th aria-label="select header" />
                       {columnHeaders.map(col =>
                         <Th key={col}>{col}</Th>)}
                     </Tr>
@@ -84,7 +84,7 @@ const CVDeleteEnvironmentSelection = () => {
                             select={{
                               rowIndex,
                               isSelected: true,
-                              disable: true,
+                              isDisabled: true,
                             }}
                           />
                           <Td>
@@ -96,7 +96,7 @@ const CVDeleteEnvironmentSelection = () => {
                       );
                     })}
                   </Tbody>
-                </TableComposable> :
+                </Table> :
                 <InactiveText text={__('This version is not promoted to any environments.')} />
               }
             </ExpandableSection>

data/webpack/scenes/ContentViews/Delete/Steps/CVDeletionReassignActivationKeysForm.js

@@ -1,7 +1,12 @@
 import React, { useContext, useState } from 'react';
 import { useDispatch, useSelector } from 'react-redux';
 import useDeepCompareEffect from 'use-deep-compare-effect';
-import { ExpandableSection, SelectOption } from '@patternfly/react-core';
+import {
+  ExpandableSection,
+} from '@patternfly/react-core';
+import {
+  SelectOption,
+} from '@patternfly/react-core/deprecated';
 import { translate as __ } from 'foremanReact/common/I18n';
 import { STATUS } from 'foremanReact/constants';
 import getContentViews from '../../ContentViewsActions';
@@ -117,7 +122,7 @@ const CVDeletionReassignActivationKeysForm = () => {
         toggleText={showActivationKeys ?
           'Hide activation keys' :
           'Show activation keys'}
-        onToggle={expanded => setShowActivationKeys(expanded)}
+        onToggle={(_event, expanded) => setShowActivationKeys(expanded)}
         isExpanded={showActivationKeys}
       >
         <AffectedActivationKeys

data/webpack/scenes/ContentViews/Delete/Steps/CVDeletionReassignHostsForm.js

@@ -1,7 +1,12 @@
 import React, { useState, useContext } from 'react';
 import { useDispatch, useSelector } from 'react-redux';
 import useDeepCompareEffect from 'use-deep-compare-effect';
-import { ExpandableSection, SelectOption } from '@patternfly/react-core';
+import {
+  ExpandableSection,
+} from '@patternfly/react-core';
+import {
+  SelectOption,
+} from '@patternfly/react-core/deprecated';
 import { translate as __ } from 'foremanReact/common/I18n';
 import { STATUS } from 'foremanReact/constants';
 import getContentViews from '../../ContentViewsActions';
@@ -117,7 +122,7 @@ const CVDeletionReassignHostsForm = () => {
       </ContentViewSelect>
       <ExpandableSection
         toggleText={showHosts ? 'Hide hosts' : 'Show hosts'}
-        onToggle={expanded => setShowHosts(expanded)}
+        onToggle={(_event, expanded) => setShowHosts(expanded)}
         isExpanded={showHosts}
       >
         <AffectedHosts

data/webpack/scenes/ContentViews/Delete/Steps/CVDeletionReview.js

@@ -36,7 +36,7 @@ const CVDeletionReview = () => {
           </Flex>
           <Flex>
             {cvEnvironments?.map(({ name, id }) =>
-              <FlexItem key={name}><Label isTruncated color="purple" href={`/lifecycle_environments/${id}`}>{name}</Label></FlexItem>)}
+              <FlexItem key={name}><Label color="purple" href={`/lifecycle_environments/${id}`}>{name}</Label></FlexItem>)}
           </Flex>
         </>}
       {affectedHosts &&
@@ -45,7 +45,7 @@ const CVDeletionReview = () => {
           <Flex>
             <FlexItem><ExclamationTriangleIcon /></FlexItem>
             <FlexItem><p>{__(`${pluralize(hostResponse.length, 'host')} will be moved to content view ${selectedCVNameForHosts} in `)}</p></FlexItem>
-            <FlexItem><Label isTruncated color="purple" href={`/lifecycle_environments/${selectedEnvForHost[0].id}`}>{selectedEnvForHost[0].name}</Label></FlexItem>
+            <FlexItem><Label color="purple" href={`/lifecycle_environments/${selectedEnvForHost[0].id}`}>{selectedEnvForHost[0].name}</Label></FlexItem>
           </Flex>
         </>}
       {affectedActivationKeys &&
@@ -54,7 +54,7 @@ const CVDeletionReview = () => {
           <Flex>
             <FlexItem><ExclamationTriangleIcon /></FlexItem>
             <FlexItem><p>{__(`${pluralize(akResponse.length, 'activation key')} will be moved to content view ${selectedCVNameForAK} in `)}</p></FlexItem>
-            <FlexItem><Label isTruncated color="purple" href={`/lifecycle_environments/${selectedEnvForAK[0].id}`}>{selectedEnvForAK[0].name}</Label></FlexItem>
+            <FlexItem><Label color="purple" href={`/lifecycle_environments/${selectedEnvForAK[0].id}`}>{selectedEnvForAK[0].name}</Label></FlexItem>
           </Flex>
         </>}
     </>

data/webpack/scenes/ContentViews/Delete/Steps/CVEnvironmentSelectionForm.scss

@@ -1,5 +1,5 @@
 #content-view-delete-wizard {
-  .pf-c-expandable-section__content {
+  .pf-v5-c-expandable-section__content {
     margin-bottom: 1em;
     margin-top: 1em;
   }

data/webpack/scenes/ContentViews/Delete/__tests__/CvData.fixtures.json

@@ -14,6 +14,7 @@
   "results": [
     {
       "composite": false,
+      "rolling": false,
       "component_ids": [],
       "default": false,
       "version_count": 4,
@@ -258,4 +259,4 @@
       }
     }
   ]
-}
+}

data/webpack/scenes/ContentViews/Delete/__tests__/affectedHosts.fixtures.json

@@ -113,7 +113,8 @@
         "content_view": {
           "id": 20,
           "name": "cv3",
-          "composite": false
+          "composite": false,
+          "rolling": false
         },
         "lifecycle_environment": {
           "id": 2,
@@ -138,4 +139,4 @@
       }
     }
   ]
-}
+}

data/webpack/scenes/ContentViews/Delete/__tests__/contentViewDelete.test.js

@@ -72,9 +72,9 @@ test('Can call API for CVs and show Delete Wizard for the row', async (done) =>
   expect(queryByText(firstCV.name)).toBeNull();
   // Assert that the CV name is now showing on the screen, but wait for it to appear.
   await patientlyWaitFor(() => expect(queryByText(firstCV.name)).toBeInTheDocument());
-  expect(getAllByLabelText('Actions')[0]).toHaveAttribute('aria-expanded', 'false');
-  fireEvent.click(getAllByLabelText('Actions')[0]);
-  expect(getAllByLabelText('Actions')[0]).toHaveAttribute('aria-expanded', 'true');
+  expect(getAllByLabelText('Kebab toggle')[0]).toHaveAttribute('aria-expanded', 'false');
+  fireEvent.click(getAllByLabelText('Kebab toggle')[0]);
+  expect(getAllByLabelText('Kebab toggle')[0]).toHaveAttribute('aria-expanded', 'true');
   fireEvent.click(getByText('Delete'));
   await patientlyWaitFor(() => expect(getAllByText('Remove versions from environments')[1]).toBeInTheDocument());
 
@@ -82,7 +82,8 @@ test('Can call API for CVs and show Delete Wizard for the row', async (done) =>
   assertNockRequest(autocompleteScope);
   assertNockRequest(envPathDeleteScope);
   assertNockRequest(cvDetailsScope);
-  assertNockRequest(cvVersionsScope, done);
+  assertNockRequest(cvVersionsScope);
+  done();
 });
 
 test('Can open Delete wizard and delete CV with all steps', async (done) => {
@@ -152,9 +153,9 @@ test('Can open Delete wizard and delete CV with all steps', async (done) => {
   expect(queryByText(firstCV.name)).toBeNull();
   // Assert that the CV name is now showing on the screen, but wait for it to appear.
   await patientlyWaitFor(() => expect(queryByText(firstCV.name)).toBeInTheDocument());
-  expect(getAllByLabelText('Actions')[0]).toHaveAttribute('aria-expanded', 'false');
-  fireEvent.click(getAllByLabelText('Actions')[0]);
-  expect(getAllByLabelText('Actions')[0]).toHaveAttribute('aria-expanded', 'true');
+  expect(getAllByLabelText('Kebab toggle')[0]).toHaveAttribute('aria-expanded', 'false');
+  fireEvent.click(getAllByLabelText('Kebab toggle')[0]);
+  expect(getAllByLabelText('Kebab toggle')[0]).toHaveAttribute('aria-expanded', 'true');
   fireEvent.click(getByText('Delete'));
   await patientlyWaitFor(() => {
     expect(getAllByText('Remove versions from environments')[1]).toBeInTheDocument();
@@ -223,6 +224,7 @@ test('Can open Delete wizard and delete CV with all steps', async (done) => {
   assertNockRequest(activationKeysScope);
   assertNockRequest(cVDropDownOptionsScope);
   assertNockRequest(cvDeleteScope);
-  assertNockRequest(cvRedirectScope, done);
+  assertNockRequest(cvRedirectScope);
+  done();
   act(done);
 });

data/webpack/scenes/ContentViews/Delete/__tests__/cvDetails.fixtures.json

@@ -1,6 +1,7 @@
 {
   "content_host_count": 1,
   "composite": false,
+  "rolling": false,
   "component_ids": [],
   "default": false,
   "version_count": 4,
@@ -245,4 +246,4 @@
   },
   "duplicate_repositories_to_publish": [],
   "errors": null
-}
+}

data/webpack/scenes/ContentViews/Details/ComponentContentViews/ComponentContentViewAddModal.js

@@ -1,10 +1,21 @@
 import React, { useState, useMemo } from 'react';
 import PropTypes from 'prop-types';
 import {
-  Flex, Modal, ModalVariant, Select, SelectVariant,
-  SelectOption, Checkbox, Form, FormGroup,
-  ActionGroup, Button, Tooltip,
+  Flex,
+  Modal,
+  ModalVariant,
+  Checkbox,
+  Form,
+  FormGroup,
+  ActionGroup,
+  Button,
+  Tooltip,
 } from '@patternfly/react-core';
+import {
+  Select,
+  SelectVariant,
+  SelectOption,
+} from '@patternfly/react-core/deprecated';
 import { OutlinedQuestionCircleIcon } from '@patternfly/react-icons';
 import { useDispatch, useSelector, shallowEqual } from 'react-redux';
 import { translate as __ } from 'foremanReact/common/I18n';
@@ -105,7 +116,7 @@ const ComponentContentViewAddModal = ({
             id="horzontal-form-title"
             name="horizontal-form-title"
             isOpen={cvVersionSelectOpen}
-            onToggle={isExpanded => setCvVersionSelectOpen(isExpanded)}
+            onToggle={(_event, isExpanded) => setCvVersionSelectOpen(isExpanded)}
             aria-label="CvVersion"
             ouiaId="select-cv-version"
             menuAppendTo="parent"
@@ -131,7 +142,7 @@ const ComponentContentViewAddModal = ({
               name="latest"
               label={__('Always update to latest version')}
               isChecked={formLatest}
-              onChange={checked => updateLatest(checked)}
+              onChange={(_event, checked) => updateLatest(checked)}
             />
             <Tooltip
               position="top"

data/webpack/scenes/ContentViews/Details/ComponentContentViews/ComponentContentViewBulkAddModal.js

@@ -1,10 +1,24 @@
 import React, { useState } from 'react';
 import PropTypes from 'prop-types';
 import {
-  Flex, Modal, ModalVariant, Select, SelectVariant,
-  SelectOption, Checkbox, Form, FormGroup,
-  ActionGroup, Button, Card, CardTitle, CardBody, Tooltip,
+  Flex,
+  Modal,
+  ModalVariant,
+  Checkbox,
+  Form,
+  FormGroup,
+  ActionGroup,
+  Button,
+  Card,
+  CardTitle,
+  CardBody,
+  Tooltip,
 } from '@patternfly/react-core';
+import {
+  Select,
+  SelectVariant,
+  SelectOption,
+} from '@patternfly/react-core/deprecated';
 import { OutlinedQuestionCircleIcon } from '@patternfly/react-icons';
 import { useDispatch } from 'react-redux';
 import { translate as __ } from 'foremanReact/common/I18n';
@@ -78,7 +92,7 @@ const ComponentContentViewBulkAddModal = ({ cvId, rowsToAdd, onClose }) => {
                   }
                   }
                   isOpen={cvVersionSelectOpen === componentCvName}
-                  onToggle={isExpanded => setCvVersionSelectOpen(isExpanded ? componentCvName : '')}
+                  onToggle={(_event, isExpanded) => setCvVersionSelectOpen(isExpanded ? componentCvName : '')}
                   id={`horzontal-form-title-${componentCvName}-${cvVersionSelectOpen[componentCvName]}`}
                   name="horizontal-form-title"
                   aria-label={`version-select-${componentCvName}`}
@@ -106,7 +120,7 @@ const ComponentContentViewBulkAddModal = ({ cvId, rowsToAdd, onClose }) => {
                     name="latest"
                     label={__('Always update to latest version')}
                     isChecked={selectedComponentLatest[componentCvName]}
-                    onChange={(checked) => {
+                    onChange={(_event, checked) => {
                       setSelectedComponentLatest({
                         ...selectedComponentLatest,
                         ...{ [componentCvName]: checked },

data/webpack/scenes/ContentViews/Details/ComponentContentViews/ComponentEnvironments.js

@@ -8,7 +8,7 @@ const ComponentEnvironments = ({ environments }) => environments.map((env, index
     style={{ margin: `4px 0 4px ${index > 0 ? '4px' : '0'}` }}
     color="purple"
     href={`/lifecycle_environments/${env.id}`}
-    isTruncated
+
   >
     {env.name}
   </Label>

data/webpack/scenes/ContentViews/Details/ComponentContentViews/ContentViewComponents.js

@@ -2,9 +2,18 @@ import React, { useState, useCallback } from 'react';
 import useDeepCompareEffect from 'use-deep-compare-effect';
 import { useDispatch, useSelector } from 'react-redux';
 import {
-  Bullseye, Split, SplitItem, Button, ActionList,
-  ActionListItem, Dropdown, DropdownItem, KebabToggle,
+  Bullseye,
+  Split,
+  SplitItem,
+  Button,
+  ActionList,
+  ActionListItem,
 } from '@patternfly/react-core';
+import {
+  Dropdown,
+  DropdownItem,
+  KebabToggle,
+} from '@patternfly/react-core/deprecated';
 import { TableVariant, fitContent, TableText } from '@patternfly/react-table';
 import { PencilAltIcon } from '@patternfly/react-icons';
 import { STATUS } from 'foremanReact/constants';

data/webpack/scenes/ContentViews/Details/ComponentContentViews/__tests__/compositeCVDetails.fixtures.json

@@ -1,6 +1,7 @@
 {
   "content_host_count": 0,
   "composite": true,
+  "rolling": false,
   "component_ids": [
     5,
     7
@@ -390,4 +391,4 @@
     "promote_or_remove_content_views": true
   },
   "errors": null
-}
+}

data/webpack/scenes/ContentViews/Details/ComponentContentViews/__tests__/contentViewComponents.test.js

@@ -1,5 +1,5 @@
 import React from 'react';
-import { renderWithRedux, patientlyWaitFor, fireEvent } from 'react-testing-lib-wrapper';
+import { renderWithRedux, patientlyWaitFor, fireEvent, act } from 'react-testing-lib-wrapper';
 import { nockInstance, assertNockRequest, mockAutocomplete } from '../../../../../test-utils/nockWrapper';
 import api from '../../../../../services/api';
 import CONTENT_VIEWS_KEY from '../../../ContentViewsConstants';
@@ -47,7 +47,8 @@ test('Can call API and show components on page load', async (done) => {
   await patientlyWaitFor(() => expect(getByText(firstComponent.content_view.label))
     .toBeInTheDocument());
   assertNockRequest(autocompleteScope);
-  assertNockRequest(scope, done);
+  assertNockRequest(scope);
+  done();
 });
 
 test('Can call API and show unpublished components', async (done) => {
@@ -71,7 +72,8 @@ test('Can call API and show unpublished components', async (done) => {
     expect(getAllByText('Not yet published')).toHaveLength(4);
   });
   assertNockRequest(autocompleteScope);
-  assertNockRequest(scope, done);
+  assertNockRequest(scope);
+  done();
 });
 
 test('Can link to view environment', async () => {
@@ -150,7 +152,8 @@ test('Can search for component content views in composite view', async (done) =>
 
   assertNockRequest(autocompleteScope);
   assertNockRequest(cvComponentsScope);
-  assertNockRequest(withSearchScope, done);
+  assertNockRequest(withSearchScope);
+  done();
 });
 
 test('Can handle no components being present', async (done) => {
@@ -183,7 +186,8 @@ test('Can handle no components being present', async (done) => {
   expect(queryByText(firstComponent.content_view.label)).toBeNull();
   await patientlyWaitFor(() => expect(queryByText('No content views to add yet')).toBeInTheDocument());
   assertNockRequest(autocompleteScope);
-  assertNockRequest(scope, done);
+  assertNockRequest(scope);
+  done();
 });
 
 test('Can add published component views to content view with modal', async (done) => {
@@ -216,33 +220,46 @@ test('Can add published component views to content view with modal', async (done
     .reply(200, compositeCvDetails);
 
   const {
-    getByText, getByLabelText, queryByLabelText, getAllByLabelText,
+    getByText, getByLabelText, queryByLabelText, getAllByLabelText, findAllByLabelText,
   } = renderWithRedux(
     <ContentViewComponents cvId={4} details={cvDetails} />,
     renderOptions,
   );
   await patientlyWaitFor(() => {
-    expect(getAllByLabelText('Actions')[2]).toHaveAttribute('aria-expanded', 'false');
+    expect(getAllByLabelText('Kebab toggle')[2]).toHaveAttribute('aria-expanded', 'false');
+  });
+  await act(async () => {
+    await findAllByLabelText('Kebab toggle');
+    fireEvent.click(getAllByLabelText('Kebab toggle')[2]);
   });
-  fireEvent.click(getAllByLabelText('Actions')[2]);
-  expect(getAllByLabelText('Actions')[2]).toHaveAttribute('aria-expanded', 'true');
+
   await patientlyWaitFor(() => {
     expect(getByText('Add')).toBeInTheDocument();
   });
-  fireEvent.click(getByText('Add'));
+
+  await act(async () => {
+    fireEvent.click(getByText('Add'));
+  });
+
   await patientlyWaitFor(() => {
     expect(getByText('Add content view')).toBeInTheDocument();
   });
-  fireEvent.click(getByLabelText('add_component'));
+
+  await act(async () => {
+    fireEvent.click(getByLabelText('add_component'));
+  });
+
   await patientlyWaitFor(() => {
     expect(queryByLabelText('add_component')).not.toBeInTheDocument();
   });
+
   assertNockRequest(autocompleteScope);
   assertNockRequest(scope);
   assertNockRequest(publishedComponentVersionsScope);
   assertNockRequest(addComponentScope);
   assertNockRequest(returnScope);
-  assertNockRequest(cvDetailsScope, done);
+  assertNockRequest(cvDetailsScope);
+  done();
 });
 
 test('Can add unpublished component views to content view', async (done) => {
@@ -274,17 +291,20 @@ test('Can add unpublished component views to content view', async (done) => {
     renderOptions,
   );
   await patientlyWaitFor(() => {
-    expect(getAllByLabelText('Actions').slice(-1)[0]).toHaveAttribute('aria-expanded', 'false');
+    expect(getAllByLabelText('Kebab toggle').slice(-1)[0]).toHaveAttribute('aria-expanded', 'false');
+  });
+  await act(async () => {
+    fireEvent.click(getAllByLabelText('Kebab toggle').slice(-1)[0]);
   });
-  fireEvent.click(getAllByLabelText('Actions').slice(-1)[0]);
-  expect(getAllByLabelText('Actions').slice(-1)[0]).toHaveAttribute('aria-expanded', 'true');
+  expect(getAllByLabelText('Kebab toggle').slice(-1)[0]).toHaveAttribute('aria-expanded', 'true');
   await patientlyWaitFor(() => expect(getByText('Add')).toBeInTheDocument());
   fireEvent.click(getByText('Add'));
   assertNockRequest(autocompleteScope);
   assertNockRequest(scope);
   assertNockRequest(addComponentScope);
   assertNockRequest(returnScope);
-  assertNockRequest(cvDetailsScope, done);
+  assertNockRequest(cvDetailsScope);
+  done();
 });
 
 test('Can remove component views from content view', async (done) => {
@@ -316,17 +336,20 @@ test('Can remove component views from content view', async (done) => {
     renderOptions,
   );
   await patientlyWaitFor(() => {
-    expect(getAllByLabelText('Actions')[0]).toHaveAttribute('aria-expanded', 'false');
+    expect(getAllByLabelText('Kebab toggle')[0]).toHaveAttribute('aria-expanded', 'false');
   });
-  fireEvent.click(getAllByLabelText('Actions')[0]);
-  expect(getAllByLabelText('Actions')[0]).toHaveAttribute('aria-expanded', 'true');
+  await act(async () => {
+    fireEvent.click(getAllByLabelText('Kebab toggle')[0]);
+  });
+  expect(getAllByLabelText('Kebab toggle')[0]).toHaveAttribute('aria-expanded', 'true');
   await patientlyWaitFor(() => expect(getByText('Remove')).toBeInTheDocument());
   fireEvent.click(getByText('Remove'));
   assertNockRequest(autocompleteScope);
   assertNockRequest(scope);
   assertNockRequest(removeComponentScope);
   assertNockRequest(returnScope);
-  assertNockRequest(cvDetailsScope, done);
+  assertNockRequest(cvDetailsScope);
+  done();
 });
 
 test('Can bulk add component views to content view with modal', async (done) => {
@@ -363,20 +386,38 @@ test('Can bulk add component views to content view with modal', async (done) =>
     expect(getByLabelText('Select row 2')).toBeInTheDocument();
     expect(getByLabelText('bulk_add_components')).toHaveAttribute('aria-disabled', 'true');
   });
-  fireEvent.click(getByLabelText('Select row 2'));
-  fireEvent.click(getByLabelText('Select row 3'));
+  await act(async () => {
+    fireEvent.click(getByLabelText('Select row 2'));
+  });
+
+  await act(async () => {
+    fireEvent.click(getByLabelText('Select row 3'));
+  });
+
   await patientlyWaitFor(() => {
     expect(getByLabelText('bulk_add_components')).toHaveAttribute('aria-disabled', 'false');
   });
-  fireEvent.click(getByLabelText('bulk_add_components'));
+
+  await act(async () => {
+    fireEvent.click(getByLabelText('bulk_add_components'));
+  });
+
   await patientlyWaitFor(() => {
     expect(getAllByText('Add content views')[1]).toBeInTheDocument();
     expect(getAllByRole('textbox')[0]).toHaveValue('Version 4.0 (3 days ago)');
   });
-  fireEvent.click(getAllByRole('textbox')[0]);
-  fireEvent.click(queryByText('Version 3.0'));
 
-  fireEvent.click(getByLabelText('add_components'));
+  await act(async () => {
+    fireEvent.click(getAllByRole('textbox')[0]);
+  });
+
+  await act(async () => {
+    fireEvent.click(queryByText('Version 3.0'));
+  });
+
+  await act(async () => {
+    fireEvent.click(getByLabelText('add_components'));
+  });
   await patientlyWaitFor(() => {
     expect(queryByText('Select available version of content views to use')).not.toBeInTheDocument();
     expect(getByLabelText('bulk_add_components')).toHaveAttribute('aria-disabled', 'false');
@@ -386,5 +427,6 @@ test('Can bulk add component views to content view with modal', async (done) =>
   assertNockRequest(scope);
   assertNockRequest(addComponentScope);
   assertNockRequest(returnScope);
-  assertNockRequest(cvDetailsScope, done);
+  assertNockRequest(cvDetailsScope);
+  done();
 });

data/webpack/scenes/ContentViews/Details/ComponentContentViews/__tests__/publishedContentViewDetails.fixtures.json

@@ -1,6 +1,7 @@
 {
   "content_host_count": 0,
   "composite": false,
+  "rolling": false,
   "component_ids": [],
   "default": false,
   "version_count": 33,
@@ -210,4 +211,4 @@
   },
   "duplicate_repositories_to_publish": [],
   "errors": null
-}
+}