katello 4.5.1 → 4.8.0.rc2

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

@@ -4,9 +4,10 @@ import { Route } from 'react-router-dom';
 
 import ContentViewFilterDetails from '../ContentViewFilterDetails';
 import { ADDED, cvFilterDetailsKey, NOT_ADDED } from '../../../ContentViewsConstants';
-import nock, {
+import {
   nockInstance,
   assertNockRequest,
+  mockAutocomplete,
 } from '../../../../../test-utils/nockWrapper';
 import api from '../../../../../services/api';
 
@@ -27,6 +28,13 @@ const cvBulkRemoveFilterRulesPath = api.getApiUrl('/content_view_filters/1/remov
 const cvBulkAddFilterRulesPath = api.getApiUrl('/content_view_filters/1/add_filter_rules');
 const cvGetAllReposPath = api.getApiUrl('/content_views/1/repositories');
 
+const autocompleteUrl = '/package_groups/auto_complete_search';
+const autocompleteQuery = {
+  filterid: 1,
+  organization_id: 1,
+  search: '',
+};
+
 const packageGroupsPath = api.getApiUrl('/package_groups');
 const renderOptions = {
   apiNamespace: cvFilterDetailsKey(1, 1),
@@ -38,13 +46,10 @@ const renderOptions = {
 
 const withCVRoute = component => <Route path="/content_views/:id([0-9]+)#/filters/:filterId([0-9]+)">{component}</Route>;
 
-afterEach(() => {
-  nock.cleanAll();
-});
-
 jest.mock('../../../../../components/Search', () => () => 'mocked!');
 
 test('Can enable and disable add filter button', async (done) => {
+  const autocompleteScope = mockAutocomplete(nockInstance, autocompleteUrl, autocompleteQuery);
   const { name: cvFilterName } = cvFilterDetails;
   const cvFilterScope = nockInstance
     .get(cvFilterDetailsPath)
@@ -78,12 +83,14 @@ test('Can enable and disable add filter button', async (done) => {
     expect(getByLabelText('add_filter_rule')).toHaveAttribute('aria-disabled', 'false');
   });
 
+  assertNockRequest(autocompleteScope);
   assertNockRequest(cvFilterScope);
   assertNockRequest(cvFiltersScope);
   assertNockRequest(packageGroupsScope, done);
 });
 
 test('Can remove a filter rule', async (done) => {
+  const autocompleteScope = mockAutocomplete(nockInstance, autocompleteUrl, autocompleteQuery);
   const { rules } = cvFilterDetails;
   const { name } = rules[0];
 
@@ -122,14 +129,15 @@ test('Can remove a filter rule', async (done) => {
 
   await patientlyWaitFor(() => {
     expect(getByText(name)).toBeInTheDocument();
-    expect(getAllByLabelText('Actions')[1]).toHaveAttribute('aria-expanded', 'false');
+    expect(getAllByLabelText('Actions')[2]).toHaveAttribute('aria-expanded', 'false');
   });
-  fireEvent.click(getAllByLabelText('Actions')[1]);
-  expect(getAllByLabelText('Actions')[1]).toHaveAttribute('aria-expanded', 'true');
+  fireEvent.click(getAllByLabelText('Actions')[2]);
+  expect(getAllByLabelText('Actions')[2]).toHaveAttribute('aria-expanded', 'true');
   await patientlyWaitFor(() => expect(getByText('Remove')).toBeInTheDocument());
   fireEvent.click(getByText('Remove'));
 
 
+  assertNockRequest(autocompleteScope);
   assertNockRequest(cvFilterScope);
   assertNockRequest(cvFiltersScope);
   assertNockRequest(cvFiltersRuleScope);
@@ -139,6 +147,7 @@ test('Can remove a filter rule', async (done) => {
 });
 
 test('Can add a filter rule', async (done) => {
+  const autocompleteScope = mockAutocomplete(nockInstance, autocompleteUrl, autocompleteQuery);
   const { rules } = cvFilterDetails;
   const { name } = rules[0];
 
@@ -179,14 +188,15 @@ test('Can add a filter rule', async (done) => {
 
   await patientlyWaitFor(() => {
     expect(getByText(name)).toBeInTheDocument();
-    expect(getAllByLabelText('Actions')[2]).toHaveAttribute('aria-expanded', 'false');
+    expect(getAllByLabelText('Actions')[3]).toHaveAttribute('aria-expanded', 'false');
   });
-  fireEvent.click(getAllByLabelText('Actions')[2]);
-  expect(getAllByLabelText('Actions')[2]).toHaveAttribute('aria-expanded', 'true');
+  fireEvent.click(getAllByLabelText('Actions')[3]);
+  expect(getAllByLabelText('Actions')[3]).toHaveAttribute('aria-expanded', 'true');
   await patientlyWaitFor(() => expect(getByText('Add')).toBeInTheDocument());
   fireEvent.click(getByText('Add'));
 
 
+  assertNockRequest(autocompleteScope);
   assertNockRequest(cvFilterScope);
   assertNockRequest(cvFiltersScope);
   assertNockRequest(cvFiltersRuleScope);
@@ -196,6 +206,7 @@ test('Can add a filter rule', async (done) => {
 });
 
 test('Can bulk remove filter rules', async (done) => {
+  const autocompleteScope = mockAutocomplete(nockInstance, autocompleteUrl, autocompleteQuery);
   const { rules } = cvFilterDetails;
   const { name } = rules[0];
 
@@ -247,6 +258,7 @@ test('Can bulk remove filter rules', async (done) => {
   expect(getByLabelText('bulk_remove')).toBeInTheDocument();
   fireEvent.click(getByLabelText('bulk_remove'));
 
+  assertNockRequest(autocompleteScope);
   assertNockRequest(cvFilterScope);
   assertNockRequest(cvFiltersScope);
   assertNockRequest(cvFiltersRuleBulkDeleteScope);
@@ -256,6 +268,7 @@ test('Can bulk remove filter rules', async (done) => {
 });
 
 test('Can bulk add filter rules', async (done) => {
+  const autocompleteScope = mockAutocomplete(nockInstance, autocompleteUrl, autocompleteQuery);
   const { rules } = cvFilterDetails;
   const { name } = rules[0];
 
@@ -304,6 +317,7 @@ test('Can bulk add filter rules', async (done) => {
   expect(getByLabelText('add_filter_rule')).toBeInTheDocument();
   fireEvent.click(getByLabelText('add_filter_rule'));
 
+  assertNockRequest(autocompleteScope);
   assertNockRequest(cvFilterScope);
   assertNockRequest(cvFiltersScope);
   assertNockRequest(cvFiltersRuleBulkAddScope);
@@ -312,6 +326,26 @@ test('Can bulk add filter rules', async (done) => {
 });
 
 test('Can show affected repository tab on dropdown selection and add repos', async (done) => {
+  const autocompleteScope = mockAutocomplete(
+    nockInstance,
+    autocompleteUrl,
+    autocompleteQuery,
+    [],
+    2,
+  );
+  const autocompleteUrlRepo = '/repositories/auto_complete_search';
+  const autocompleteQueryRepo = {
+    organization_id: 1,
+    search: '',
+  };
+  const autocompleteScopeRepo = mockAutocomplete(
+    nockInstance,
+    autocompleteUrlRepo,
+    autocompleteQueryRepo,
+    [],
+    2,
+  );
+
   const { rules } = cvFilterDetails;
   const { name } = rules[0];
   const { results } = cvAllRepos;
@@ -384,10 +418,31 @@ test('Can show affected repository tab on dropdown selection and add repos', asy
   assertNockRequest(bulkAddReposScope);
   assertNockRequest(cvFilterScope);
   assertNockRequest(cvAllReposScope);
+  assertNockRequest(autocompleteScope);
+  assertNockRequest(autocompleteScopeRepo);
   assertNockRequest(packageGroupsScope, done);
 });
 
 test('Can show affected repository tab and remove affected repos', async (done) => {
+  const autocompleteScope = mockAutocomplete(
+    nockInstance,
+    autocompleteUrl,
+    autocompleteQuery,
+    [],
+    2,
+  );
+  const autocompleteUrlRepo = '/repositories/auto_complete_search';
+  const autocompleteQueryRepo = {
+    organization_id: 1,
+    search: '',
+  };
+  const autocompleteScopeRepo = mockAutocomplete(
+    nockInstance,
+    autocompleteUrlRepo,
+    autocompleteQueryRepo,
+    [],
+    2,
+  );
   const { rules } = cvFilterDetailsAffectedRepos;
   const { name } = rules[0];
   const { results } = cvAllRepos;
@@ -448,6 +503,9 @@ test('Can show affected repository tab and remove affected repos', async (done)
   fireEvent.click(getAllByLabelText('bulk_actions')[1]);
   expect(getByLabelText('bulk_remove')).toHaveAttribute('aria-disabled', 'false');
   fireEvent.click(getByLabelText('bulk_remove'));
+
+  assertNockRequest(autocompleteScope);
+  assertNockRequest(autocompleteScopeRepo);
   assertNockRequest(cvFilterScope);
   assertNockRequest(cvFiltersScope);
   assertNockRequest(cvAllReposScope);
@@ -458,6 +516,7 @@ test('Can show affected repository tab and remove affected repos', async (done)
 });
 
 test('Can filter by added/not added rules', async (done) => {
+  const autocompleteScope = mockAutocomplete(nockInstance, autocompleteUrl, autocompleteQuery);
   const { rules } = cvFilterDetails;
   const { name } = rules[0];
 
@@ -509,6 +568,7 @@ test('Can filter by added/not added rules', async (done) => {
     getByLabelText(NOT_ADDED).click();
   });
 
+  assertNockRequest(autocompleteScope);
   assertNockRequest(cvFilterScope);
   assertNockRequest(cvFiltersScope);
   assertNockRequest(packageGroupsScope, done);

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

@@ -4,11 +4,10 @@ import { Route } from 'react-router-dom';
 
 import ContentViewFilterDetails from '../ContentViewFilterDetails';
 import { cvFilterDetailsKey } from '../../../ContentViewsConstants';
-import nock, {
+import {
   nockInstance,
   assertNockRequest,
   mockAutocomplete,
-  mockSetting,
 } from '../../../../../test-utils/nockWrapper';
 import api from '../../../../../services/api';
 import allPackageGroups from './allFilterPackageGroups.fixtures.json';
@@ -27,22 +26,14 @@ const renderOptions = {
     initialIndex: 1,
   },
 };
+const autocompleteQuery = {
+  filterid: 1,
+  organization_id: 1,
+  search: '',
+};
 
 const withCVRoute = component => <Route path="/content_views/:id([0-9]+)#/filters/:filterId([0-9]+)">{component}</Route>;
 
-let searchDelayScope;
-let autoSearchScope;
-beforeEach(() => {
-  searchDelayScope = mockSetting(nockInstance, 'autosearch_delay', 0);
-  autoSearchScope = mockSetting(nockInstance, 'autosearch_while_typing');
-});
-
-afterEach(() => {
-  assertNockRequest(searchDelayScope);
-  assertNockRequest(autoSearchScope);
-  nock.cleanAll();
-});
-
 test('Can show filter details and package groups on page load', async (done) => {
   const { name: cvFilterName } = cvFilterDetails;
   const cvFilterScope = nockInstance
@@ -57,7 +48,7 @@ test('Can show filter details and package groups on page load', async (done) =>
     .get(packageGroupsPath)
     .query(true)
     .reply(200, allPackageGroups);
-  const autocompleteScope = mockAutocomplete(nockInstance, autocompleteUrl);
+  const autocompleteScope = mockAutocomplete(nockInstance, autocompleteUrl, autocompleteQuery);
   const { getByText, queryByText } =
     renderWithRedux(withCVRoute(<ContentViewFilterDetails
       cvId={1}
@@ -84,7 +75,25 @@ test('Can search for package groups in package group filter', async (done) => {
   const { name: cvFilterName } = cvFilterDetails;
   const { name: firstPackageGroupName } = firstPackageGroup;
   const { name: lastPackageGroupName } = lastPackageGroup;
-  const searchQueryMatcher = actualParams => actualParams?.search?.includes(lastPackageGroupName);
+  const searchQueryMatcher = {
+    filterid: 1,
+    organization_id: 1,
+    search: `name = ${lastPackageGroupName}`,
+  };
+  const searchResults = [
+    {
+      completed: `name = ${lastPackageGroupName}`,
+      part: 'and',
+      label: `name = ${lastPackageGroupName} and`,
+      category: 'Operators',
+    },
+    {
+      completed: `name = ${lastPackageGroupName}`,
+      part: 'or',
+      label: `name = ${lastPackageGroupName} or`,
+      category: 'Operators',
+    },
+  ];
 
   const cvFilterScope = nockInstance
     .get(cvFilterDetailsPath)
@@ -104,8 +113,13 @@ test('Can search for package groups in package group filter', async (done) => {
     .reply(200, { results: [lastPackageGroup] });
 
   const autocompleteScope =
-    mockAutocomplete(nockInstance, autocompleteUrl);
-  const withSearchScope = mockAutocomplete(nockInstance, autocompleteUrl, searchQueryMatcher);
+    mockAutocomplete(nockInstance, autocompleteUrl, autocompleteQuery);
+  const withSearchScope = mockAutocomplete(
+    nockInstance,
+    autocompleteUrl,
+    searchQueryMatcher,
+    searchResults,
+  );
   const { getByText, queryByText, getByLabelText } =
     renderWithRedux(withCVRoute(<ContentViewFilterDetails
       cvId={1}
@@ -119,10 +133,11 @@ test('Can search for package groups in package group filter', async (done) => {
   });
 
   // Search and only searched result shows
-  fireEvent.change(getByLabelText(/text input for search/i), { target: { value: lastPackageGroupName } });
+  getByLabelText('Search input').focus();
+  fireEvent.change(getByLabelText('Search input'), { target: { value: `name = ${lastPackageGroupName}` } });
   await patientlyWaitFor(() => {
-    expect(getByText(lastPackageGroupName)).toBeInTheDocument();
-    expect(queryByText(firstPackageGroupName)).not.toBeInTheDocument();
+    expect(getByText(`name = ${lastPackageGroupName} and`)).toBeInTheDocument();
+    expect(queryByText(`name = ${firstPackageGroupName} and`)).not.toBeInTheDocument();
   });
 
   assertNockRequest(autocompleteScope);

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

@@ -3,11 +3,12 @@ import { renderWithRedux, patientlyWaitFor, fireEvent } from 'react-testing-lib-
 import { Route } from 'react-router-dom';
 
 import api from '../../../../../services/api';
-import nock, { nockInstance, assertNockRequest, mockAutocomplete, mockSetting } from '../../../../../test-utils/nockWrapper';
+import { nockInstance, assertNockRequest, mockAutocomplete } from '../../../../../test-utils/nockWrapper';
 import ContentViewFilters from '../ContentViewFilters';
 import CONTENT_VIEWS_KEY from '../../../ContentViewsConstants';
 import cvFilterFixtures from './contentViewFilters.fixtures.json';
 import details from '../../../__tests__/mockDetails.fixtures.json';
+import emptyContentViewFiltersData from './emptyContentViewFilters.fixtures.json';
 
 const withCVRoute = component =>
   <Route path="/content_views/:id([0-9]+)#/filters">{component}</Route>;
@@ -26,20 +27,10 @@ const autocompleteUrl = '/content_view_filters/auto_complete_search';
 
 let firstFilter;
 let lastFilter;
-let searchDelayScope;
-let autoSearchScope;
 beforeEach(() => {
   const { results } = cvFilterFixtures;
   [firstFilter] = results;
   [lastFilter] = results.slice(-1);
-  searchDelayScope = mockSetting(nockInstance, 'autosearch_delay', 0);
-  autoSearchScope = mockSetting(nockInstance, 'autosearch_while_typing');
-});
-
-afterEach(() => {
-  assertNockRequest(searchDelayScope);
-  assertNockRequest(autoSearchScope);
-  nock.cleanAll();
 });
 
 test('Can call API and show filters on page load', async (done) => {
@@ -68,17 +59,39 @@ test('Can call API and show filters on page load', async (done) => {
 
 test('Can search for filter', async (done) => {
   const { name, description } = firstFilter;
-  const searchQueryMatcher = actualParams => actualParams?.search?.includes(name);
-  const autocompleteScope = mockAutocomplete(nockInstance, autocompleteUrl);
-  const withSearchScope = mockAutocomplete(nockInstance, autocompleteUrl, searchQueryMatcher);
+  const autocompleteQuery = {
+    organization_id: 1,
+    search: '',
+  };
+  const searchQueryMatcher = {
+    organization_id: 1,
+    search: 'name = f5',
+  };
+  const searchResults = [
+    {
+      completed: 'name = f5',
+      part: 'and',
+      label: 'name = f5 and',
+      category: 'Operators',
+    },
+    {
+      completed: 'name = f5',
+      part: 'or',
+      label: 'name = f5 or',
+      category: 'Operators',
+    },
+  ];
+  const autocompleteScope = mockAutocomplete(nockInstance, autocompleteUrl, autocompleteQuery);
+  const withSearchScope = mockAutocomplete(
+    nockInstance,
+    autocompleteUrl,
+    searchQueryMatcher,
+    searchResults,
+  );
   const initialScope = nockInstance
     .get(cvFilters)
     .query(true)
     .reply(200, cvFilterFixtures);
-  const searchResultScope = nockInstance
-    .get(cvFilters)
-    .query(searchQueryMatcher)
-    .reply(200, { results: [firstFilter] });
 
   const { queryByText, getByLabelText, getByText } = renderWithRedux(
     withCVRoute(<ContentViewFilters cvId={1} details={details} />),
@@ -86,19 +99,23 @@ test('Can search for filter', async (done) => {
   );
 
   // Looking for description because the name is in the search bar and could match
-  await patientlyWaitFor(() => expect(getByText(description)).toBeInTheDocument());
+  await patientlyWaitFor(() => {
+    expect(getByText(description)).toBeInTheDocument();
+    expect(getByText(name)).toBeInTheDocument();
+    expect(getByText('f5')).toBeInTheDocument();
+  });
   // Search for a filter by name
-  fireEvent.change(getByLabelText(/text input for search/i), { target: { value: name } });
+  getByLabelText('Search input').focus();
+  fireEvent.change(getByLabelText('Search input'), { target: { value: `name = ${lastFilter.name}` } });
   // Only the first filter should be showing, not the last one
   await patientlyWaitFor(() => {
-    expect(getByText(description)).toBeInTheDocument();
-    expect(queryByText(lastFilter.name)).not.toBeInTheDocument();
+    expect(getByText(`name = ${lastFilter.name} and`)).toBeInTheDocument();
+    expect(queryByText(`name = ${name} and`)).not.toBeInTheDocument();
   });
 
   assertNockRequest(autocompleteScope);
-  assertNockRequest(withSearchScope);
   assertNockRequest(initialScope);
-  assertNockRequest(searchResultScope, done);
+  assertNockRequest(withSearchScope, done);
 });
 
 test('Can remove a filter', async (done) => {
@@ -177,3 +194,33 @@ test('Can remove multiple filters', async (done) => {
   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);
+});

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

@@ -4,11 +4,10 @@ import { Route } from 'react-router-dom';
 
 import ContentViewFilterDetails from '../ContentViewFilterDetails';
 import { cvFilterDetailsKey } from '../../../ContentViewsConstants';
-import nock, {
+import {
   nockInstance,
   assertNockRequest,
   mockAutocomplete,
-  mockSetting,
 } from '../../../../../test-utils/nockWrapper';
 import api from '../../../../../services/api';
 import allErrata from './allFilterErrata.fixtures.json';
@@ -37,19 +36,6 @@ const renderOptions = {
 
 const withCVRoute = component => <Route path="/content_views/:id([0-9]+)#/filters/:filterId([0-9]+)">{component}</Route>;
 
-let searchDelayScope;
-let autoSearchScope;
-beforeEach(() => {
-  searchDelayScope = mockSetting(nockInstance, 'autosearch_delay', 0);
-  autoSearchScope = mockSetting(nockInstance, 'autosearch_while_typing');
-});
-
-afterEach(() => {
-  assertNockRequest(searchDelayScope);
-  assertNockRequest(autoSearchScope);
-  nock.cleanAll();
-});
-
 test('Can enable and disable add filter button', async (done) => {
   const { name: cvFilterName } = cvFilterDetails;
   const cvFilterScope = nockInstance
@@ -133,10 +119,10 @@ test('Can add a filter rule', async (done) => {
 
   await patientlyWaitFor(() => {
     expect(getByText(errataId)).toBeInTheDocument();
-    expect(getAllByLabelText('Actions')[2]).toHaveAttribute('aria-expanded', 'false');
+    expect(getAllByLabelText('Actions')[3]).toHaveAttribute('aria-expanded', 'false');
   });
-  fireEvent.click(getAllByLabelText('Actions')[2]);
-  expect(getAllByLabelText('Actions')[2]).toHaveAttribute('aria-expanded', 'true');
+  fireEvent.click(getAllByLabelText('Actions')[3]);
+  expect(getAllByLabelText('Actions')[3]).toHaveAttribute('aria-expanded', 'true');
   await patientlyWaitFor(() => expect(getByText('Add')).toBeInTheDocument());
   fireEvent.click(getByText('Add'));
 
@@ -191,10 +177,10 @@ test('Can remove a filter rule', async (done) => {
 
   await patientlyWaitFor(() => {
     expect(getByText(errataId)).toBeInTheDocument();
-    expect(getAllByLabelText('Actions')[1]).toHaveAttribute('aria-expanded', 'false');
+    expect(getAllByLabelText('Actions')[2]).toHaveAttribute('aria-expanded', 'false');
   });
-  fireEvent.click(getAllByLabelText('Actions')[1]);
-  expect(getAllByLabelText('Actions')[1]).toHaveAttribute('aria-expanded', 'true');
+  fireEvent.click(getAllByLabelText('Actions')[2]);
+  expect(getAllByLabelText('Actions')[2]).toHaveAttribute('aria-expanded', 'true');
   await patientlyWaitFor(() => expect(getByText('Remove')).toBeInTheDocument());
   fireEvent.click(getByText('Remove'));
 

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

@@ -4,11 +4,10 @@ import { Route } from 'react-router-dom';
 
 import ContentViewFilterDetails from '../ContentViewFilterDetails';
 import { ADDED, cvFilterDetailsKey, NOT_ADDED } from '../../../ContentViewsConstants';
-import nock, {
+import {
   nockInstance,
   assertNockRequest,
   mockAutocomplete,
-  mockSetting,
 } from '../../../../../test-utils/nockWrapper';
 import api from '../../../../../services/api';
 import allModuleStreams from './allFilterModulesStreams.fixtures.json';
@@ -37,19 +36,6 @@ const renderOptions = {
 
 const withCVRoute = component => <Route path="/content_views/:id([0-9]+)#/filters/:filterId([0-9]+)">{component}</Route>;
 
-let searchDelayScope;
-let autoSearchScope;
-beforeEach(() => {
-  searchDelayScope = mockSetting(nockInstance, 'autosearch_delay', 0);
-  autoSearchScope = mockSetting(nockInstance, 'autosearch_while_typing');
-});
-
-afterEach(() => {
-  assertNockRequest(searchDelayScope);
-  assertNockRequest(autoSearchScope);
-  nock.cleanAll();
-});
-
 test('Can enable and disable add filter button', async (done) => {
   const { name: cvFilterName } = cvFilterDetails;
   const cvFilterScope = nockInstance
@@ -133,20 +119,18 @@ test('Can add a filter rule', async (done) => {
 
   await patientlyWaitFor(() => {
     expect(getByText(name)).toBeInTheDocument();
-    expect(getAllByLabelText('Actions')[2]).toHaveAttribute('aria-expanded', 'false');
+    expect(getAllByLabelText('Actions')[3]).toHaveAttribute('aria-expanded', 'false');
   });
-  fireEvent.click(getAllByLabelText('Actions')[2]);
-  expect(getAllByLabelText('Actions')[2]).toHaveAttribute('aria-expanded', 'true');
+  fireEvent.click(getAllByLabelText('Actions')[3]);
+  expect(getAllByLabelText('Actions')[3]).toHaveAttribute('aria-expanded', 'true');
   await patientlyWaitFor(() => expect(getByText('Add')).toBeInTheDocument());
   fireEvent.click(getByText('Add'));
 
-
   assertNockRequest(autocompleteScope);
   assertNockRequest(cvFilterScope);
   assertNockRequest(cvFiltersScope);
   assertNockRequest(cvFiltersRuleScope);
   assertNockRequest(cvRequestCallbackScope);
-
   assertNockRequest(moduleStreamsScope, done);
 });
 
@@ -191,10 +175,10 @@ test('Can remove a filter rule', async (done) => {
 
   await patientlyWaitFor(() => {
     expect(getByText(name)).toBeInTheDocument();
-    expect(getAllByLabelText('Actions')[1]).toHaveAttribute('aria-expanded', 'false');
+    expect(getAllByLabelText('Actions')[2]).toHaveAttribute('aria-expanded', 'false');
   });
-  fireEvent.click(getAllByLabelText('Actions')[1]);
-  expect(getAllByLabelText('Actions')[1]).toHaveAttribute('aria-expanded', 'true');
+  fireEvent.click(getAllByLabelText('Actions')[2]);
+  expect(getAllByLabelText('Actions')[2]).toHaveAttribute('aria-expanded', 'true');
   await patientlyWaitFor(() => expect(getByText('Remove')).toBeInTheDocument());
   fireEvent.click(getByText('Remove'));
 

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

@@ -0,0 +1,13 @@
+{
+  "total": 0,
+  "subtotal": 0,
+  "page": 1,
+  "per_page": 20,
+  "error": null,
+  "search": null,
+  "sort": {
+    "by": "id",
+    "order": "asc"
+  },
+  "results":[]
+}

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

@@ -0,0 +1,13 @@
+{
+  "total": 0,
+  "subtotal": 0,
+  "page": "1",
+  "per_page": "20",
+  "error": null,
+  "search": null,
+  "sort": {
+    "by": "id",
+    "order": "asc"
+  },
+  "results": []
+}

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

@@ -0,0 +1,13 @@
+{
+  "total": 0,
+  "subtotal": 0,
+  "page": "1",
+  "per_page": "20",
+  "error": null,
+  "search": null,
+  "sort": {
+     "by": "name",
+     "order": "asc"
+  },
+  "results": []
+}

data/webpack/scenes/ContentViews/Details/Histories/ContentViewHistories.js

@@ -83,11 +83,12 @@ const ContentViewHistories = ({ cvId }) => {
       }}
       ouiaId="content-view-history-table"
       variant={TableVariant.compact}
-      autocompleteEndpoint={`/content_views/${cvId}/history/auto_complete_search`}
+      autocompleteEndpoint={`/katello/api/v2/content_views/${cvId}/history`}
+      bookmarkController="katello_content_view_histories"
       fetchItems={useCallback(params => getContentViewHistories(cvId, params), [cvId])}
     >
       <Thead>
-        <Tr>
+        <Tr ouiaId="column-headers">
           {columnHeaders.map(col =>
             <Th key={col}>{col}</Th>)}
         </Tr>
@@ -103,7 +104,7 @@ const ContentViewHistories = ({ cvId }) => {
             user,
           } = history;
           return (
-            <Tr key={index}>
+            <Tr key={index} ouiaId={`history-row-${index}`}>
               <Td><LongDateTime date={createdAt} showRelativeTimeTooltip /></Td>
               <Td>
                 <Link to={`/versions/${versionId}`}>{`Version ${version}`}</Link>