katello 4.16.1 → 4.17.0.rc1

data/webpack/scenes/Content/Details/__tests__/contentDetail.test.js

@@ -50,7 +50,8 @@ test('Can call API for Python package details and show details tab on page load'
     expect(getByLabelText('content_breadcrumb_content')).toHaveTextContent(name);
   });
 
-  assertNockRequest(pythonPackagesScope, done);
+  assertNockRequest(pythonPackagesScope);
+  done();
 });
 
 test('Can call API for Python package repository details and show repositories tab', async (done) => {
@@ -80,7 +81,8 @@ test('Can call API for Python package repository details and show repositories t
   });
 
   assertNockRequest(autocompleteScope);
-  assertNockRequest(pythonPackageRepositoryDetailsScope, done);
+  assertNockRequest(pythonPackageRepositoryDetailsScope);
+  done();
 });
 
 test('Can call API for Ansible collection details and show details tab on page load', async (done) => {
@@ -109,7 +111,8 @@ test('Can call API for Ansible collection details and show details tab on page l
     expect(getByLabelText('content_breadcrumb_content')).toHaveTextContent(name);
   });
 
-  assertNockRequest(ansibleCollectionsScope, done);
+  assertNockRequest(ansibleCollectionsScope);
+  done();
 });
 
 test('Can call API for Ansible collection repository details and show repositories tab', async (done) => {
@@ -139,5 +142,6 @@ test('Can call API for Ansible collection repository details and show repositori
   });
 
   assertNockRequest(autocompleteScope);
-  assertNockRequest(ansibleCollectionRepositoryDetailsScope, done);
+  assertNockRequest(ansibleCollectionRepositoryDetailsScope);
+  done();
 });

data/webpack/scenes/Content/__tests__/contentTable.test.js

@@ -40,7 +40,8 @@ test('Can call API for Python Packages and show table on page load', async (done
 
   assertNockRequest(autocompleteScope);
   assertNockRequest(contentTypesScope);
-  assertNockRequest(pythonPackagesScope, done);
+  assertNockRequest(pythonPackagesScope);
+  done();
 });
 
 test('Can call API for Ansible collections and show table on page load', async (done) => {
@@ -71,5 +72,6 @@ test('Can call API for Ansible collections and show table on page load', async (
     expect(getAllByText(firstPackage.checksum)[0]).toBeInTheDocument();
   });
   assertNockRequest(autocompleteScope);
-  assertNockRequest(ansibleCollections, done);
+  assertNockRequest(ansibleCollections);
+  done();
 });

data/webpack/scenes/ContentViews/Copy/CopyContentViewForm.js

@@ -55,7 +55,7 @@ const CopyContentViewForm = ({ cvId, setModalOpen }) => {
           ouiaId="input_name"
           name="name"
           value={name}
-          onChange={setName}
+          onChange={(_event, val) => setName(val)}
         />
       </FormGroup>
       <ActionGroup>

data/webpack/scenes/ContentViews/Copy/__tests__/contentViewCopyResult.fixtures.json

@@ -1,6 +1,7 @@
 {
   "content_host_count": 0,
   "composite": false,
+  "rolling": false,
   "component_ids": [],
   "default": false,
   "version_count": 0,

data/webpack/scenes/ContentViews/Copy/__tests__/copyContentView.test.js

@@ -35,5 +35,6 @@ test('Can copy content view from form', async (done) => {
     expect(setModalOpen).toBeCalled();
   });
 
-  assertNockRequest(copyscope, done);
+  assertNockRequest(copyscope);
+  done();
 });

data/webpack/scenes/ContentViews/Create/CreateContentViewForm.js

@@ -4,13 +4,37 @@ import { STATUS } from 'foremanReact/constants';
 import { translate as __ } from 'foremanReact/common/I18n';
 import PropTypes from 'prop-types';
 import { useDispatch, useSelector } from 'react-redux';
-import { Form, FormGroup, TextInput, TextArea, Checkbox, ActionGroup, Button, Tile, Grid, GridItem } from '@patternfly/react-core';
+import {
+  Form,
+  FormGroup,
+  TextInput,
+  TextArea,
+  Checkbox,
+  ActionGroup,
+  Button,
+  Tile,
+  Grid,
+  GridItem,
+  FormHelperText,
+  HelperText,
+  HelperTextItem,
+} from '@patternfly/react-core';
 import { createContentView } from '../ContentViewsActions';
-import { selectCreateContentViews, selectCreateContentViewStatus, selectCreateContentViewError } from './ContentViewCreateSelectors';
+import {
+  selectCreateContentViews,
+  selectCreateContentViewStatus,
+  selectCreateContentViewError,
+} from './ContentViewCreateSelectors';
 import { LabelDependencies, LabelAutoPublish } from './ContentViewFormComponents';
 import ContentViewIcon from '../components/ContentViewIcon';
 import './CreateContentViewForm.scss';
 
+export const contentViewDescriptions = {
+  CV: __('Contains repositories. Versions are published and optionally filtered.'),
+  CCV: __('Contains content views. You must choose the version to use for each content view.'),
+  RCV: __('Contains repositories. Always serves the latest synced content, without the need to publish versions.'),
+};
+
 const CreateContentViewForm = ({ setModalOpen }) => {
   const dispatch = useDispatch();
   const [name, setName] = useState('');
@@ -18,6 +42,7 @@ const CreateContentViewForm = ({ setModalOpen }) => {
   const [description, setDescription] = useState('');
   const [composite, setComposite] = useState(false);
   const [component, setComponent] = useState(true);
+  const [rolling, setRolling] = useState(false);
   const [autoPublish, setAutoPublish] = useState(false);
   const [dependencies, setDependencies] = useState(false);
   const [redirect, setRedirect] = useState(false);
@@ -56,24 +81,27 @@ const CreateContentViewForm = ({ setModalOpen }) => {
       label,
       description,
       composite,
-      solve_dependencies: dependencies,
+      rolling,
+      solve_dependencies: (dependencies && !(rolling || composite)),
       auto_publish: (autoPublish && composite),
     }));
   };
 
-  useEffect(
-    () => {
-      setLabel(name.replace(/[^A-Za-z0-9_-]/g, '_'));
-    },
-    [name],
-  );
+  useEffect(() => {
+    setLabel(name.replace(/[^A-Za-z0-9_-]/g, '_'));
+  }, [name]);
 
   if (redirect) {
     const { id } = response;
-    if (composite) { window.location.assign(`/content_views/${id}#/contentviews`); } else { window.location.assign(`/content_views/${id}#/repositories`); }
+    if (composite) {
+      window.location.assign(`/content_views/${id}#/contentviews`);
+    } else {
+      window.location.assign(`/content_views/${id}#/repositories`);
+    }
   }
 
-  const submitDisabled = !name?.length || !label?.length || saving || redirect || labelValidated === 'error';
+  const submitDisabled =
+    !name?.length || !label?.length || saving || redirect || labelValidated === 'error';
 
   return (
     <Form
@@ -92,15 +120,13 @@ const CreateContentViewForm = ({ setModalOpen }) => {
           ouiaId="input_name"
           name="name"
           value={name}
-          onChange={value => setName(value)}
+          onChange={(_event, value) => setName(value)}
         />
       </FormGroup>
       <FormGroup
         label={__('Label')}
         isRequired
         fieldId="label"
-        helperTextInvalid="Must be Ascii alphanumeric, '_' or '-'"
-        validated={labelValidated}
       >
         <TextInput
           isRequired
@@ -111,8 +137,17 @@ const CreateContentViewForm = ({ setModalOpen }) => {
           name="label"
           value={label}
           validated={labelValidated}
-          onChange={handleLabelChange}
+          onChange={(_event, newLabel) => handleLabelChange(newLabel, _event)}
         />
+        {labelValidated === 'error' && (
+          <FormHelperText>
+            <HelperText>
+              <HelperTextItem variant="error">
+                {__("Must be Ascii alphanumeric, '_' or '-'")}
+              </HelperTextItem>
+            </HelperText>
+          </FormHelperText>
+        )}
       </FormGroup>
       <FormGroup label={__('Description')} fieldId="description">
         <TextArea
@@ -122,42 +157,56 @@ const CreateContentViewForm = ({ setModalOpen }) => {
           name="description"
           aria-label="input_description"
           value={description}
-          onChange={value => setDescription(value)}
+          onChange={(_event, value) => setDescription(value)}
         />
       </FormGroup>
       <FormGroup isInline fieldId="type" label={__('Type')}>
         <Grid hasGutter>
-          <GridItem span={6}>
+          <GridItem span={4}>
             <Tile
               style={{ height: '100%' }}
               isStacked
               aria-label="component_tile"
-              icon={<ContentViewIcon composite={false} />}
+              icon={<ContentViewIcon composite={false} rolling={false} />}
               id="component"
               title={__('Content view')}
-              onClick={() => { setComponent(true); setComposite(false); }}
+              onClick={() => { setComponent(true); setComposite(false); setRolling(false); }}
               isSelected={component}
             >
-              {__('Single content view consisting of e.g. repositories')}
+              {contentViewDescriptions.CV}
             </Tile>
           </GridItem>
-          <GridItem span={6}>
+          <GridItem span={4}>
             <Tile
               style={{ height: '100%' }}
               isStacked
               aria-label="composite_tile"
-              icon={<ContentViewIcon composite />}
+              icon={<ContentViewIcon composite rolling={false} />}
               id="composite"
               title={__('Composite content view')}
-              onClick={() => { setComposite(true); setComponent(false); }}
+              onClick={() => { setComposite(true); setComponent(false); setRolling(false); }}
               isSelected={composite}
             >
-              {__('Consisting of multiple content views')}
+              {contentViewDescriptions.CCV}
+            </Tile>
+          </GridItem>
+          <GridItem span={4}>
+            <Tile
+              style={{ height: '100%' }}
+              isStacked
+              aria-label="rolling_tile"
+              icon={<ContentViewIcon composite={false} rolling />}
+              id="rolling"
+              title={__('Rolling content view')}
+              onClick={() => { setComposite(false); setComponent(false); setRolling(true); }}
+              isSelected={rolling}
+            >
+              {contentViewDescriptions.RCV}
             </Tile>
           </GridItem>
         </Grid>
       </FormGroup>
-      {!composite &&
+      {!composite && !rolling && (
         <FormGroup isInline fieldId="dependencies">
           <Checkbox
             id="dependencies"
@@ -165,10 +214,11 @@ const CreateContentViewForm = ({ setModalOpen }) => {
             name="dependencies"
             label={LabelDependencies()}
             isChecked={dependencies}
-            onChange={checked => setDependencies(checked)}
+            onChange={(_event, checked) => setDependencies(checked)}
           />
-        </FormGroup>}
-      {composite &&
+        </FormGroup>
+      )}
+      {composite && (
         <FormGroup isInline fieldId="autoPublish">
           <Checkbox
             id="autoPublish"
@@ -176,9 +226,10 @@ const CreateContentViewForm = ({ setModalOpen }) => {
             name="autoPublish"
             label={LabelAutoPublish()}
             isChecked={autoPublish}
-            onChange={checked => setAutoPublish(checked)}
+            onChange={(_event, checked) => setAutoPublish(checked)}
           />
-        </FormGroup>}
+        </FormGroup>
+      )}
       <ActionGroup>
         <Button
           ouiaId="create-content-view-form-submit"
@@ -190,7 +241,11 @@ const CreateContentViewForm = ({ setModalOpen }) => {
         >
           {__('Create content view')}
         </Button>
-        <Button ouiaId="create-content-view-form-cancel" variant="link" onClick={() => setModalOpen(false)}>
+        <Button
+          ouiaId="create-content-view-form-cancel"
+          variant="link"
+          onClick={() => setModalOpen(false)}
+        >
           {__('Cancel')}
         </Button>
       </ActionGroup>

data/webpack/scenes/ContentViews/Create/CreateContentViewForm.scss

@@ -1,9 +1,17 @@
 #create-content-view-form {
-  .pf-c-tile__title {
+  .pf-v5-c-tile__title {
     font-size: 16px;
   }
 
-  .pf-c-tile__icon {
+  .pf-v5-c-tile__icon {
     min-height: 38px;
   }
+
+  .pf-v5-c-check__label {
+    margin-top: 4px;
+  }
+
+  .foreman-spaced-icon {
+    margin: 0;
+  }
 }

data/webpack/scenes/ContentViews/Create/__tests__/contentViewCreateResult.fixtures.json

@@ -1,6 +1,7 @@
 {
   "content_host_count": 0,
   "composite": false,
+  "rolling": false,
   "component_ids": [],
   "default": false,
   "version_count": 0,

data/webpack/scenes/ContentViews/Create/__tests__/createContentView.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 } from '../../../../test-utils/nockWrapper';
 import api from '../../../../services/api';
@@ -22,6 +22,7 @@ const createDetails = {
   label: '1232123',
   description: '',
   composite: false,
+  rolling: false,
   solve_dependencies: false,
   auto_publish: false,
 };
@@ -43,7 +44,8 @@ test('Can save content view from form', async (done) => {
 
   getByLabelText('create_content_view').click();
 
-  assertNockRequest(createscope, done);
+  assertNockRequest(createscope);
+  done();
 });
 
 test('Form closes itself upon save', async (done) => {
@@ -65,7 +67,8 @@ test('Form closes itself upon save', async (done) => {
     expect(window.location.assign).toHaveBeenCalled();
   });
 
-  assertNockRequest(createscope, done);
+  assertNockRequest(createscope);
+  done();
 });
 
 test('Displays dependent fields correctly', () => {
@@ -75,6 +78,7 @@ test('Displays dependent fields correctly', () => {
   expect(getByText('Label')).toBeInTheDocument();
   expect(getByText('Composite content view')).toBeInTheDocument();
   expect(getByText('Content view')).toBeInTheDocument();
+  expect(getByText('Rolling content view')).toBeInTheDocument();
   expect(getByText('Solve dependencies')).toBeInTheDocument();
   expect(queryByText('Auto publish')).not.toBeInTheDocument();
 
@@ -97,6 +101,8 @@ test('Validates label field', () => {
   const { getByText, getByLabelText } = renderWithRedux(form);
   expect(getByText('Label')).toBeInTheDocument();
 
-  fireEvent.change(getByLabelText('input_label'), { target: { value: '123 2123' } });
+  act(() => {
+    fireEvent.change(getByLabelText('input_label'), { target: { value: '123 2123' } });
+  });
   expect(getByText('Must be Ascii alphanumeric, \'_\' or \'-\'')).toBeInTheDocument();
 });

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
-}
+}