katello 4.16.3 → 4.17.0.rc1

data/webpack/scenes/AlternateContentSources/Details/EditModals/ACSEditURLPaths.js

@@ -2,7 +2,19 @@ import React, { useState } from 'react';
 import { useDispatch } from 'react-redux';
 import PropTypes from 'prop-types';
 import { translate as __ } from 'foremanReact/common/I18n';
-import { ActionGroup, Button, Form, FormGroup, Modal, ModalVariant, TextArea, TextInput } from '@patternfly/react-core';
+import {
+  ActionGroup,
+  Button,
+  Form,
+  FormGroup,
+  Modal,
+  ModalVariant,
+  TextArea,
+  TextInput,
+  FormHelperText,
+  HelperText,
+  HelperTextItem,
+} from '@patternfly/react-core';
 import { editACS, getACSDetails } from '../../ACSActions';
 import { areSubPathsValid, isValidUrl } from '../../helpers';
 
@@ -63,8 +75,6 @@ const ACSEditURLPaths = ({ onClose, acsId, acsDetails }) => {
           label={__('Base URL')}
           type="string"
           fieldId="acs_base_url"
-          helperTextInvalid={helperTextInvalid}
-          validated={urlValidated}
           isRequired
         >
           <TextInput
@@ -77,25 +87,41 @@ const ACSEditURLPaths = ({ onClose, acsId, acsDetails }) => {
             placeholder={baseURLplaceholder}
             value={acsUrl}
             validated={urlValidated}
-            onChange={value => setAcsUrl(value)}
+            onChange={(_event, value) => setAcsUrl(value)}
           />
+          {urlValidated === 'error' && (
+            <FormHelperText>
+              <HelperText>
+                <HelperTextItem variant="error">
+                  {helperTextInvalid}
+                </HelperTextItem>
+              </HelperText>
+            </FormHelperText>
+          )}
         </FormGroup>
         <FormGroup
           label={__('Subpaths')}
           type="string"
           fieldId="acs_subpaths"
-          helperTextInvalid={__('Comma-separated list of subpaths. All subpaths must have a slash at the end and none at the front.')}
-          validated={subPathValidated}
         >
           <TextArea
             placeholder="test/repo1/, test/repo2/,"
             value={acsSubpath}
             validated={subPathValidated}
-            onChange={value => setAcsSubpath(value)}
+            onChange={(_event, value) => setAcsSubpath(value)}
             name="acs_subpath_field"
             id="acs_subpath_field"
             aria-label="acs_subpath_field"
           />
+          {subPathValidated === 'error' && (
+            <FormHelperText>
+              <HelperText>
+                <HelperTextItem variant="error">
+                  {__('Comma-separated list of subpaths. All subpaths must have a slash at the end and none at the front.')}
+                </HelperTextItem>
+              </HelperText>
+            </FormHelperText>
+          )}
         </FormGroup>
         <ActionGroup>
           <Button

data/webpack/scenes/AlternateContentSources/Details/__tests__/ACSEdits.test.js

@@ -44,7 +44,8 @@ test('Can show custom ACS details expandable sections with edit buttons', async
     expect(queryByText('Credentials')).toBeInTheDocument();
     expect(getByLabelText('edit-credentials-pencil-edit')).toBeInTheDocument();
   });
-  assertNockRequest(acsDetailsScope, done);
+  assertNockRequest(acsDetailsScope);
+  done();
   act(done);
 });
 
@@ -89,7 +90,8 @@ test('Can open and close edit ACS details modal', async (done) => {
   await patientlyWaitFor(() => {
     expect(queryByLabelText('edit_acs_details')).not.toBeInTheDocument();
   });
-  assertNockRequest(acsDetailsScope, done);
+  assertNockRequest(acsDetailsScope);
+  done();
   act(done);
 });
 
@@ -138,7 +140,8 @@ test('Can edit ACS details in the edit modal', async (done) => {
   });
   assertNockRequest(acsDetailsScope);
   assertNockRequest(acsEditScope);
-  assertNockRequest(acsDetailsScope, done);
+  assertNockRequest(acsDetailsScope);
+  done();
   act(done);
 });
 
@@ -175,7 +178,8 @@ test('Can show simplified ACS details expandable sections with edit buttons', as
     expect(queryByText('Credentials')).not.toBeInTheDocument();
     expect(queryByText('URL and subpaths')).not.toBeInTheDocument();
   });
-  assertNockRequest(acsDetailsScope, done);
+  assertNockRequest(acsDetailsScope);
+  done();
   act(done);
 });
 
@@ -240,6 +244,7 @@ test('Can edit products in a simplified ACS details edit modal', async (done) =>
   assertNockRequest(acsDetailsScope);
   assertNockRequest(productsScope);
   assertNockRequest(acsEditScope);
-  assertNockRequest(acsDetailsScope, done);
+  assertNockRequest(acsDetailsScope);
+  done();
   act(done);
 });

data/webpack/scenes/AlternateContentSources/Details/__tests__/ACSExpandableDetails.test.js

@@ -36,7 +36,8 @@ test('Can call API and show ACS details expandable sections on page load', async
     expect(queryByText('URL and subpaths')).toBeInTheDocument();
     expect(queryByText('Credentials')).toBeInTheDocument();
   });
-  assertNockRequest(acsDetailsScope, done);
+  assertNockRequest(acsDetailsScope);
+  done();
   act(done);
 });
 
@@ -104,6 +105,7 @@ test('Can expand expandable sections on details page', async (done) => {
     expect(queryByText('true')).not.toBeInTheDocument();
   });
 
-  assertNockRequest(acsDetailsScope, done);
+  assertNockRequest(acsDetailsScope);
+  done();
   act(done);
 });

data/webpack/scenes/AlternateContentSources/MainTable/ACSTable.js

@@ -15,9 +15,6 @@ import {
   DrawerHead,
   DrawerPanelContent,
   DrawerPanelBody,
-  Dropdown,
-  DropdownItem,
-  KebabToggle,
   Text,
   TextContent,
   TextList,
@@ -26,6 +23,11 @@ import {
   TextListVariants,
   TextVariants,
 } from '@patternfly/react-core';
+import {
+  Dropdown,
+  DropdownItem,
+  KebabToggle,
+} from '@patternfly/react-core/deprecated';
 import { TableVariant, Tbody, Td, Th, Thead, Tr, ActionsColumn } from '@patternfly/react-table';
 import { useSelectionSet } from 'foremanReact/components/PF4/TableIndexPage/Table/TableHooks';
 import { useTableSort } from 'foremanReact/components/PF4/Helpers/useTableSort';
@@ -148,7 +150,7 @@ const ACSTable = () => {
   const isSingleSelected = rowId => (Number(rowId) === Number(acsId) ||
       Number(rowId) === Number(expandedId));
   const customStyle = {
-    borderLeft: '5px solid var(--pf-global--primary-color--100)',
+    borderLeft: '5px solid var(--pf-v5-global--primary-color--100)',
   };
 
   const PanelContent = () => {
@@ -196,14 +198,14 @@ const ACSTable = () => {
                 ouiaId="refresh-acs"
                 onClick={() => onRefresh(acs?.id)}
                 variant="secondary"
-                isSmall
+                size="sm"
                 aria-label="refresh_acs"
               >
                 {__('Refresh source')}
               </Button>
               <Dropdown
                 style={{ paddingRight: '0px' }}
-                toggle={<KebabToggle aria-label="details_actions" onToggle={setDetailsKebabOpen} style={{ paddingRight: '0px' }} />}
+                toggle={<KebabToggle aria-label="details_actions" onToggle={(_event, val) => setDetailsKebabOpen(val)} style={{ paddingRight: '0px' }} />}
                 isOpen={detailsKebabOpen}
                 ouiaId="acs-details-actions"
                 isPlain
@@ -344,7 +346,7 @@ const ACSTable = () => {
                   </Button>}
                   {renderActionButtons && (canEdit || canDelete) &&
                   <Dropdown
-                    toggle={<KebabToggle aria-label="bulk_actions" onToggle={setKebabOpen} />}
+                    toggle={<KebabToggle aria-label="bulk_actions" onToggle={(_event, val) => setKebabOpen(val)} />}
                     isOpen={kebabOpen}
                     ouiaId="acs-bulk-actions"
                     isPlain
@@ -430,7 +432,7 @@ const ACSTable = () => {
                           id={id}
                           aria-label={`Select ACS ${id}`}
                           isChecked={isSelected(id)}
-                          onChange={selected => selectOne(selected, id)}
+                          onChange={(_event, selected) => selectOne(selected, id)}
                         />
                       </Td>
                       <Td>

data/webpack/scenes/AlternateContentSources/MainTable/__tests__/acsTable.test.js

@@ -30,7 +30,8 @@ test('Can call API and show ACS on page load', async (done) => {
   // Assert that the ACS name is now showing on the screen, but wait for it to appear.
   await patientlyWaitFor(() => expect(getByText(firstAcs.name)).toBeInTheDocument());
   assertNockRequest(autocompleteScope);
-  assertNockRequest(scope, done);
+  assertNockRequest(scope);
+  done();
   act(done);
 });
 
@@ -56,6 +57,7 @@ test('Can handle no ACS being present', async (done) => {
   expect(queryByText(firstAcs.name)).toBeNull();
   expect(queryByLabelText('Select all')).not.toBeInTheDocument();
   await patientlyWaitFor(() => expect(queryByText("You currently don't have any alternate content sources.")).toBeInTheDocument());
-  assertNockRequest(scope, done);
+  assertNockRequest(scope);
+  done();
   act(done);
 });

data/webpack/scenes/BootedContainerImages/BootedContainerImagesPage.js

@@ -1,5 +1,5 @@
 import React from 'react';
-import { TableComposable, Thead, Th, Tbody, Tr, Td, ExpandableRowContent } from '@patternfly/react-table';
+import { Table, Thead, Th, Tbody, Tr, Td, ExpandableRowContent } from '@patternfly/react-table';
 import TableIndexPage from 'foremanReact/components/PF4/TableIndexPage/TableIndexPage';
 import {
   useSetParamsAndApiAndSearch,
@@ -114,7 +114,7 @@ const BootedContainerImagesPage = () => {
       controller="/katello/api/v2/host_bootc_images"
     >
       <>
-        <TableComposable variant="compact" ouiaId="booted-containers-table" isStriped>
+        <Table variant="compact" ouiaId="booted-containers-table" isStriped>
           <Thead>
             <Tr ouiaId="table-header">
               <>
@@ -201,7 +201,7 @@ const BootedContainerImagesPage = () => {
                     <Td />
                     <Td colSpan={3}>
                       <ExpandableRowContent>
-                        <TableComposable variant="compact" isStriped ouiaId={`table-composable-expanded-${rowIndex}`}>
+                        <Table variant="compact" isStriped ouiaId={`table-composable-expanded-${rowIndex}`}>
                           <Thead>
                             <Tr ouiaId={`table-row-inner-expandable-${rowIndex}`}>
                               <Th width={55}>{__('Image digest')}</Th>
@@ -218,14 +218,14 @@ const BootedContainerImagesPage = () => {
                               </Tr>
                             ))}
                           </Tbody>
-                        </TableComposable>
+                        </Table>
                       </ExpandableRowContent>
                     </Td>
                   </Tr> : null}
               </Tbody>
             );
           })}
-        </TableComposable>
+        </Table>
         {results.length > 0 && !errorMessage &&
           <Pagination
             key="table-bottom-pagination"

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();
 });