katello 4.16.3 → 4.17.0.rc1

data/webpack/scenes/ContentViews/Details/Filters/__tests__/CVContainerImageFilterContent.test.js

@@ -75,7 +75,8 @@ test('Can view container image filter rules', async (done) => {
 
 
   assertNockRequest(autocompleteScope);
-  assertNockRequest(cvFiltersScope, done);
+  assertNockRequest(cvFiltersScope);
+  done();
 });
 
 // Remove
@@ -107,13 +108,13 @@ test('Can remove filter rules', async (done) => {
 
   await patientlyWaitFor(() => {
     expect(queryByText(firstResultName)).toBeInTheDocument();
-    expect(getAllByLabelText('Actions')[0]).toHaveAttribute('aria-expanded', 'false');
+    expect(getAllByLabelText('Kebab toggle')[0]).toHaveAttribute('aria-expanded', 'false');
   });
 
-  fireEvent.click(getAllByLabelText('Actions')[0]);
+  fireEvent.click(getAllByLabelText('Kebab toggle')[0]);
 
   await patientlyWaitFor(() => {
-    expect(getAllByLabelText('Actions')[0]).toHaveAttribute('aria-expanded', 'true');
+    expect(getAllByLabelText('Kebab toggle')[0]).toHaveAttribute('aria-expanded', 'true');
     expect(queryByText('Remove')).toBeInTheDocument();
     fireEvent.click(queryByText('Remove'));
   });
@@ -126,7 +127,8 @@ test('Can remove filter rules', async (done) => {
   assertNockRequest(autocompleteScope);
   assertNockRequest(cvFiltersScope);
   assertNockRequest(cvFilterDeleteScope);
-  assertNockRequest(cvFiltersCallbackScope, done);
+  assertNockRequest(cvFiltersCallbackScope);
+  done();
 });
 
 // Add
@@ -187,7 +189,8 @@ test('Can add filter rules', async (done) => {
   assertNockRequest(cvFiltersScope);
   assertNockRequest(cvFilterAddScope);
   assertNockRequest(autocompleteNameScope);
-  assertNockRequest(cvFiltersCallbackScope, done);
+  assertNockRequest(cvFiltersCallbackScope);
+  done();
   act(done);
 });
 
@@ -239,13 +242,13 @@ test('Can edit filter rules', async (done) => {
 
   await patientlyWaitFor(() => {
     expect(queryByText(firstResultName)).toBeInTheDocument();
-    expect(getAllByLabelText('Actions')[0]).toHaveAttribute('aria-expanded', 'false');
+    expect(getAllByLabelText('Kebab toggle')[0]).toHaveAttribute('aria-expanded', 'false');
   });
 
-  fireEvent.click(getAllByLabelText('Actions')[0]);
+  fireEvent.click(getAllByLabelText('Kebab toggle')[0]);
 
   await patientlyWaitFor(() => {
-    expect(getAllByLabelText('Actions')[0]).toHaveAttribute('aria-expanded', 'true');
+    expect(getAllByLabelText('Kebab toggle')[0]).toHaveAttribute('aria-expanded', 'true');
     expect(queryByText('Edit')).toBeInTheDocument();
     fireEvent.click(queryByText('Edit'));
   });
@@ -268,7 +271,8 @@ test('Can edit filter rules', async (done) => {
   assertNockRequest(cvFiltersScope);
   assertNockRequest(cvFilterAddScope);
   assertNockRequest(autocompleteNameScope);
-  assertNockRequest(cvFiltersCallbackScope, done);
+  assertNockRequest(cvFiltersCallbackScope);
+  done();
   act(done);
 });
 
@@ -302,7 +306,8 @@ test('Shows call-to-action when there are no filter rules', async (done) => {
 
   assertNockRequest(autocompleteScope);
   assertNockRequest(autocompleteNameScope);
-  assertNockRequest(cvFiltersScope, done);
+  assertNockRequest(cvFiltersScope);
+  done();
   act(done);
 });
 
@@ -325,6 +330,7 @@ test('Hides bulk_remove dropdownItem when there are no filter rules', async (don
   });
 
   assertNockRequest(autocompleteScope);
-  assertNockRequest(cvFiltersScope, done);
+  assertNockRequest(cvFiltersScope);
+  done();
   act(done);
 });

data/webpack/scenes/ContentViews/Details/Filters/__tests__/CVRpmFilterContent.test.js

@@ -270,11 +270,9 @@ test('Remove rpm filter rule in a self-closing modal', async (done) => {
   expect(queryByText(cvFilterName)).toBeNull();
   await patientlyWaitFor(() => {
     expect(getByText(cvFilterName)).toBeInTheDocument();
-    expect(getAllByLabelText('Actions')[1]).toBeInTheDocument();
+    expect(getAllByLabelText('Kebab toggle')[0]).toBeInTheDocument();
   });
-
-  getAllByLabelText('Actions')[1].click();
-
+  getAllByLabelText('Kebab toggle')[0].click();
   await patientlyWaitFor(() => {
     expect(getByText('Remove')).toBeInTheDocument();
   });
@@ -282,7 +280,7 @@ test('Remove rpm filter rule in a self-closing modal', async (done) => {
   getByText('Remove').click();
   await patientlyWaitFor(() => {
     expect(getByText(cvFilterName)).toBeInTheDocument();
-    expect(getAllByLabelText('Actions')[1]).toBeInTheDocument();
+    expect(getAllByLabelText('Kebab toggle')[1]).toBeInTheDocument();
   });
 
   assertNockRequest(autocompleteScope);
@@ -338,16 +336,14 @@ test('Edit rpm filter rule in a self-closing modal', async (done) => {
   expect(queryByText(cvFilterName)).toBeNull();
   await patientlyWaitFor(() => {
     expect(getByText(cvFilterName)).toBeInTheDocument();
-    expect(getAllByLabelText('Actions')[1]).toBeInTheDocument();
+    expect(getAllByLabelText('Kebab toggle')[0]).toBeInTheDocument();
   });
-
-  getAllByLabelText('Actions')[1].click();
-
+  fireEvent.click(getAllByLabelText('Kebab toggle')[0]);
   await patientlyWaitFor(() => {
     expect(getByText('Edit')).toBeInTheDocument();
   });
 
-  getByText('Edit').click();
+  fireEvent.click(getByText('Edit'));
 
   await patientlyWaitFor(() => {
     expect(getByText('Edit RPM rule')).toBeInTheDocument();
@@ -409,6 +405,6 @@ test('Shows call-to-action when there are no RPM filters', async (done) => {
   assertNockRequest(autocompleteScope);
   assertNockRequest(cvFiltersScope);
   assertNockRequest(cvFilterDetailScope);
-  assertNockRequest(cvPackageFilterRulesScope);
+  assertNockRequest(cvPackageFilterRulesScope, done);
   act(done);
 });

data/webpack/scenes/ContentViews/Details/Filters/__tests__/ContentViewPackageGroupFilter.test.js

@@ -1,10 +1,10 @@
 import React from 'react';
-import { renderWithRedux, patientlyWaitFor, fireEvent } from 'react-testing-lib-wrapper';
+import { renderWithRedux, patientlyWaitFor, fireEvent, act, waitFor } from 'react-testing-lib-wrapper';
 import { Route } from 'react-router-dom';
 
 import ContentViewFilterDetails from '../ContentViewFilterDetails';
 import { ADDED, cvFilterDetailsKey, NOT_ADDED } from '../../../ContentViewsConstants';
-import {
+import nock, {
   nockInstance,
   assertNockRequest,
   mockAutocomplete,
@@ -46,6 +46,11 @@ const renderOptions = {
 
 const withCVRoute = component => <Route path="/content_views/:id([0-9]+)#/filters/:filterId([0-9]+)">{component}</Route>;
 
+afterEach(() => {
+  nock.cleanAll(); // Removes all interceptors
+  nock.restore(); // Restores HTTP to normal behavior
+});
+
 test('Can enable and disable add filter button', async (done) => {
   const autocompleteScope = mockAutocomplete(nockInstance, autocompleteUrl, autocompleteQuery);
   const { name: cvFilterName } = cvFilterDetails;
@@ -85,6 +90,7 @@ test('Can enable and disable add filter button', async (done) => {
   assertNockRequest(cvFilterScope);
   assertNockRequest(cvFiltersScope);
   assertNockRequest(packageGroupsScope, done);
+  act(done);
 });
 
 test('Can remove a filter rule', async (done) => {
@@ -127,10 +133,10 @@ test('Can remove a filter rule', async (done) => {
 
   await patientlyWaitFor(() => {
     expect(getByText(name)).toBeInTheDocument();
-    expect(getAllByLabelText('Actions')[2]).toHaveAttribute('aria-expanded', 'false');
+    expect(getAllByLabelText('Kebab toggle')[2]).toHaveAttribute('aria-expanded', 'false');
   });
-  fireEvent.click(getAllByLabelText('Actions')[2]);
-  expect(getAllByLabelText('Actions')[2]).toHaveAttribute('aria-expanded', 'true');
+  fireEvent.click(getAllByLabelText('Kebab toggle')[2]);
+  expect(getAllByLabelText('Kebab toggle')[2]).toHaveAttribute('aria-expanded', 'true');
   await patientlyWaitFor(() => expect(getByText('Remove')).toBeInTheDocument());
   fireEvent.click(getByText('Remove'));
 
@@ -142,6 +148,7 @@ test('Can remove a filter rule', async (done) => {
   assertNockRequest(cvRequestCallbackScope);
 
   assertNockRequest(packageGroupsScope, done);
+  act(done);
 });
 
 test('Can add a filter rule', async (done) => {
@@ -186,10 +193,10 @@ test('Can add a filter rule', async (done) => {
 
   await patientlyWaitFor(() => {
     expect(getByText(name)).toBeInTheDocument();
-    expect(getAllByLabelText('Actions')[3]).toHaveAttribute('aria-expanded', 'false');
+    expect(getAllByLabelText('Kebab toggle')[1]).toHaveAttribute('aria-expanded', 'false');
   });
-  fireEvent.click(getAllByLabelText('Actions')[3]);
-  expect(getAllByLabelText('Actions')[3]).toHaveAttribute('aria-expanded', 'true');
+  fireEvent.click(getAllByLabelText('Kebab toggle')[1]);
+  expect(getAllByLabelText('Kebab toggle')[1]).toHaveAttribute('aria-expanded', 'true');
   await patientlyWaitFor(() => expect(getByText('Add')).toBeInTheDocument());
   fireEvent.click(getByText('Add'));
 
@@ -201,6 +208,7 @@ test('Can add a filter rule', async (done) => {
   assertNockRequest(cvRequestCallbackScope);
 
   assertNockRequest(packageGroupsScope, done);
+  act(done);
 });
 
 test('Can bulk remove filter rules', async (done) => {
@@ -261,7 +269,7 @@ test('Can bulk remove filter rules', async (done) => {
   assertNockRequest(cvFiltersScope);
   assertNockRequest(cvFiltersRuleBulkDeleteScope);
   assertNockRequest(cvRequestCallbackScope);
-
+  await waitFor(() => expect(packageGroupsScope.isDone()).toBe(true));
   assertNockRequest(packageGroupsScope, done);
 });
 
@@ -320,6 +328,64 @@ test('Can bulk add filter rules', async (done) => {
   assertNockRequest(cvFiltersScope);
   assertNockRequest(cvFiltersRuleBulkAddScope);
   assertNockRequest(cvRequestCallbackScope);
+  await waitFor(() => expect(packageGroupsScope.isDone()).toBe(true));
+  assertNockRequest(packageGroupsScope, done);
+});
+
+test('Can filter by added/not added rules', async (done) => {
+  const autocompleteScope = mockAutocomplete(nockInstance, autocompleteUrl, autocompleteQuery);
+  const { rules } = cvFilterDetails;
+  const { name } = rules[0];
+
+  const cvFilterScope = nockInstance
+    .get(cvFilterDetailsPath)
+    .query(true)
+    .reply(200, cvFilterDetails);
+
+  const cvFiltersScope = nockInstance
+    .get(cvFiltersPath)
+    .query(true)
+    .reply(200, cvFilterFixtures);
+
+  const packageGroupsScope = nockInstance
+    .get(packageGroupsPath)
+    .query(true)
+    .times(3) // For first call (All), Added, and Not Added
+    .reply(200, allPackageGroups);
+
+  const {
+    getByText, queryByText, getByTestId, getByLabelText,
+  } = renderWithRedux(withCVRoute(<ContentViewFilterDetails
+    cvId={1}
+    details={details}
+  />), renderOptions);
+
+  // Nothing will show at first, page is loading
+  expect(queryByText(name)).toBeNull();
+
+  await patientlyWaitFor(() => {
+    expect(getByText(name)).toBeInTheDocument();
+    expect(getByTestId('allAddedNotAdded')).toBeInTheDocument();
+  });
+  fireEvent.click(getByTestId('allAddedNotAdded')?.childNodes[0]?.childNodes[0]);
+  await patientlyWaitFor(() => {
+    expect(getByLabelText(ADDED)).toBeInTheDocument();
+  });
+  fireEvent.click(getByLabelText(ADDED));
+  await patientlyWaitFor(() => {
+    expect(getByText(name)).toBeInTheDocument();
+    expect(getByTestId('allAddedNotAdded')).toBeInTheDocument();
+  });
+  fireEvent.click(getByTestId('allAddedNotAdded')?.childNodes[0]?.childNodes[0]);
+  await patientlyWaitFor(() => {
+    expect(getByLabelText(NOT_ADDED)).toBeInTheDocument();
+  });
+  fireEvent.click(getByLabelText(NOT_ADDED));
+
+  assertNockRequest(autocompleteScope);
+  assertNockRequest(cvFilterScope);
+  assertNockRequest(cvFiltersScope);
+  await waitFor(() => expect(packageGroupsScope.isDone()).toBe(true));
   assertNockRequest(packageGroupsScope, done);
 });
 
@@ -409,7 +475,9 @@ test('Can show affected repository tab on dropdown selection and add repos', asy
   fireEvent.click(getAllByLabelText('Select all rows')[1]);
   expect(getByLabelText('add_repositories')).toHaveAttribute('aria-disabled', 'false');
   fireEvent.click(getByLabelText('add_repositories'));
-
+  await patientlyWaitFor(() => {
+    expect(getByLabelText('add_repositories')).toHaveAttribute('aria-disabled', 'true');
+  });
   assertNockRequest(cvFilterScope);
   assertNockRequest(cvFiltersScope);
   assertNockRequest(cvAllReposScope);
@@ -419,6 +487,7 @@ test('Can show affected repository tab on dropdown selection and add repos', asy
   assertNockRequest(autocompleteScope);
   assertNockRequest(autocompleteScopeRepo);
   assertNockRequest(packageGroupsScope, done);
+  act(done);
 });
 
 test('Can show affected repository tab and remove affected repos', async (done) => {
@@ -510,64 +579,6 @@ test('Can show affected repository tab and remove affected repos', async (done)
   assertNockRequest(bulkRemoveReposScope);
   assertNockRequest(cvFilterScope);
   assertNockRequest(cvAllReposScope);
-  assertNockRequest(packageGroupsScope, done);
-});
-
-test('Can filter by added/not added rules', async (done) => {
-  const autocompleteScope = mockAutocomplete(nockInstance, autocompleteUrl, autocompleteQuery);
-  const { rules } = cvFilterDetails;
-  const { name } = rules[0];
-
-  const cvFilterScope = nockInstance
-    .get(cvFilterDetailsPath)
-    .query(true)
-    .reply(200, cvFilterDetails);
-
-  const cvFiltersScope = nockInstance
-    .get(cvFiltersPath)
-    .query(true)
-    .reply(200, cvFilterFixtures);
-
-  const packageGroupsScope = nockInstance
-    .get(packageGroupsPath)
-    .query(true)
-    .times(3) // For first call (All), Added, and Not Added
-    .reply(200, allPackageGroups);
-
-  const {
-    getByText, queryByText, getByTestId, getByLabelText,
-  } = renderWithRedux(withCVRoute(<ContentViewFilterDetails
-    cvId={1}
-    details={details}
-  />), renderOptions);
-
-  // Nothing will show at first, page is loading
-  expect(queryByText(name)).toBeNull();
-
-  await patientlyWaitFor(() => {
-    expect(getByText(name)).toBeInTheDocument();
-    expect(getByTestId('allAddedNotAdded')).toBeInTheDocument();
-    fireEvent.click(getByTestId('allAddedNotAdded')?.childNodes[0]?.childNodes[0]);
-  });
-
-  await patientlyWaitFor(() => {
-    expect(getByLabelText(ADDED)).toBeInTheDocument();
-    getByLabelText(ADDED).click();
-  });
-
-  await patientlyWaitFor(() => {
-    expect(getByText(name)).toBeInTheDocument();
-    expect(getByTestId('allAddedNotAdded')).toBeInTheDocument();
-    fireEvent.click(getByTestId('allAddedNotAdded')?.childNodes[0]?.childNodes[0]);
-  });
-
-  await patientlyWaitFor(() => {
-    expect(getByLabelText(NOT_ADDED)).toBeInTheDocument();
-    getByLabelText(NOT_ADDED).click();
-  });
-
-  assertNockRequest(autocompleteScope);
-  assertNockRequest(cvFilterScope);
-  assertNockRequest(cvFiltersScope);
-  assertNockRequest(packageGroupsScope, done);
+  assertNockRequest(packageGroupsScope);
+  done();
 });

data/webpack/scenes/ContentViews/Details/Filters/__tests__/contentViewErrataByDateDetails.fixtures.json

@@ -7,6 +7,7 @@
   "updated_at": "2021-10-05 15:48:00 -0400",
   "content_view": {
     "composite": false,
+    "rolling": false,
     "component_ids": [],
     "default": false,
     "version_count": 4,

data/webpack/scenes/ContentViews/Details/Filters/__tests__/contentViewFilterDetails.test.js

@@ -65,7 +65,8 @@ test('Can show filter details and package groups on page load', async (done) =>
   assertNockRequest(autocompleteScope);
   assertNockRequest(cvFilterScope);
   assertNockRequest(cvFiltersScope);
-  assertNockRequest(packageGroupsScope, done);
+  assertNockRequest(packageGroupsScope);
+  done();
   act(done);
 });
 
@@ -145,6 +146,7 @@ test('Can search for package groups in package group filter', async (done) => {
   assertNockRequest(cvFiltersScope);
   assertNockRequest(packageGroupsScope);
   assertNockRequest(withSearchScope);
-  assertNockRequest(packageGroupSearchScope, done);
+  assertNockRequest(packageGroupSearchScope);
+  done();
   act(done);
 });

data/webpack/scenes/ContentViews/Details/Filters/__tests__/contentViewFilters.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 { Route } from 'react-router-dom';
 
 import api from '../../../../../services/api';
@@ -33,6 +33,38 @@ beforeEach(() => {
   [lastFilter] = results.slice(-1);
 });
 
+test('Shows call-to-action button when there are no filters', async (done) => {
+  const repoTypesResponse = [{ name: 'deb' }, { name: 'docker' }, { name: 'file' }, { name: 'ostree' }, { name: 'yum' }];
+  const repoTypeScope = nockInstance
+    .get(api.getApiUrl('/repositories/repository_types'))
+    .query(true)
+    .reply(200, repoTypesResponse);
+
+  const autocompleteScope = mockAutocomplete(nockInstance, autocompleteUrl);
+
+  const scope = nockInstance
+    .get(cvFilters)
+    .query(true)
+    .reply(200, emptyContentViewFiltersData);
+  const { queryByLabelText } =
+   renderWithRedux(withCVRoute(<ContentViewFilters cvId={1} details={details} />), renderOptions);
+
+  expect(queryByLabelText('create_filter_empty_state')).toBeNull();
+  await patientlyWaitFor(() => {
+    expect(queryByLabelText('create_filter_empty_state')).toBeInTheDocument();
+  });
+  await act(async () => {
+    fireEvent.click(queryByLabelText('create_filter_empty_state'));
+  });
+  await patientlyWaitFor(() => {
+    expect(queryByLabelText('create_filter')).toBeInTheDocument();
+  });
+  assertNockRequest(autocompleteScope);
+  assertNockRequest(repoTypeScope);
+  assertNockRequest(scope, done);
+  act(done);
+});
+
 test('Can call API and show filters on page load', async (done) => {
   const { name, description } = firstFilter;
   const autocompleteScope = mockAutocomplete(nockInstance, autocompleteUrl);
@@ -55,6 +87,7 @@ test('Can call API and show filters on page load', async (done) => {
 
   assertNockRequest(autocompleteScope);
   assertNockRequest(scope, done);
+  act(done);
 });
 
 test('Can search for filter', async (done) => {
@@ -116,6 +149,7 @@ test('Can search for filter', async (done) => {
   assertNockRequest(autocompleteScope);
   assertNockRequest(initialScope);
   assertNockRequest(withSearchScope, done);
+  act(done);
 });
 
 test('Can remove a filter', async (done) => {
@@ -143,17 +177,23 @@ test('Can remove a filter', async (done) => {
   );
 
   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'));
+  await act(async () => {
+    fireEvent.click(getByText('Remove'));
+  });
 
   assertNockRequest(autocompleteScope);
   assertNockRequest(getContentViewScope);
   assertNockRequest(removeFilterScope);
   assertNockRequest(callbackGetContentViewScope, done);
+  act(done);
 });
 
 test('Can remove multiple filters', async (done) => {
@@ -184,43 +224,17 @@ test('Can remove multiple filters', async (done) => {
     fireEvent.click(getByLabelText('Select all rows'));
     expect(getAllByLabelText('bulk_actions')[0]).toHaveAttribute('aria-expanded', 'false');
   });
-  fireEvent.click(getAllByLabelText('bulk_actions')[0]);
+  await act(async () => {
+    fireEvent.click(getAllByLabelText('bulk_actions')[0]);
+  });
   expect(getAllByLabelText('bulk_actions')[0]).toHaveAttribute('aria-expanded', 'true');
   await patientlyWaitFor(() => expect(getByText('Remove')).toBeInTheDocument());
-  fireEvent.click(getByText('Remove'));
-
+  await act(async () => {
+    fireEvent.click(getByText('Remove'));
+  });
   assertNockRequest(autocompleteScope);
   assertNockRequest(getContentViewScope);
   assertNockRequest(removeFilterScope);
   assertNockRequest(callbackGetContentViewScope, done);
-});
-
-test('Shows call-to-action button when there are no filters', async (done) => {
-  const repoTypesResponse = [{ name: 'deb' }, { name: 'docker' }, { name: 'file' }, { name: 'ostree' }, { name: 'yum' }];
-  const repoTypeScope = nockInstance
-    .get(api.getApiUrl('/repositories/repository_types'))
-    .query(true)
-    .reply(200, repoTypesResponse);
-
-  const autocompleteScope = mockAutocomplete(nockInstance, autocompleteUrl);
-
-  const scope = nockInstance
-    .get(cvFilters)
-    .query(true)
-    .reply(200, emptyContentViewFiltersData);
-
-  const { queryByLabelText } =
-    renderWithRedux(withCVRoute(<ContentViewFilters cvId={1} details={details} />), renderOptions);
-
-  expect(queryByLabelText('create_filter_empty_state')).toBeNull();
-  await patientlyWaitFor(() => {
-    expect(queryByLabelText('create_filter_empty_state')).toBeInTheDocument();
-  });
-  fireEvent.click(queryByLabelText('create_filter_empty_state'));
-  await patientlyWaitFor(() => {
-    expect(queryByLabelText('create_filter')).toBeInTheDocument();
-  });
-  assertNockRequest(autocompleteScope);
-  assertNockRequest(repoTypeScope);
-  assertNockRequest(scope, done);
+  act(done);
 });

data/webpack/scenes/ContentViews/Details/Filters/__tests__/cvErrataDateFilterContent.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 * as reactRedux from 'react-redux';
 import {
   nockInstance,
@@ -52,7 +52,9 @@ test('Can display errata-date filter rule and edit', async (done) => {
     expect(getByText('08/15/2020')).toBeInTheDocument();
   });
   // Can clear date with chip
-  getByLabelText('08/15/1990').click();
+  await act(async () => {
+    getByLabelText('08/15/1990').click();
+  });
   await patientlyWaitFor(() => {
     expect(getByText('ANY')).toBeInTheDocument();
     expect(queryByText('08/15/1990')).not.toBeInTheDocument();
@@ -60,8 +62,11 @@ test('Can display errata-date filter rule and edit', async (done) => {
     // Enabled Edit rule button
     expect(getByLabelText('save_filter_rule')).toHaveAttribute('aria-disabled', 'false');
   });
-  getByLabelText('save_filter_rule').click();
+  await act(async () => {
+    getByLabelText('save_filter_rule').click();
+  });
 
   useSelectorMock.mockClear();
-  assertNockRequest(ruleEditScope, done);
+  assertNockRequest(ruleEditScope);
+  done();
 });

data/webpack/scenes/ContentViews/Details/Filters/__tests__/cvErrataIDFilter.test.js

@@ -72,7 +72,8 @@ test('Can enable and disable add filter button', async (done) => {
   assertNockRequest(autocompleteScope);
   assertNockRequest(cvFilterScope);
   assertNockRequest(cvFiltersScope);
-  assertNockRequest(errataScope, done);
+  assertNockRequest(errataScope);
+  done();
   act(done);
 });
 
@@ -118,10 +119,10 @@ test('Can add a filter rule', async (done) => {
 
   await patientlyWaitFor(() => {
     expect(getByText(errataId)).toBeInTheDocument();
-    expect(getAllByLabelText('Actions')[3]).toHaveAttribute('aria-expanded', 'false');
+    expect(getAllByLabelText('Kebab toggle')[1]).toHaveAttribute('aria-expanded', 'false');
   });
-  fireEvent.click(getAllByLabelText('Actions')[3]);
-  expect(getAllByLabelText('Actions')[3]).toHaveAttribute('aria-expanded', 'true');
+  fireEvent.click(getAllByLabelText('Kebab toggle')[1]);
+  expect(getAllByLabelText('Kebab toggle')[1]).toHaveAttribute('aria-expanded', 'true');
   await patientlyWaitFor(() => expect(getByText('Add')).toBeInTheDocument());
   act(() => { fireEvent.click(getByText('Add')); });
 
@@ -131,7 +132,8 @@ test('Can add a filter rule', async (done) => {
   assertNockRequest(cvFiltersScope);
   assertNockRequest(cvFiltersRuleScope);
   assertNockRequest(cvRequestCallbackScope);
-  assertNockRequest(errataScope, done);
+  assertNockRequest(errataScope);
+  done();
   act(done);
 });
 
@@ -176,10 +178,10 @@ test('Can remove a filter rule', async (done) => {
 
   await patientlyWaitFor(() => {
     expect(getByText(errataId)).toBeInTheDocument();
-    expect(getAllByLabelText('Actions')[2]).toHaveAttribute('aria-expanded', 'false');
+    expect(getAllByLabelText('Kebab toggle')[2]).toHaveAttribute('aria-expanded', 'false');
   });
-  fireEvent.click(getAllByLabelText('Actions')[2]);
-  expect(getAllByLabelText('Actions')[2]).toHaveAttribute('aria-expanded', 'true');
+  fireEvent.click(getAllByLabelText('Kebab toggle')[2]);
+  expect(getAllByLabelText('Kebab toggle')[2]).toHaveAttribute('aria-expanded', 'true');
   await patientlyWaitFor(() => expect(getByText('Remove')).toBeInTheDocument());
   act(() => { fireEvent.click(getByText('Remove')); });
 
@@ -189,7 +191,8 @@ test('Can remove a filter rule', async (done) => {
   assertNockRequest(cvFiltersScope);
   assertNockRequest(cvFiltersRuleScope);
   assertNockRequest(cvRequestCallbackScope);
-  assertNockRequest(errataScope, done);
+  assertNockRequest(errataScope);
+  done();
   act(done);
 });
 
@@ -253,7 +256,8 @@ test('Can bulk remove filter rules', async (done) => {
   assertNockRequest(cvFiltersScope);
   assertNockRequest(cvFiltersRuleBulkDeleteScope);
   assertNockRequest(cvRequestCallbackScope);
-  assertNockRequest(errataScope, done);
+  assertNockRequest(errataScope);
+  done();
   act(done);
 });
 
@@ -314,7 +318,8 @@ test('Can bulk add filter rules', async (done) => {
   assertNockRequest(cvFiltersScope);
   assertNockRequest(cvFiltersRuleBulkAddScope);
   assertNockRequest(cvRequestCallbackScope);
-  assertNockRequest(errataScope, done);
+  assertNockRequest(errataScope);
+  done();
   act(done);
 });
 
@@ -395,6 +400,7 @@ test('Can show filters and chips', async (done) => {
   assertNockRequest(errataScope); // 2nd call on status selection
   assertNockRequest(errataScope); // 3rd call on errata type selection
   assertNockRequest(errataScope); // 4th call on start date change
-  assertNockRequest(errataScope, done); // Last call on end date change
+  assertNockRequest(errataScope);
+  done(); // Last call on end date change
   act(done);
 });

data/webpack/scenes/ContentViews/Details/Filters/__tests__/cvErratumFilterDetails.fixtures.json

@@ -7,6 +7,7 @@
     "updated_at": "2020-12-08 09:26:11 -0500",
     "content_view": {
         "composite": false,
+        "rolling": false,
         "component_ids": [],
         "default": false,
         "version_count": 0,

data/webpack/scenes/ContentViews/Details/Filters/__tests__/cvFilterDetailModuleAffectedRepos.fixtures.json

@@ -7,6 +7,7 @@
   "updated_at": "2021-08-23 14:46:28 -0400",
   "content_view": {
     "composite": false,
+    "rolling": false,
     "component_ids": [],
     "default": false,
     "version_count": 4,