katello 4.7.2 → 4.8.0.rc1

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

@@ -32,6 +32,10 @@ const addedRule = {
 };
 
 const autocompleteUrl = '/content_view_filters/195/rules/auto_complete_search';
+const autocompleteQuery = {
+  organization_id: 1,
+  search: '',
+};
 const renderOptions = {
   apiNamespace: cvFilterDetailsKey(13, 195),
   routerParams: {
@@ -42,20 +46,8 @@ 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);
-});
-
 test('Can view container image filter rules', async (done) => {
-  const autocompleteScope = mockAutocomplete(nockInstance, autocompleteUrl);
+  const autocompleteScope = mockAutocomplete(nockInstance, autocompleteUrl, autocompleteQuery);
   const cvFiltersScope = nockInstance
     .get(cvFilterRulesPath)
     .query(true)
@@ -89,7 +81,7 @@ test('Can view container image filter rules', async (done) => {
 
 // Remove
 test('Can remove filter rules', async (done) => {
-  const autocompleteScope = mockAutocomplete(nockInstance, autocompleteUrl);
+  const autocompleteScope = mockAutocomplete(nockInstance, autocompleteUrl, autocompleteQuery);
 
   const cvFiltersScope = nockInstance
     .get(cvFilterRulesPath)
@@ -140,10 +132,16 @@ test('Can remove filter rules', async (done) => {
 
 // Add
 test('Can add filter rules', async (done) => {
-  const autocompleteScope = mockAutocomplete(nockInstance, autocompleteUrl, true, [], 2);
+  const autocompleteScope = mockAutocomplete(
+    nockInstance,
+    autocompleteUrl,
+    autocompleteQuery,
+    [],
+    2,
+  );
   const autocompleteNameScope = mockAutocomplete(nockInstance, autocompleteNameUrl, true, [], 2);
-  const inputSearchDelayScope = mockSetting(nockInstance, 'autosearch_delay', 0, 2);
-  const inputAutoSearchScope = mockSetting(nockInstance, 'autosearch_while_typing', undefined, 2);
+  const searchDelayScope = mockSetting(nockInstance, 'autosearch_delay', 0);
+  const autoSearchScope = mockSetting(nockInstance, 'autosearch_while_typing');
 
   const cvFiltersScope = nockInstance
     .get(cvFilterRulesPath)
@@ -160,7 +158,7 @@ test('Can add filter rules', async (done) => {
     .query(true)
     .reply(200, { ...cvFilterFixtures, results: [...cvFilterFixtures.results, addedRule] });
 
-  const { queryByText, getByLabelText, getAllByLabelText } =
+  const { queryByText, getByLabelText } =
     renderWithRedux(
       withCVRoute(<CVContainerImageFilterContent filterId={195} details={details} />),
       renderOptions,
@@ -174,29 +172,23 @@ test('Can add filter rules', async (done) => {
     fireEvent.click(getByLabelText('add_filter_rule'));
   });
 
-
-  await patientlyWaitFor(() => {
-    expect(getAllByLabelText('text input for search')[0]).toBeInTheDocument();
-  });
-
-  fireEvent.change(getAllByLabelText('text input for search')[0], { target: { value: `name = ${addedRule.name}` } });
-
   await patientlyWaitFor(() => {
     expect(getByLabelText('add_edit_filter_rule')).toBeInTheDocument();
     expect(getByLabelText('add_edit_filter_rule')).toHaveAttribute('aria-disabled', 'true');
   });
 
-  fireEvent.submit(getAllByLabelText('text input for search')[1]);
+  fireEvent.change(getByLabelText('text input for search'), { target: { value: 'new-rule' } });
+  fireEvent.submit(getByLabelText('add_edit_filter_rule'));
 
   await patientlyWaitFor(() => {
-    expect(queryByText(addedRule.name)).toBeInTheDocument();
+    expect(queryByText('Add rule')).not.toBeInTheDocument();
   });
 
   assertNockRequest(autocompleteScope);
+  assertNockRequest(searchDelayScope);
+  assertNockRequest(autoSearchScope);
   assertNockRequest(cvFiltersScope);
   assertNockRequest(cvFilterAddScope);
-  assertNockRequest(inputSearchDelayScope);
-  assertNockRequest(inputAutoSearchScope);
   assertNockRequest(autocompleteNameScope);
   assertNockRequest(cvFiltersCallbackScope, done);
   act(done);
@@ -205,10 +197,16 @@ test('Can add filter rules', async (done) => {
 
 // Edit
 test('Can edit filter rules', async (done) => {
-  const autocompleteScope = mockAutocomplete(nockInstance, autocompleteUrl, true, [], 2);
+  const autocompleteScope = mockAutocomplete(
+    nockInstance,
+    autocompleteUrl,
+    autocompleteQuery,
+    [],
+    2,
+  );
   const autocompleteNameScope = mockAutocomplete(nockInstance, autocompleteNameUrl, true, [], 2);
-  const inputSearchDelayScope = mockSetting(nockInstance, 'autosearch_delay', 0, 2);
-  const inputAutoSearchScope = mockSetting(nockInstance, 'autosearch_while_typing', undefined, 2);
+  const searchDelayScope = mockSetting(nockInstance, 'autosearch_delay', 0);
+  const autoSearchScope = mockSetting(nockInstance, 'autosearch_while_typing');
 
   const cvFiltersScope = nockInstance
     .get(cvFilterRulesPath)
@@ -255,37 +253,42 @@ test('Can edit filter rules', async (done) => {
     fireEvent.click(queryByText('Edit'));
   });
 
-  fireEvent.change(getAllByLabelText('text input for search')[0], { target: { value: `name = ${addedRule.name}` } });
-
   await patientlyWaitFor(() => {
     expect(getByLabelText('add_edit_filter_rule')).toBeInTheDocument();
     expect(getByLabelText('add_edit_filter_rule')).toHaveAttribute('aria-disabled', 'false');
   });
 
-  fireEvent.submit(getAllByLabelText('text input for search')[1]);
+  fireEvent.change(getByLabelText('text input for search'), { target: { value: 'changed-name' } });
+  fireEvent.submit(getByLabelText('add_edit_filter_rule'));
 
   await patientlyWaitFor(() => {
-    expect(queryByText(firstResultName)).not.toBeInTheDocument();
-    expect(queryByText(addedRule.name)).toBeInTheDocument();
+    expect(queryByText('Edit rule')).not.toBeInTheDocument();
   });
 
   assertNockRequest(autocompleteScope);
+  assertNockRequest(searchDelayScope);
+  assertNockRequest(autoSearchScope);
   assertNockRequest(cvFiltersScope);
   assertNockRequest(cvFilterAddScope);
-  assertNockRequest(inputSearchDelayScope);
-  assertNockRequest(inputAutoSearchScope);
   assertNockRequest(autocompleteNameScope);
   assertNockRequest(cvFiltersCallbackScope, done);
   act(done);
 });
 
 test('Shows call-to-action when there are no filter rules', async (done) => {
-  const autocompleteScope = mockAutocomplete(nockInstance, autocompleteUrl, true, [], 2);
+  const autocompleteScope = mockAutocomplete(
+    nockInstance,
+    autocompleteUrl,
+    autocompleteQuery,
+    [],
+    2,
+  );
   const autocompleteNameScope = mockAutocomplete(nockInstance, autocompleteNameUrl, true, [], 2);
-  const inputSearchDelayScope = mockSetting(nockInstance, 'autosearch_delay', 0, 2);
-  const inputAutoSearchScope = mockSetting(nockInstance, 'autosearch_while_typing', undefined, 2);
+  const searchDelayScope = mockSetting(nockInstance, 'autosearch_delay', 0);
+  const autoSearchScope = mockSetting(nockInstance, 'autosearch_while_typing');
   const cvFiltersScope = nockInstance
     .get(cvFilterRulesPath)
+    .times(2)
     .query(true)
     .reply(200, emptyCVContainerImageData);
 
@@ -303,15 +306,15 @@ test('Shows call-to-action when there are no filter rules', async (done) => {
   });
 
   assertNockRequest(autocompleteScope);
-  assertNockRequest(inputSearchDelayScope);
-  assertNockRequest(inputAutoSearchScope);
   assertNockRequest(autocompleteNameScope);
+  assertNockRequest(searchDelayScope);
+  assertNockRequest(autoSearchScope);
   assertNockRequest(cvFiltersScope, done);
   act(done);
 });
 
 test('Hides bulk_remove dropdownItem when there are no filter rules', async (done) => {
-  const autocompleteScope = mockAutocomplete(nockInstance, autocompleteUrl);
+  const autocompleteScope = mockAutocomplete(nockInstance, autocompleteUrl, autocompleteQuery);
   const cvFiltersScope = nockInstance
     .get(cvFilterRulesPath)
     .query(true)

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

@@ -33,13 +33,15 @@ const renderOptions = {
     initialIndex: 1,
   },
 };
+const autocompleteQuery = {
+  organization_id: 1,
+  search: '',
+};
 
 const withCVRoute = component => <Route path="/content_views/:id([0-9]+)#/filters/:filterId([0-9]+)">{component}</Route>;
 
 test('Can show filter details and package groups on page load', async (done) => {
   const { name: cvFilterName } = cvFilterDetails;
-  const searchDelayScope = mockSetting(nockInstance, 'autosearch_delay', 0);
-  const autoSearchScope = mockSetting(nockInstance, 'autosearch_while_typing');
   const cvFilterScope = nockInstance
     .get(cvFilterDetailsPath)
     .query(true)
@@ -52,7 +54,7 @@ test('Can show filter details and package groups on page load', async (done) =>
     .get(cvPackageFilterRulesPath)
     .query(true)
     .reply(200, cvPackageFilterRules);
-  const autocompleteScope = mockAutocomplete(nockInstance, autocompleteUrl);
+  const autocompleteScope = mockAutocomplete(nockInstance, autocompleteUrl, autocompleteQuery);
 
   const { getByText, queryByText } =
     renderWithRedux(withCVRoute(<ContentViewFilterDetails
@@ -67,8 +69,6 @@ test('Can show filter details and package groups on page load', async (done) =>
   });
 
   assertNockRequest(autocompleteScope);
-  assertNockRequest(searchDelayScope);
-  assertNockRequest(autoSearchScope);
   assertNockRequest(cvFilterScope);
   assertNockRequest(cvFiltersScope);
   assertNockRequest(cvPackageFilterRulesScope);
@@ -81,10 +81,24 @@ test('Can search for package rules in package filter details', async (done) => {
   const { name: cvFilterName } = cvFilterDetails;
   const { name: firstPackageRuleName } = firstPackageRule;
   const { name: lastPackageRuleName } = lastPackageRule;
-  const searchQueryMatcher = actualParams =>
-    actualParams?.search?.includes(lastPackageRuleName);
-  const searchDelayScope = mockSetting(nockInstance, 'autosearch_delay', 0);
-  const autoSearchScope = mockSetting(nockInstance, 'autosearch_while_typing');
+  const searchQueryMatcher = {
+    organization_id: 1,
+    search: `name = ${lastPackageRuleName}`,
+  };
+  const searchResults = [
+    {
+      completed: `name = ${lastPackageRuleName}`,
+      part: 'and',
+      label: `name = ${lastPackageRuleName} and`,
+      category: 'Operators',
+    },
+    {
+      completed: `name = ${lastPackageRuleName}`,
+      part: 'or',
+      label: `name = ${lastPackageRuleName} or`,
+      category: 'Operators',
+    },
+  ];
 
   const cvFilterScope = nockInstance
     .get(cvFilterDetailsPath)
@@ -103,8 +117,13 @@ test('Can search for package rules in package filter details', async (done) => {
     .query(searchQueryMatcher)
     .reply(200, { results: [lastPackageRule] });
 
-  const autocompleteScope = mockAutocomplete(nockInstance, autocompleteUrl);
-  const withSearchScope = mockAutocomplete(nockInstance, autocompleteUrl, searchQueryMatcher);
+  const autocompleteScope = mockAutocomplete(nockInstance, autocompleteUrl, autocompleteQuery);
+  const withSearchScope = mockAutocomplete(
+    nockInstance,
+    autocompleteUrl,
+    searchQueryMatcher,
+    searchResults,
+  );
   const { getByText, queryByText, getByLabelText } =
     renderWithRedux(withCVRoute(<ContentViewFilterDetails
       cvId={1}
@@ -117,15 +136,14 @@ test('Can search for package rules in package filter details', async (done) => {
   });
 
   // Search and only searched result shows
-  fireEvent.change(getByLabelText(/text input for search/i), { target: { value: `name = ${lastPackageRuleName}` } });
+  getByLabelText('Search input').focus();
+  fireEvent.change(getByLabelText('Search input'), { target: { value: `name = ${lastPackageRuleName}` } });
   await patientlyWaitFor(() => {
-    expect(getByText(lastPackageRuleName)).toBeInTheDocument();
-    expect(queryByText(firstPackageRuleName)).not.toBeInTheDocument();
+    expect(getByText(`name = ${lastPackageRuleName} and`)).toBeInTheDocument();
+    expect(queryByText(`name = ${firstPackageRuleName} and`)).not.toBeInTheDocument();
   });
 
   assertNockRequest(autocompleteScope);
-  assertNockRequest(searchDelayScope);
-  assertNockRequest(autoSearchScope);
   assertNockRequest(cvFilterScope);
   assertNockRequest(cvFiltersScope);
   assertNockRequest(cvPackageFilterRulesScope);
@@ -136,9 +154,15 @@ test('Can search for package rules in package filter details', async (done) => {
 
 test('Can add package rules to filter in a self-closing modal', async (done) => {
   const { name: cvFilterName } = cvFilterDetails;
-  const autocompleteScope = mockAutocomplete(nockInstance, autocompleteUrl);
-  const autocompleteNameScope = mockAutocomplete(nockInstance, autocompleteNameUrl);
-  const autocompleteArchScope = mockAutocomplete(nockInstance, autocompleteArchUrl);
+  const autocompleteScope = mockAutocomplete(nockInstance, autocompleteUrl, true, undefined, 2);
+  const autocompleteNameScope = mockAutocomplete(
+    nockInstance, autocompleteNameUrl, true,
+    undefined, 2,
+  );
+  const autocompleteArchScope = mockAutocomplete(
+    nockInstance, autocompleteArchUrl, true,
+    undefined, 2,
+  );
   const searchDelayScope = mockSetting(nockInstance, 'autosearch_delay', 0, 3);
   const autoSearchScope = mockSetting(nockInstance, 'autosearch_while_typing', undefined, 3);
 
@@ -190,12 +214,12 @@ test('Can add package rules to filter in a self-closing modal', async (done) =>
   });
   getByLabelText('add_rpm_rule').click();
   await patientlyWaitFor(() => {
+    expect(getAllByLabelText('text input for search')[0]).toBeInTheDocument();
     expect(getAllByLabelText('text input for search')[1]).toBeInTheDocument();
-    expect(getAllByLabelText('text input for search')[2]).toBeInTheDocument();
     expect(getByLabelText('add_package_filter_rule')).toBeInTheDocument();
   });
-  fireEvent.change(getAllByLabelText('text input for search')[1], { target: { value: 'elephant' } });
-  fireEvent.change(getAllByLabelText('text input for search')[2], { target: { value: 'noarch' } });
+  fireEvent.change(getAllByLabelText('text input for search')[0], { target: { value: 'elephant' } });
+  fireEvent.change(getAllByLabelText('text input for search')[1], { target: { value: 'noarch' } });
   fireEvent.submit(getByLabelText('add_package_filter_rule'));
 
   await patientlyWaitFor(() => {
@@ -259,6 +283,10 @@ 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();
+  });
 
   assertNockRequest(autocompleteScope);
   assertNockRequest(searchDelayScope);
@@ -274,8 +302,14 @@ test('Remove rpm filter rule in a self-closing modal', async (done) => {
 test('Edit rpm filter rule in a self-closing modal', async (done) => {
   const { name: cvFilterName } = cvFilterDetails;
   const autocompleteScope = mockAutocomplete(nockInstance, autocompleteUrl, true, undefined, 2);
-  const autocompleteNameScope = mockAutocomplete(nockInstance, autocompleteNameUrl);
-  const autocompleteArchScope = mockAutocomplete(nockInstance, autocompleteArchUrl);
+  const autocompleteNameScope = mockAutocomplete(
+    nockInstance, autocompleteNameUrl, true,
+    undefined, 2,
+  );
+  const autocompleteArchScope = mockAutocomplete(
+    nockInstance, autocompleteArchUrl, true,
+    undefined, 2,
+  );
   const searchDelayScope = mockSetting(nockInstance, 'autosearch_delay', 0, 3);
   const autoSearchScope = mockSetting(nockInstance, 'autosearch_while_typing', undefined, 3);
   const cvFiltersScope = nockInstance

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

@@ -7,6 +7,7 @@ import { ADDED, cvFilterDetailsKey, NOT_ADDED } from '../../../ContentViewsConst
 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),
@@ -41,6 +49,7 @@ const withCVRoute = component => <Route path="/content_views/:id([0-9]+)#/filter
 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)
@@ -74,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];
 
@@ -126,6 +137,7 @@ test('Can remove a filter rule', async (done) => {
   fireEvent.click(getByText('Remove'));
 
 
+  assertNockRequest(autocompleteScope);
   assertNockRequest(cvFilterScope);
   assertNockRequest(cvFiltersScope);
   assertNockRequest(cvFiltersRuleScope);
@@ -135,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];
 
@@ -183,6 +196,7 @@ test('Can add a filter rule', async (done) => {
   fireEvent.click(getByText('Add'));
 
 
+  assertNockRequest(autocompleteScope);
   assertNockRequest(cvFilterScope);
   assertNockRequest(cvFiltersScope);
   assertNockRequest(cvFiltersRuleScope);
@@ -192,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];
 
@@ -243,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);
@@ -252,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];
 
@@ -300,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);
@@ -308,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;
@@ -380,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;
@@ -444,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);
@@ -454,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];
 
@@ -505,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

@@ -8,7 +8,6 @@ import {
   nockInstance,
   assertNockRequest,
   mockAutocomplete,
-  mockSetting,
 } from '../../../../../test-utils/nockWrapper';
 import api from '../../../../../services/api';
 import allPackageGroups from './allFilterPackageGroups.fixtures.json';
@@ -27,21 +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);
-});
-
 test('Can show filter details and package groups on page load', async (done) => {
   const { name: cvFilterName } = cvFilterDetails;
   const cvFilterScope = nockInstance
@@ -56,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}
@@ -83,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)
@@ -103,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}
@@ -118,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: `name = ${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);