katello 4.6.2.1 → 4.7.0.rc1

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

@@ -9,13 +9,13 @@ import simplifiedAcsDetails from './simplifiedAcsDetails.fixtures.json';
 import productsList from './acsProducts.fixtures.json';
 
 const acsDetailsURL = api.getApiUrl('/alternate_content_sources/1');
-const withACSRoute = component => <Route path="/labs/alternate_content_sources/:id([0-9]+)">{component}</Route>;
+const withACSRoute = component => <Route path="/alternate_content_sources/:id([0-9]+)">{component}</Route>;
 const productsURL = api.getApiUrl('/products');
 
 test('Can show custom ACS details expandable sections with edit buttons', async (done) => {
   const renderOptions = {
     routerParams: {
-      initialEntries: [{ pathname: '/labs/alternate_content_sources/1/details' }],
+      initialEntries: [{ pathname: '/alternate_content_sources/1/details' }],
     },
   };
   const acsDetailsScope = nockInstance
@@ -27,21 +27,21 @@ test('Can show custom ACS details expandable sections with edit buttons', async
 
   // Nothing will show at first, page is loading
   expect(queryByText('test_acs')).toBeNull();
-  expect(queryByText('Hide details')).toBeNull();
-  expect(queryByText('Show smart proxies')).toBeNull();
-  expect(queryByText('Show URL and subpaths')).toBeNull();
-  expect(queryByText('Show credentials')).toBeNull();
+  expect(queryByText('Details')).toBeNull();
+  expect(queryByText('Smart proxies')).toBeNull();
+  expect(queryByText('URL and subpaths')).toBeNull();
+  expect(queryByText('Credentials')).toBeNull();
   // Assert that the ACS name and expandable sections
   // are now showing on the screen, but wait for it to appear.
   await patientlyWaitFor(() => {
     expect(queryByText('test_acs')).toBeInTheDocument();
-    expect(queryByText('Hide details')).toBeInTheDocument();
+    expect(queryByText('Details')).toBeInTheDocument();
     expect(getByLabelText('edit-details-pencil-edit')).toBeInTheDocument();
-    expect(queryByText('Show smart proxies')).toBeInTheDocument();
+    expect(queryByText('Smart proxies')).toBeInTheDocument();
     expect(getByLabelText('edit-smart-proxies-pencil-edit')).toBeInTheDocument();
-    expect(queryByText('Show URL and subpaths')).toBeInTheDocument();
+    expect(queryByText('URL and subpaths')).toBeInTheDocument();
     expect(getByLabelText('edit-urls-pencil-edit')).toBeInTheDocument();
-    expect(queryByText('Show credentials')).toBeInTheDocument();
+    expect(queryByText('Credentials')).toBeInTheDocument();
     expect(getByLabelText('edit-credentials-pencil-edit')).toBeInTheDocument();
   });
   assertNockRequest(acsDetailsScope, done);
@@ -51,41 +51,43 @@ test('Can show custom ACS details expandable sections with edit buttons', async
 test('Can open and close edit ACS details modal', async (done) => {
   const renderOptions = {
     routerParams: {
-      initialEntries: [{ pathname: '/labs/alternate_content_sources/1/details' }],
+      initialEntries: [{ pathname: '/alternate_content_sources/1/details' }],
     },
   };
   const acsDetailsScope = nockInstance
     .get(acsDetailsURL)
     .query(true)
     .reply(200, acsDetails);
-  const { queryByText, getByLabelText } =
+  const {
+    queryByText, getByLabelText, queryAllByText, queryByLabelText,
+  } =
         renderWithRedux(withACSRoute(<ACSExpandableDetails />), renderOptions);
 
   // Nothing will show at first, page is loading
   expect(queryByText('test_acs')).toBeNull();
-  expect(queryByText('Hide details')).toBeNull();
-  expect(queryByText('Show smart proxies')).toBeNull();
-  expect(queryByText('Show URL and subpaths')).toBeNull();
-  expect(queryByText('Show credentials')).toBeNull();
+  expect(queryByText('Details')).toBeNull();
+  expect(queryByText('Smart proxies')).toBeNull();
+  expect(queryByText('URL and subpaths')).toBeNull();
+  expect(queryByText('Credentials')).toBeNull();
   // Assert that the ACS name and expandable sections
   // are now showing on the screen, but wait for it to appear.
   await patientlyWaitFor(() => {
     expect(queryByText('test_acs')).toBeInTheDocument();
-    expect(queryByText('Hide details')).toBeInTheDocument();
+    expect(queryByText('Details')).toBeInTheDocument();
     expect(getByLabelText('edit-details-pencil-edit')).toBeInTheDocument();
   });
   const editDetails = getByLabelText('edit-details-pencil-edit');
   fireEvent.click(editDetails);
   // Can open modal
   await patientlyWaitFor(() => {
-    expect(queryByText('Edit Alternate content source details')).toBeInTheDocument();
+    expect(queryAllByText('Edit')).toHaveLength(5);
     expect(getByLabelText('edit_acs_details')).toBeInTheDocument();
   });
   const cancelButton = queryByText('Cancel');
   fireEvent.click(cancelButton);
   // can close modal
   await patientlyWaitFor(() => {
-    expect(queryByText('Edit Alternate content source details')).not.toBeInTheDocument();
+    expect(queryByLabelText('edit_acs_details')).not.toBeInTheDocument();
   });
   assertNockRequest(acsDetailsScope, done);
   act(done);
@@ -94,7 +96,7 @@ test('Can open and close edit ACS details modal', async (done) => {
 test('Can edit ACS details in the edit modal', async (done) => {
   const renderOptions = {
     routerParams: {
-      initialEntries: [{ pathname: '/labs/alternate_content_sources/1/details' }],
+      initialEntries: [{ pathname: '/alternate_content_sources/1/details' }],
     },
   };
   const acsDetailsScope = nockInstance
@@ -105,34 +107,34 @@ test('Can edit ACS details in the edit modal', async (done) => {
   const acsEditScope = nockInstance
     .put(acsDetailsURL)
     .reply(200, acsDetails);
-  const { queryByText, getByLabelText } =
+  const { queryByText, getByLabelText, queryAllByText } =
         renderWithRedux(withACSRoute(<ACSExpandableDetails />), renderOptions);
 
   // Nothing will show at first, page is loading
   expect(queryByText('test_acs')).toBeNull();
-  expect(queryByText('Hide details')).toBeNull();
-  expect(queryByText('Show smart proxies')).toBeNull();
-  expect(queryByText('Show URL and subpaths')).toBeNull();
-  expect(queryByText('Show credentials')).toBeNull();
+  expect(queryByText('Details')).toBeNull();
+  expect(queryByText('Smart proxies')).toBeNull();
+  expect(queryByText('URL and subpaths')).toBeNull();
+  expect(queryByText('Credentials')).toBeNull();
   // Assert that the ACS name and expandable sections
   // are now showing on the screen, but wait for it to appear.
   await patientlyWaitFor(() => {
     expect(queryByText('test_acs')).toBeInTheDocument();
-    expect(queryByText('Hide details')).toBeInTheDocument();
+    expect(queryByText('Details')).toBeInTheDocument();
     expect(getByLabelText('edit-details-pencil-edit')).toBeInTheDocument();
   });
   const editDetails = getByLabelText('edit-details-pencil-edit');
+  expect(queryAllByText('Edit')).toHaveLength(4);
   fireEvent.click(editDetails);
   // Can open modal
   await patientlyWaitFor(() => {
-    expect(queryByText('Edit Alternate content source details')).toBeInTheDocument();
     expect(getByLabelText('edit_acs_details')).toBeInTheDocument();
   });
-  const saveButton = queryByText('Edit ACS details');
+  const saveButton = getByLabelText('edit_acs_details');
   fireEvent.click(saveButton);
   // can close modal
   await patientlyWaitFor(() => {
-    expect(queryByText('Edit Alternate content source details')).not.toBeInTheDocument();
+    expect(queryAllByText('Edit')).toHaveLength(4);
   });
   assertNockRequest(acsDetailsScope);
   assertNockRequest(acsEditScope);
@@ -143,7 +145,7 @@ test('Can edit ACS details in the edit modal', async (done) => {
 test('Can show simplified ACS details expandable sections with edit buttons', async (done) => {
   const renderOptions = {
     routerParams: {
-      initialEntries: [{ pathname: '/labs/alternate_content_sources/1/details' }],
+      initialEntries: [{ pathname: '/alternate_content_sources/1/details' }],
     },
   };
   const acsDetailsScope = nockInstance
@@ -155,23 +157,23 @@ test('Can show simplified ACS details expandable sections with edit buttons', as
 
   // Nothing will show at first, page is loading
   expect(queryByText('test_acs3')).toBeNull();
-  expect(queryByText('Hide details')).toBeNull();
-  expect(queryByText('Show smart proxies')).toBeNull();
-  expect(queryByText('Show URL and subpaths')).toBeNull();
-  expect(queryByText('Show credentials')).toBeNull();
-  expect(queryByText('Show products')).toBeNull();
+  expect(queryByText('Details')).toBeNull();
+  expect(queryByText('Smart proxies')).toBeNull();
+  expect(queryByText('URL and subpaths')).toBeNull();
+  expect(queryByText('Credentials')).toBeNull();
+  expect(queryByText('Products')).toBeNull();
   // Assert that the ACS name and expandable sections
   // are now showing on the screen, but wait for it to appear.
   await patientlyWaitFor(() => {
     expect(queryByText('test_acs3')).toBeInTheDocument();
-    expect(queryByText('Hide details')).toBeInTheDocument();
+    expect(queryByText('Details')).toBeInTheDocument();
     expect(getByLabelText('edit-details-pencil-edit')).toBeInTheDocument();
-    expect(queryByText('Show smart proxies')).toBeInTheDocument();
+    expect(queryByText('Smart proxies')).toBeInTheDocument();
     expect(getByLabelText('edit-smart-proxies-pencil-edit')).toBeInTheDocument();
-    expect(queryByText('Show products')).toBeInTheDocument();
+    expect(queryByText('Products')).toBeInTheDocument();
     expect(getByLabelText('edit-products-pencil-edit')).toBeInTheDocument();
-    expect(queryByText('Show credentials')).not.toBeInTheDocument();
-    expect(queryByText('Show URL and subpaths')).not.toBeInTheDocument();
+    expect(queryByText('Credentials')).not.toBeInTheDocument();
+    expect(queryByText('URL and subpaths')).not.toBeInTheDocument();
   });
   assertNockRequest(acsDetailsScope, done);
   act(done);
@@ -180,7 +182,7 @@ test('Can show simplified ACS details expandable sections with edit buttons', as
 test('Can edit products in a simplified ACS details edit modal', async (done) => {
   const renderOptions = {
     routerParams: {
-      initialEntries: [{ pathname: '/labs/alternate_content_sources/1/details' }],
+      initialEntries: [{ pathname: '/alternate_content_sources/1/details' }],
     },
   };
   const acsDetailsScope = nockInstance
@@ -198,41 +200,42 @@ test('Can edit products in a simplified ACS details edit modal', async (done) =>
     .put(acsDetailsURL)
     .reply(200, acsDetails);
 
-  const { queryByText, getByLabelText } =
+  const { queryByText, getByLabelText, queryAllByText } =
         renderWithRedux(withACSRoute(<ACSExpandableDetails />), renderOptions);
 
   // Nothing will show at first, page is loading
   expect(queryByText('test_acs3')).toBeNull();
-  expect(queryByText('Hide details')).toBeNull();
-  expect(queryByText('Show smart proxies')).toBeNull();
-  expect(queryByText('Show URL and subpaths')).toBeNull();
-  expect(queryByText('Show credentials')).toBeNull();
-  expect(queryByText('Show products')).toBeNull();
+  expect(queryByText('Details')).toBeNull();
+  expect(queryByText('Smart proxies')).toBeNull();
+  expect(queryByText('URL and subpaths')).toBeNull();
+  expect(queryByText('Credentials')).toBeNull();
+  expect(queryByText('Products')).toBeNull();
   // Assert that the ACS name and expandable sections
   // are now showing on the screen, but wait for it to appear.
   await patientlyWaitFor(() => {
     expect(queryByText('test_acs3')).toBeInTheDocument();
-    expect(queryByText('Hide details')).toBeInTheDocument();
+    expect(queryByText('Details')).toBeInTheDocument();
     expect(getByLabelText('edit-details-pencil-edit')).toBeInTheDocument();
-    expect(queryByText('Show smart proxies')).toBeInTheDocument();
+    expect(queryByText('Smart proxies')).toBeInTheDocument();
     expect(getByLabelText('edit-smart-proxies-pencil-edit')).toBeInTheDocument();
-    expect(queryByText('Show products')).toBeInTheDocument();
+    expect(queryByText('Products')).toBeInTheDocument();
     expect(getByLabelText('edit-products-pencil-edit')).toBeInTheDocument();
-    expect(queryByText('Show credentials')).not.toBeInTheDocument();
-    expect(queryByText('Show URL and subpaths')).not.toBeInTheDocument();
+    expect(queryByText('Credentials')).not.toBeInTheDocument();
+    expect(queryByText('URL and subpaths')).not.toBeInTheDocument();
   });
   const editDetails = getByLabelText('edit-products-pencil-edit');
+  expect(queryAllByText('Edit')).toHaveLength(3);
   fireEvent.click(editDetails);
   // Can open modal
   await patientlyWaitFor(() => {
-    expect(queryByText('Edit Alternate content source products')).toBeInTheDocument();
+    expect(queryAllByText('Edit')).toHaveLength(4);
     expect(getByLabelText('edit_acs_details')).toBeInTheDocument();
   });
-  const saveButton = queryByText('Edit ACS products');
+  const saveButton = getByLabelText('edit_acs_details');
   fireEvent.click(saveButton);
   // can close modal
   await patientlyWaitFor(() => {
-    expect(queryByText('Edit Alternate content source products')).not.toBeInTheDocument();
+    expect(queryAllByText('Edit')).toHaveLength(3);
   });
   assertNockRequest(acsDetailsScope);
   assertNockRequest(productsScope);

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

@@ -7,12 +7,12 @@ import ACSExpandableDetails from '../ACSExpandableDetails';
 import acsDetails from './acsDetails.fixtures';
 
 const acsDetailsURL = api.getApiUrl('/alternate_content_sources/1');
-const withACSRoute = component => <Route path="/labs/alternate_content_sources/:id([0-9]+)">{component}</Route>;
+const withACSRoute = component => <Route path="/alternate_content_sources/:id([0-9]+)">{component}</Route>;
 
 test('Can call API and show ACS details expandable sections on page load', async (done) => {
   const renderOptions = {
     routerParams: {
-      initialEntries: [{ pathname: '/labs/alternate_content_sources/1/details' }],
+      initialEntries: [{ pathname: '/alternate_content_sources/1/details' }],
     },
   };
   const acsDetailsScope = nockInstance
@@ -23,18 +23,18 @@ test('Can call API and show ACS details expandable sections on page load', async
 
   // Nothing will show at first, page is loading
   expect(queryByText('test_acs')).toBeNull();
-  expect(queryByText('Hide details')).toBeNull();
-  expect(queryByText('Show smart proxies')).toBeNull();
-  expect(queryByText('Show URL and subpaths')).toBeNull();
-  expect(queryByText('Show credentials')).toBeNull();
+  expect(queryByText('Details')).toBeNull();
+  expect(queryByText('Smart proxies')).toBeNull();
+  expect(queryByText('URL and subpaths')).toBeNull();
+  expect(queryByText('Credentials')).toBeNull();
   // Assert that the ACS name and expandable sections
   // are now showing on the screen, but wait for it to appear.
   await patientlyWaitFor(() => {
     expect(queryByText('test_acs')).toBeInTheDocument();
-    expect(queryByText('Hide details')).toBeInTheDocument();
-    expect(queryByText('Show smart proxies')).toBeInTheDocument();
-    expect(queryByText('Show URL and subpaths')).toBeInTheDocument();
-    expect(queryByText('Show credentials')).toBeInTheDocument();
+    expect(queryByText('Details')).toBeInTheDocument();
+    expect(queryByText('Smart proxies')).toBeInTheDocument();
+    expect(queryByText('URL and subpaths')).toBeInTheDocument();
+    expect(queryByText('Credentials')).toBeInTheDocument();
   });
   assertNockRequest(acsDetailsScope, done);
   act(done);
@@ -43,14 +43,14 @@ test('Can call API and show ACS details expandable sections on page load', async
 test('Can expand expandable sections on details page', async (done) => {
   const renderOptions = {
     routerParams: {
-      initialEntries: [{ pathname: '/labs/alternate_content_sources/1/details' }],
+      initialEntries: [{ pathname: '/alternate_content_sources/1/details' }],
     },
   };
   const acsDetailsScope = nockInstance
     .get(acsDetailsURL)
     .query(true)
     .reply(200, acsDetails);
-  const { queryAllByText, queryByText } =
+  const { queryAllByText, queryByText, queryByLabelText } =
     renderWithRedux(withACSRoute(<ACSExpandableDetails />), renderOptions);
 
   // Nothing will show at first, page is loading
@@ -59,46 +59,49 @@ test('Can expand expandable sections on details page', async (done) => {
   // are now showing on the screen, but wait for it to appear.
   await patientlyWaitFor(() => {
     expect(queryByText('test_acs')).toBeInTheDocument();
-    expect(queryByText('Hide details')).toBeInTheDocument();
-    expect(queryByText('Show smart proxies')).toBeInTheDocument();
-    expect(queryByText('Show URL and subpaths')).toBeInTheDocument();
-    expect(queryByText('Show credentials')).toBeInTheDocument();
+    expect(queryByText('Details')).toBeInTheDocument();
+    expect(queryByText('Smart proxies')).toBeInTheDocument();
+    expect(queryByText('URL and subpaths')).toBeInTheDocument();
+    expect(queryByText('Credentials')).toBeInTheDocument();
   });
-  const showSmartProxyButton = queryByText('Show smart proxies');
+  const showSmartProxyButton = queryByText('Smart proxies');
   fireEvent.click(showSmartProxyButton);
   await patientlyWaitFor(() => {
     expect(queryByText('test_acs')).toBeInTheDocument();
-    expect(queryByText('Show details')).toBeInTheDocument();
-    expect(queryByText('Hide smart proxies')).toBeInTheDocument();
+    expect(queryByText('Details')).toBeInTheDocument();
+    expect(queryByText('Smart proxies')).toBeInTheDocument();
     expect(queryByText('centos7-katello-devel-stable.example.com')).toBeInTheDocument();
-    expect(queryByText('Show URL and subpaths')).toBeInTheDocument();
-    expect(queryByText('Show credentials')).toBeInTheDocument();
+    expect(queryByLabelText('httpProxyTitle')).toBeInTheDocument();
+    expect(queryByText('URL and subpaths')).toBeInTheDocument();
+    expect(queryByText('Credentials')).toBeInTheDocument();
   });
 
-  const showURLSubpathsButton = queryByText('Show URL and subpaths');
+  const showURLSubpathsButton = queryByText('URL and subpaths');
   fireEvent.click(showURLSubpathsButton);
   await patientlyWaitFor(() => {
     expect(queryByText('test_acs')).toBeInTheDocument();
-    expect(queryByText('Show details')).toBeInTheDocument();
-    expect(queryByText('Show smart proxies')).toBeInTheDocument();
-    expect(queryByText('Hide URL and subpaths')).toBeInTheDocument();
+    expect(queryByText('Details')).toBeInTheDocument();
+    expect(queryByText('Smart proxies')).toBeInTheDocument();
+    expect(queryByText('URL and subpaths')).toBeInTheDocument();
     expect(queryByText('https://fedorapeople.org/groups/katello/fakerepos/')).toBeInTheDocument();
     expect(queryByText('zoo/, zoo2/, zoo3/, zoo4/, zoo5/')).toBeInTheDocument();
-    expect(queryByText('Show credentials')).toBeInTheDocument();
+    expect(queryByText('Credentials')).toBeInTheDocument();
   });
 
-  const showCredentialButton = queryByText('Show credentials');
+  const showCredentialButton = queryByText('Credentials');
   fireEvent.click(showCredentialButton);
   await patientlyWaitFor(() => {
     expect(queryByText('test_acs')).toBeInTheDocument();
-    expect(queryByText('Show details')).toBeInTheDocument();
-    expect(queryByText('Show smart proxies')).toBeInTheDocument();
-    expect(queryByText('Show URL and subpaths')).toBeInTheDocument();
-    expect(queryByText('Hide credentials')).toBeInTheDocument();
+    expect(queryByText('Details')).toBeInTheDocument();
+    expect(queryByText('Smart proxies')).toBeInTheDocument();
+    expect(queryByText('URL and subpaths')).toBeInTheDocument();
+    expect(queryByText('Credentials')).toBeInTheDocument();
     expect(queryByText('Verify SSL')).toBeInTheDocument();
-    expect(queryByText('false')).toBeInTheDocument();
+    expect(queryAllByText('false')[0]).toBeInTheDocument();
+    expect(queryAllByText('false')[1]).toBeInTheDocument();
     expect(queryByText('SSL CA certificate')).toBeInTheDocument();
     expect(queryAllByText('N/A')[0]).toBeInTheDocument();
+    expect(queryByText('true')).not.toBeInTheDocument();
   });
 
   assertNockRequest(acsDetailsScope, done);