katello 4.4.1 → 4.5.0

data/webpack/components/extensions/HostDetails/Tabs/__tests__/moduleStreamsTab.test.js

@@ -0,0 +1,261 @@
+import React from 'react';
+import { act } from 'react-test-renderer';
+import { renderWithRedux, patientlyWaitFor, within, fireEvent } from 'react-testing-lib-wrapper';
+import { nockInstance, assertNockRequest, mockForemanAutocomplete, mockSetting } from '../../../../../test-utils/nockWrapper';
+import { ModuleStreamsTab } from '../ModuleStreamsTab/ModuleStreamsTab.js';
+import mockModuleStreams from './moduleStreams.fixtures.json';
+import mockBookmarkData from './bookmarks.fixtures.json';
+import { MODULE_STREAMS_KEY } from '../../../../../scenes/ModuleStreams/ModuleStreamsConstants';
+import { foremanApi } from '../../../../../services/api';
+
+jest.mock('../../hostDetailsHelpers', () => ({
+  ...jest.requireActual('../../hostDetailsHelpers'),
+  userPermissionsFromHostDetails: () => ({
+    create_job_invocations: true,
+  }),
+}));
+
+const moduleBookmarks = foremanApi.getApiUrl('/bookmarks?search=controller%3Dkatello_host_available_module_streams');
+
+const contentFacetAttributes = {
+  id: 11,
+  uuid: 'e5761ea3-4117-4ecf-83d0-b694f99b389e',
+  content_view_default: false,
+  lifecycle_environment_library: false,
+};
+
+const renderOptions = (facetAttributes = contentFacetAttributes) => ({
+  apiNamespace: MODULE_STREAMS_KEY,
+  initialState: {
+    API: {
+      HOST_DETAILS: {
+        response: {
+          id: 1,
+          name: 'test-host',
+          content_facet_attributes: { ...facetAttributes },
+        },
+        status: 'RESOLVED',
+      },
+    },
+  },
+});
+
+const hostModuleStreams = foremanApi.getApiUrl('/hosts/1/module_streams');
+const autocompleteUrl = '/hosts/1/module_streams/auto_complete_search';
+
+let firstModuleStreams;
+let searchDelayScope;
+let autoSearchScope;
+let bookmarkScope;
+
+beforeEach(() => {
+  const { results } = mockModuleStreams;
+  [firstModuleStreams] = results;
+  bookmarkScope = nockInstance.get(moduleBookmarks).reply(200, mockBookmarkData);
+  searchDelayScope = mockSetting(nockInstance, 'autosearch_delay', 0);
+  autoSearchScope = mockSetting(nockInstance, 'autosearch_while_typing');
+});
+
+afterEach(() => {
+  assertNockRequest(searchDelayScope);
+  assertNockRequest(autoSearchScope);
+  assertNockRequest(bookmarkScope);
+});
+
+beforeEach(() => {
+  const { results } = mockModuleStreams;
+  [firstModuleStreams] = results;
+  searchDelayScope = mockSetting(nockInstance, 'autosearch_delay', 0);
+  autoSearchScope = mockSetting(nockInstance, 'autosearch_while_typing');
+});
+
+afterEach(() => {
+  assertNockRequest(searchDelayScope);
+  assertNockRequest(autoSearchScope);
+});
+
+test('Can call API for Module streams and show on screen on page load', async (done) => {
+  // Setup autocomplete with mockForemanAutoComplete since we aren't adding /katello
+  const autocompleteScope = mockForemanAutocomplete(nockInstance, autocompleteUrl);
+  const scope = nockInstance
+    .get(hostModuleStreams)
+    .query(true)
+    .reply(200, mockModuleStreams);
+
+  const { getAllByText } = renderWithRedux(<ModuleStreamsTab />, renderOptions());
+
+  // Assert that the Module streams are now showing on the screen, but wait for them to appear.
+  await patientlyWaitFor(() =>
+    expect(getAllByText(firstModuleStreams.name)[0]).toBeInTheDocument());
+  // Assert request was made and completed, see helper function
+  assertNockRequest(autocompleteScope);
+  assertNockRequest(scope, done); // Pass jest callback to confirm test is done
+  act(done);
+});
+
+test('Can handle no Module streams being present', async (done) => {
+  // Setup autocomplete with mockForemanAutoComplete since we aren't adding /katello
+  const autocompleteScope = mockForemanAutocomplete(nockInstance, autocompleteUrl);
+
+  const noResults = {
+    total: 0,
+    subtotal: 0,
+    page: 1,
+    per_page: 20,
+    results: [],
+  };
+
+  const scope = nockInstance
+    .get(hostModuleStreams)
+    .query(true)
+    .reply(200, noResults);
+
+  const { queryByText } = renderWithRedux(<ModuleStreamsTab />, renderOptions());
+
+  // Assert that there are not any Module streams showing on the screen.
+  await patientlyWaitFor(() => expect(queryByText('This host does not have any Module streams.')).toBeInTheDocument());
+  // Assert request was made and completed, see helper function
+  assertNockRequest(autocompleteScope);
+  assertNockRequest(scope, done); // Pass jest callback to confirm test is done
+  act(done);
+});
+
+test('Can filter results based on status', async (done) => {
+  const autocompleteScope = mockForemanAutocomplete(nockInstance, autocompleteUrl);
+  const scope = nockInstance
+    .get(hostModuleStreams)
+    .query(true)
+    .reply(200, mockModuleStreams);
+
+  const scope2 = nockInstance
+    .get(hostModuleStreams)
+    .query(true)
+    .reply(200, mockModuleStreams);
+
+  const {
+    queryByLabelText,
+    getByRole,
+    getAllByText,
+  } = renderWithRedux(<ModuleStreamsTab />, renderOptions());
+
+  // Assert that the Module streams are now showing on the screen, but wait for them to appear.
+  await patientlyWaitFor(() =>
+    expect(getAllByText(firstModuleStreams.name)[0]).toBeInTheDocument());
+  const typeContainer = queryByLabelText('select Status container', { ignore: 'th' });
+  const typeDropdown = within(typeContainer).queryByText('Status');
+  expect(typeDropdown).toBeInTheDocument();
+  fireEvent.click(typeDropdown);
+  const installed = getByRole('option', { name: 'select Installed' });
+  fireEvent.click(installed);
+  assertNockRequest(autocompleteScope);
+  assertNockRequest(scope);
+  assertNockRequest(scope2, done);
+  act(done);
+});
+
+test('Can filter results based on Installation status', async (done) => {
+  const autocompleteScope = mockForemanAutocomplete(nockInstance, autocompleteUrl);
+  const scope = nockInstance
+    .get(hostModuleStreams)
+    .query(true)
+    .reply(200, mockModuleStreams);
+
+  const scope2 = nockInstance
+    .get(hostModuleStreams)
+    .query(true)
+    .reply(200, mockModuleStreams);
+
+  const {
+    queryByLabelText,
+    getByRole,
+    getAllByText,
+  } = renderWithRedux(<ModuleStreamsTab />, renderOptions());
+
+  // Assert that the Module streams are now showing on the screen, but wait for them to appear.
+  await patientlyWaitFor(() =>
+    expect(getAllByText(firstModuleStreams.name)[0]).toBeInTheDocument());
+  const typeContainer = queryByLabelText('select Installation status container', { ignore: 'th' });
+  const typeDropdown = within(typeContainer).queryByText('Installation status');
+  expect(typeDropdown).toBeInTheDocument();
+  fireEvent.click(typeDropdown);
+  const installed = getByRole('option', { name: 'select Upgradable' });
+  fireEvent.click(installed);
+  assertNockRequest(autocompleteScope);
+  assertNockRequest(scope);
+  assertNockRequest(scope2, done);
+  act(done);
+});
+
+test('Can provide dropdown actions with redirects on Module Streams with customized Rex', async (done) => {
+  const autocompleteScope = mockForemanAutocomplete(nockInstance, autocompleteUrl);
+  const scope = nockInstance
+    .get(hostModuleStreams)
+    .query(true)
+    .reply(200, mockModuleStreams);
+
+  const {
+    queryByLabelText,
+    getByText,
+    getAllByText,
+    getByLabelText,
+  } = renderWithRedux(<ModuleStreamsTab />, renderOptions());
+
+  // Assert that the Module streams are now showing on the screen, but wait for them to appear.
+  await patientlyWaitFor(() =>
+    expect(getAllByText(firstModuleStreams.name)[0]).toBeInTheDocument());
+  expect(queryByLabelText('kebab-dropdown-3')).toBeInTheDocument();
+  fireEvent.click(queryByLabelText('kebab-dropdown-3'));
+  await patientlyWaitFor(() => expect(getByLabelText('customize-checkbox-3')).toBeInTheDocument());
+  fireEvent.click(getByLabelText('customize-checkbox-3'));
+  await patientlyWaitFor(() => expect(getByText('Enable')).toBeInTheDocument());
+  expect(getByText('Enable')).toHaveAttribute('href', '/job_invocations/new?feature=katello_module_stream_action&host_ids=name%20%5E%20(test-host)&inputs%5Baction%5D=enable&inputs%5Bmodule_spec%5D=walrus:2.4');
+  expect(getByText('Install')).toHaveAttribute('href', '/job_invocations/new?feature=katello_module_stream_action&host_ids=name%20%5E%20(test-host)&inputs%5Baction%5D=install&inputs%5Bmodule_spec%5D=walrus:2.4');
+  assertNockRequest(autocompleteScope);
+  assertNockRequest(scope, done);
+  act(done);
+});
+
+test('Can perform actions on Module Streams', async (done) => {
+  const jobInvocationURL = foremanApi.getApiUrl('/job_invocations');
+  const exampleRemoveAction = {
+    job_invocation:
+    {
+      feature: 'katello_module_stream_action',
+      inputs: {
+        action: 'remove',
+        module_spec: 'walrus:2.4',
+      },
+      search_query: 'name ^ (test-host)',
+    },
+  };
+  const autocompleteScope = mockForemanAutocomplete(nockInstance, autocompleteUrl);
+  const scope = nockInstance
+    .get(hostModuleStreams)
+    .query(true)
+    .reply(200, mockModuleStreams);
+
+  const jobScope = nockInstance
+    .post(jobInvocationURL, exampleRemoveAction)
+    .reply(200, { id: 'dummy_id', description: 'Remove action dummy response' });
+
+  const {
+    queryByLabelText,
+    getByText,
+    getAllByText,
+    getByLabelText,
+  } = renderWithRedux(<ModuleStreamsTab />, renderOptions());
+
+  // Assert that the Module streams are now showing on the screen, but wait for them to appear.
+  await patientlyWaitFor(() =>
+    expect(getAllByText(firstModuleStreams.name)[0]).toBeInTheDocument());
+  expect(queryByLabelText('kebab-dropdown-3')).toBeInTheDocument();
+  fireEvent.click(queryByLabelText('kebab-dropdown-3'));
+  await patientlyWaitFor(() => expect(getByText('Enable')).toBeInTheDocument());
+  fireEvent.click(getByText('Remove'));
+  expect(getByLabelText('confirm-module-action')).toBeInTheDocument();
+  fireEvent.click(getByLabelText('confirm-module-action'));
+  assertNockRequest(autocompleteScope);
+  assertNockRequest(scope);
+  assertNockRequest(jobScope, done);
+  act(done);
+});

data/webpack/components/extensions/HostDetails/Tabs/__tests__/packageInstallModal.test.js

@@ -4,9 +4,17 @@ import { nockInstance, assertNockRequest, mockForemanAutocomplete, mockSetting }
 import katelloApi, { foremanApi } from '../../../../../services/api';
 import mockPackagesData from './yumInstallablePackages.fixtures.json';
 import PackageInstallModal from '../PackagesTab/PackageInstallModal';
-import { HOST_YUM_INSTALLABLE_PACKAGES_KEY, PACKAGE_SEARCH_QUERY } from '../PackagesTab/YumInstallablePackagesConstants';
+import { HOST_YUM_INSTALLABLE_PACKAGES_KEY } from '../PackagesTab/YumInstallablePackagesConstants';
 import { REX_FEATURES } from '../RemoteExecutionConstants';
 
+jest.mock('../../hostDetailsHelpers', () => ({
+  ...jest.requireActual('../../hostDetailsHelpers'),
+  userPermissionsFromHostDetails: () => ({
+    create_job_invocations: true,
+    edit_hosts: true,
+  }),
+}));
+
 const contentFacetAttributes = {
   id: 11,
   uuid: 'e5761ea3-4117-4ecf-83d0-b694f99b389e',
@@ -32,7 +40,6 @@ const renderOptions = (facetAttributes = contentFacetAttributes) => ({
 
 const hostYumInstallablePackages = katelloApi.getApiUrl('/packages');
 const hostPackages = foremanApi.getApiUrl('/hosts/1/packages/install');
-const jobInvocations = foremanApi.getApiUrl('/job_invocations');
 const autocompleteUrl = '/hosts/1/packages/auto_complete_search';
 const fakeTask = { id: '21c0f9e4-b27b-49aa-8774-6be66126043b' };
 
@@ -77,6 +84,7 @@ test('Can call API for installable packages and show on screen on page load', as
        hostId={1}
        hostName="test-host"
        showKatelloAgent={false}
+       triggerPackageInstall={jest.fn()}
      />, renderOptions());
 
   // Assert that the packages are now showing on the screen, but wait for them to appear.
@@ -109,6 +117,7 @@ test('Can handle no installable packages being present', async (done) => {
       hostId={1}
       hostName="test-host"
       showKatelloAgent={false}
+      triggerPackageInstall={jest.fn()}
     />, renderOptions());
 
   // Assert that there are not any packages showing on the screen.
@@ -134,6 +143,7 @@ test('Does not show katello-agent option when disabled', async (done) => {
     hostId={1}
     hostName="test-host"
     showKatelloAgent={false}
+    triggerPackageInstall={jest.fn()}
   />, renderOptions());
 
   // Assert that the packages are now showing on the screen, but wait for them to appear.
@@ -172,6 +182,7 @@ test('Shows the katello-agent option when enabled', async (done) => {
     hostId={1}
     hostName="test-host"
     showKatelloAgent
+    triggerPackageInstall={jest.fn()}
   />, renderOptions());
 
   // Assert that the packages are now showing on the screen, but wait for them to appear.
@@ -209,6 +220,7 @@ test('Can install packages via katello-agent', async (done) => {
     hostId={1}
     hostName="test-host"
     showKatelloAgent
+    triggerPackageInstall={jest.fn()}
   />, renderOptions());
 
   await patientlyWaitFor(() => expect(getAllByText(firstPackages.name)[0]).toBeInTheDocument());
@@ -236,17 +248,7 @@ test('Can install a package via remote execution', async (done) => {
     .get(hostYumInstallablePackages)
     .query(defaultQuery)
     .reply(200, mockPackagesData);
-  const installScope = nockInstance
-    .post(jobInvocations, {
-      job_invocation: {
-        inputs: {
-          [PACKAGE_SEARCH_QUERY]: `id ^ (${firstPackages.id},${secondPackages.id})`,
-        },
-        search_query: 'name ^ (test-host)',
-        feature: REX_FEATURES.KATELLO_PACKAGE_INSTALL_BY_SEARCH,
-      },
-    })
-    .reply(201);
+  const triggerPackageInstall = jest.fn();
 
   const {
     getAllByText, getByText, getByRole,
@@ -256,6 +258,7 @@ test('Can install a package via remote execution', async (done) => {
     hostId={1}
     hostName="test-host"
     showKatelloAgent
+    triggerPackageInstall={triggerPackageInstall}
   />, renderOptions());
 
   await patientlyWaitFor(() => expect(getAllByText(firstPackages.name)[0]).toBeInTheDocument());
@@ -271,9 +274,9 @@ test('Can install a package via remote execution', async (done) => {
   const rexOption = getByText('Install via remote execution');
   fireEvent.click(rexOption);
 
+  expect(triggerPackageInstall).toHaveBeenCalled();
   assertNockRequest(autocompleteScope);
-  assertNockRequest(scope);
-  assertNockRequest(installScope, done);
+  assertNockRequest(scope, done);
 });
 
 test('Can install a package via customized remote execution', async (done) => {
@@ -290,6 +293,7 @@ test('Can install a package via customized remote execution', async (done) => {
     closeModal={jest.fn()}
     hostId={1}
     hostName="test-host"
+    triggerPackageInstall={jest.fn()}
   />, renderOptions());
 
   await patientlyWaitFor(() => expect(getAllByText(firstPackages.name)[0]).toBeInTheDocument());
@@ -326,6 +330,7 @@ test('Uses package_install_by_search_query template when in select all mode', as
     closeModal={jest.fn()}
     hostId={1}
     hostName="test-host"
+    triggerPackageInstall={jest.fn()}
   />, renderOptions());
 
   await patientlyWaitFor(() => expect(getAllByText(firstPackages.name)[0]).toBeInTheDocument());
@@ -364,6 +369,7 @@ test('Disables the katello-agent option when in select all mode', async (done) =
     hostId={1}
     hostName="test-host"
     showKatelloAgent
+    triggerPackageInstall={jest.fn()}
   />, renderOptions());
 
   await patientlyWaitFor(() => expect(getAllByText(firstPackages.name)[0]).toBeInTheDocument());

data/webpack/components/extensions/HostDetails/Tabs/__tests__/packagesTab.test.js

@@ -6,6 +6,16 @@ import { HOST_PACKAGES_KEY, PACKAGES_SEARCH_QUERY } from '../PackagesTab/HostPac
 import { PackagesTab } from '../PackagesTab/PackagesTab.js';
 import mockPackagesData from './packages.fixtures.json';
 import { REX_FEATURES } from '../RemoteExecutionConstants';
+import * as hooks from '../../../../Table/TableHooks';
+import mockBookmarkData from './bookmarks.fixtures.json';
+
+jest.mock('../../hostDetailsHelpers', () => ({
+  ...jest.requireActual('../../hostDetailsHelpers'),
+  userPermissionsFromHostDetails: () => ({
+    create_job_invocations: true,
+    edit_hosts: true,
+  }),
+}));
 
 const contentFacetAttributes = {
   id: 11,
@@ -15,6 +25,8 @@ const contentFacetAttributes = {
 };
 
 const hostname = 'test-host.example.com';
+const packageBookmarks = foremanApi.getApiUrl('/bookmarks?search=controller%3Dkatello_host_installed_packages');
+
 const renderOptions = (facetAttributes = contentFacetAttributes) => ({
   apiNamespace: HOST_PACKAGES_KEY,
   initialState: {
@@ -34,21 +46,29 @@ const renderOptions = (facetAttributes = contentFacetAttributes) => ({
 const hostPackages = foremanApi.getApiUrl('/hosts/1/packages');
 const jobInvocations = foremanApi.getApiUrl('/job_invocations');
 const autocompleteUrl = '/hosts/1/packages/auto_complete_search';
-const defaultQueryWithoutSearch = {
+const baseQuery = {
   include_latest_upgradable: true,
   per_page: 20,
   page: 1,
 };
+
+const defaultQueryWithoutSearch = {
+  ...baseQuery,
+  sort_by: 'nvra',
+  sort_order: 'asc',
+};
 const defaultQuery = { ...defaultQueryWithoutSearch, search: '' };
 
 let firstPackage;
 let secondPackage;
 let searchDelayScope;
 let autoSearchScope;
+let bookmarkScope;
 
 beforeEach(() => {
   const { results } = mockPackagesData;
   [firstPackage, secondPackage] = results;
+  bookmarkScope = nockInstance.get(packageBookmarks).reply(200, mockBookmarkData);
   searchDelayScope = mockSetting(nockInstance, 'autosearch_delay', 0);
   autoSearchScope = mockSetting(nockInstance, 'autosearch_while_typing');
 });
@@ -56,6 +76,7 @@ beforeEach(() => {
 afterEach(() => {
   assertNockRequest(searchDelayScope);
   assertNockRequest(autoSearchScope);
+  assertNockRequest(bookmarkScope);
 });
 
 test('Can call API for packages and show on screen on page load', async (done) => {
@@ -390,3 +411,25 @@ test('Remove is disabled when in select all mode', async (done) => {
   assertNockRequest(autocompleteScope);
   assertNockRequest(scope, done);
 });
+
+test('Sets initial search query from url params', async (done) => {
+  // Setup autocomplete with mockForemanAutoComplete since we aren't adding /katello
+  const autocompleteScope = mockForemanAutocomplete(nockInstance, autocompleteUrl);
+  const scope = nockInstance
+    .get(hostPackages)
+    .query({ ...defaultQuery, search: `name=${firstPackage.name}` })
+    .reply(200, { ...mockPackagesData, results: [firstPackage] });
+
+  jest.spyOn(hooks, 'useUrlParams').mockImplementation(() => ({
+    searchParam: `name=${firstPackage.name}`,
+  }));
+
+  const { getAllByText, queryByText } = renderWithRedux(<PackagesTab />, renderOptions());
+
+  await patientlyWaitFor(() => expect(getAllByText(firstPackage.name)[0]).toBeInTheDocument());
+  expect(queryByText(secondPackage.name)).not.toBeInTheDocument();
+
+  assertNockRequest(autocompleteScope);
+  assertNockRequest(scope, done); // Pass jest callback to confirm test is done
+});
+

data/webpack/components/extensions/HostDetails/Tabs/__tests__/repositorySets.fixtures.json

@@ -41,6 +41,7 @@
       "type": "yum",
       "gpgUrl": null,
       "contentUrl": "/custom/ParthaProduct/empty_repo",
+      "osRestricted": null,
       "override": "default",
       "overrides": [],
       "enabled_content_override": null
@@ -75,6 +76,7 @@
       "type": "yum",
       "gpgUrl": null,
       "contentUrl": "/custom/ParthaProduct/partha_multi-errata",
+      "osRestricted": "rhel-7",
       "override": "0",
       "overrides": [
         {
@@ -107,6 +109,7 @@
       "type": "yum",
       "gpgUrl": null,
       "contentUrl": "/custom/Pull_Provider/yggdrasil",
+      "osRestricted": null,
       "override": "1",
       "overrides": [
         {
@@ -117,4 +120,4 @@
       "enabled_content_override": true
     }
   ]
-}
+}

data/webpack/components/extensions/HostDetails/Tabs/__tests__/repositorySetsTab.test.js

@@ -1,5 +1,5 @@
 import React from 'react';
-import { renderWithRedux, patientlyWaitFor, fireEvent } from 'react-testing-lib-wrapper';
+import { renderWithRedux, patientlyWaitFor, within, fireEvent } from 'react-testing-lib-wrapper';
 import { nockInstance, assertNockRequest, mockAutocomplete, mockSetting } from '../../../../../test-utils/nockWrapper';
 import katelloApi, { foremanApi } from '../../../../../services/api';
 import { REPOSITORY_SETS_KEY } from '../RepositorySetsTab/RepositorySetsConstants';
@@ -8,6 +8,16 @@ import mockRepoSetData from './repositorySets.fixtures.json';
 import mockBookmarkData from './bookmarks.fixtures.json';
 import mockContentOverride from './contentOverrides.fixtures.json';
 
+jest.mock('../../hostDetailsHelpers', () => ({
+  ...jest.requireActual('../../hostDetailsHelpers'),
+  userPermissionsFromHostDetails: () => ({
+    view_hosts: true,
+    view_activation_keys: true,
+    view_products: true,
+    edit_hosts: true,
+  }),
+}));
+
 const contentFacetAttributes = {
   id: 11,
   uuid: 'e5761ea3-4117-4ecf-83d0-b694f99b389e',
@@ -43,6 +53,8 @@ const defaultQuery = {
   per_page: 20,
   page: 1,
   search: '',
+  sort_by: 'name',
+  sort_order: 'asc',
 };
 const libraryQuery = {
   ...defaultQuery,
@@ -50,6 +62,7 @@ const libraryQuery = {
 };
 
 let firstRepoSet;
+let secondRepoSet;
 let searchDelayScope;
 let autoSearchScope;
 let bookmarkScope;
@@ -57,7 +70,7 @@ let bookmarkScope;
 beforeEach(() => {
   // jest.resetModules();
   const { results } = mockRepoSetData;
-  [firstRepoSet] = results;
+  [firstRepoSet, secondRepoSet] = results;
   bookmarkScope = nockInstance.get(repositorySetBookmarks).reply(200, mockBookmarkData);
   searchDelayScope = mockSetting(nockInstance, 'autosearch_delay', 0);
   autoSearchScope = mockSetting(nockInstance, 'autosearch_while_typing');
@@ -204,9 +217,11 @@ test('Can override to disabled', async (done) => {
     .get(hostRepositorySets)
     .query(defaultQuery)
     .reply(200, mockRepoSetData);
+  const overrides = JSON.parse(JSON.stringify(mockContentOverride));
+  overrides.results[0].enabled_content_override = false;
   const contentOverrideScope = nockInstance
     .put(contentOverride)
-    .reply(200, mockContentOverride);
+    .reply(200, overrides);
 
   const { getByText, getAllByText, getAllByLabelText } =
     renderWithRedux(<RepositorySetsTab />, renderOptions());
@@ -240,9 +255,12 @@ test('Can override to enabled', async (done) => {
     .get(hostRepositorySets)
     .query(defaultQuery)
     .reply(200, mockRepoSetData);
+  const overrides = JSON.parse(JSON.stringify(mockContentOverride));
+  overrides.results[1].enabled_content_override = true;
+
   const contentOverrideScope = nockInstance
     .put(contentOverride)
-    .reply(200, mockContentOverride);
+    .reply(200, overrides);
 
   const {
     getByText, queryByText, getAllByText, getAllByLabelText,
@@ -276,10 +294,12 @@ test('Can reset to default', async (done) => {
     .get(hostRepositorySets)
     .query(defaultQuery)
     .reply(200, mockRepoSetData);
+  const overrides = JSON.parse(JSON.stringify(mockContentOverride));
+  overrides.results[1].enabled_content_override = null;
+
   const contentOverrideScope = nockInstance
     .put(contentOverride)
-    .reply(200, mockContentOverride);
-
+    .reply(200, overrides);
   const {
     getByText, queryByText, getAllByText, getAllByLabelText,
   } = renderWithRedux(<RepositorySetsTab />, renderOptions());
@@ -288,6 +308,7 @@ test('Can reset to default', async (done) => {
   await patientlyWaitFor(() => expect(getByText(firstRepoSet.contentUrl)).toBeInTheDocument());
   expect(getAllByText('Enabled')).toHaveLength(2);
   expect(getAllByText('Disabled')).toHaveLength(1);
+
   // The second item is overridden to disabled but would normally be enabled; we're going to reset
   const actionMenu = getAllByLabelText('Actions')[1].closest('button');
   fireEvent.click(actionMenu);
@@ -305,3 +326,81 @@ test('Can reset to default', async (done) => {
   assertNockRequest(scope);
   assertNockRequest(contentOverrideScope, done); // Pass jest callback to confirm test is done
 });
+
+test('Can override in bulk', async (done) => {
+  const autocompleteScope = mockAutocomplete(nockInstance, autocompleteUrl);
+  const scope = nockInstance
+    .get(hostRepositorySets)
+    .query(defaultQuery)
+    .reply(200, mockRepoSetData);
+  const contentOverrideScope = nockInstance
+    .put(contentOverride)
+    .reply(200, mockContentOverride);
+
+  const {
+    getByText, getByLabelText, queryByText,
+  } = renderWithRedux(<RepositorySetsTab />, renderOptions());
+
+  await patientlyWaitFor(() => expect(getByText(firstRepoSet.contentUrl)).toBeInTheDocument());
+  getByLabelText('Select row 0').click();
+  getByLabelText('Select row 1').click();
+  const actionMenu = getByLabelText('bulk_actions');
+  actionMenu.click();
+  const resetToDefault = queryByText('Reset to default');
+  expect(resetToDefault).toBeInTheDocument();
+  resetToDefault.click();
+
+  assertNockRequest(autocompleteScope);
+  assertNockRequest(scope);
+  assertNockRequest(contentOverrideScope, done); // Pass jest callback to confirm test is done});
+});
+
+test('Can filter by status', async (done) => {
+  const autocompleteScope = mockAutocomplete(nockInstance, autocompleteUrl);
+  const scope = nockInstance
+    .get(hostRepositorySets)
+    .query(defaultQuery)
+    .reply(200, mockRepoSetData);
+
+  const scope2 = nockInstance
+    .get(hostRepositorySets)
+    .query({ ...defaultQuery, status: 'overridden' })
+    .reply(200, { ...mockRepoSetData, results: [secondRepoSet] });
+
+  const {
+    getByText, queryByLabelText, getByRole,
+  } = renderWithRedux(<RepositorySetsTab />, renderOptions());
+
+  await patientlyWaitFor(() => expect(getByText(firstRepoSet.contentUrl)).toBeInTheDocument());
+
+  const statusContainer = queryByLabelText('select Status container', { ignore: 'th' });
+  const statusDropdown = within(statusContainer).queryByText('Status');
+  expect(statusDropdown).toBeInTheDocument();
+  fireEvent.click(statusDropdown);
+  const overridden = getByRole('option', { name: 'select Overridden' });
+  fireEvent.click(overridden);
+  await patientlyWaitFor(() => {
+    expect(getByText('Overridden')).toBeInTheDocument();
+  });
+  assertNockRequest(autocompleteScope);
+  assertNockRequest(scope);
+  assertNockRequest(searchDelayScope);
+  assertNockRequest(autoSearchScope);
+  assertNockRequest(scope2, done); // Pass jest callback to confirm test is done
+});
+
+test('Can display osRestricted as a label', async (done) => {
+  const autocompleteScope = mockAutocomplete(nockInstance, autocompleteUrl);
+  const scope = nockInstance
+    .get(hostRepositorySets)
+    .query(defaultQuery)
+    .reply(200, mockRepoSetData);
+
+  const { getByText } = renderWithRedux(<RepositorySetsTab />, renderOptions());
+
+  await patientlyWaitFor(() => expect(getByText(secondRepoSet.contentUrl)).toBeInTheDocument());
+  expect(secondRepoSet.osRestricted).not.toBeNull();
+  expect(getByText(secondRepoSet.osRestricted)).toBeInTheDocument();
+  assertNockRequest(autocompleteScope);
+  assertNockRequest(scope, done); // Pass jest callback to confirm test is done
+});