fix: fix some tests, skip others for now

Author: muselesscreator

src/components/FileUpload/UploadConfirmModal.test.jsx

@@ -10,47 +10,38 @@ jest.mock('./hooks', () => ({
 describe('<UploadConfirmModal />', () => {
   const props = {
     open: true,
-    files: [],
+    file: { name: 'file1' },
     closeHandler: jest.fn().mockName('closeHandler'),
     uploadHandler: jest.fn().mockName('uploadHandler'),
   };
 
   const mockHooks = (overrides) => {
     useUploadConfirmModalHooks.mockReturnValueOnce({
-      errors: [],
+      shouldShowError: false,
       exitHandler: jest.fn().mockName('exitHandler'),
       confirmUploadClickHandler: jest.fn().mockName('confirmUploadClickHandler'),
       onFileDescriptionChange: jest.fn().mockName('onFileDescriptionChange'),
       ...overrides,
     });
   };
   describe('renders', () => {
-    test('no files', () => {
-      mockHooks();
-      const wrapper = shallow(<UploadConfirmModal {...props} />);
-      expect(wrapper.snapshot).toMatchSnapshot();
-
-      expect(wrapper.instance.findByType('Form.Group').length).toBe(0);
-    });
-
-    test('multiple files', () => {
+    test('without error', () => {
       mockHooks(
         { errors: new Array(2) },
       );
-      const wrapper = shallow(<UploadConfirmModal {...props} files={[{ name: 'file1' }, { name: 'file2' }]} />);
+      const wrapper = shallow(<UploadConfirmModal {...props} />);
       expect(wrapper.snapshot).toMatchSnapshot();
 
-      expect(wrapper.instance.findByType('Form.Group').length).toBe(2);
+      expect(wrapper.instance.findByType('Form.Group').length).toBe(1);
       expect(wrapper.instance.findByType('Form.Control.Feedback').length).toBe(0);
     });
 
     test('with errors', () => {
-      mockHooks({ errors: [true, false] });
-      const wrapper = shallow(<UploadConfirmModal {...props} files={[{ name: 'file1' }, { name: 'file2' }]} />);
-      // wrapper.setState({ errors: [true, false] });
+      mockHooks({ shouldShowError: true });
+      const wrapper = shallow(<UploadConfirmModal {...props} />);
       expect(wrapper.snapshot).toMatchSnapshot();
 
-      expect(wrapper.instance.findByType('Form.Group').length).toBe(2);
+      expect(wrapper.instance.findByType('Form.Group').length).toBe(1);
       expect(wrapper.instance.findByType('Form.Control.Feedback').length).toBe(1);
     });
   });

src/components/FileUpload/__snapshots__/UploadConfirmModal.test.jsx.snap

@@ -1,8 +1,9 @@
 // Jest Snapshot v1, https://goo.gl/fbAQLP
 
-exports[`<UploadConfirmModal /> renders multiple files 1`] = `
+exports[`<UploadConfirmModal /> renders with errors 1`] = `
 <ModalDialog
   hasCloseButton={false}
+  isBlocking={true}
   isOpen={true}
   onClose={[MockFunction exitHandler]}
   title="Add a text description to your file"
@@ -14,9 +15,7 @@ exports[`<UploadConfirmModal /> renders multiple files 1`] = `
   </ModalDialog.Header>
   <ModalDialog.Body>
     <div>
-      <Form.Group
-        key="0"
-      >
+      <Form.Group>
         <FormLabel>
           <strong>
             Description for: 
@@ -28,27 +27,15 @@ exports[`<UploadConfirmModal /> renders multiple files 1`] = `
           </span>
         </FormLabel>
         <Form.Control
-          name="file-0-description"
-          onChange={[MockFunction onFileDescriptionChange]}
-        />
-      </Form.Group>
-      <Form.Group
-        key="1"
-      >
-        <FormLabel>
-          <strong>
-            Description for: 
-          </strong>
-          <span
-            className="file-name-ellipsis"
-          >
-            file2
-          </span>
-        </FormLabel>
-        <Form.Control
-          name="file-1-description"
+          isInvalid={true}
+          name="file-description"
           onChange={[MockFunction onFileDescriptionChange]}
         />
+        <Form.Control.Feedback
+          type="invalid"
+        >
+          formatMessage(messages.fileDescriptionMissingError)
+        </Form.Control.Feedback>
       </Form.Group>
     </div>
   </ModalDialog.Body>
@@ -71,43 +58,10 @@ exports[`<UploadConfirmModal /> renders multiple files 1`] = `
 </ModalDialog>
 `;
 
-exports[`<UploadConfirmModal /> renders no files 1`] = `
-<ModalDialog
-  hasCloseButton={false}
-  isOpen={true}
-  onClose={[MockFunction exitHandler]}
-  title="Add a text description to your file"
->
-  <ModalDialog.Header>
-    <ModalDialog.Title>
-      Add a text description to your file
-    </ModalDialog.Title>
-  </ModalDialog.Header>
-  <ModalDialog.Body>
-    <div />
-  </ModalDialog.Body>
-  <ModalDialog.Footer>
-    <ActionRow>
-      <ModalDialog.CloseButton
-        onClick={[MockFunction exitHandler]}
-        variant="tertiary"
-      >
-        Cancel upload
-      </ModalDialog.CloseButton>
-      <Button
-        onClick={[MockFunction confirmUploadClickHandler]}
-        variant="primary"
-      >
-        Upload files
-      </Button>
-    </ActionRow>
-  </ModalDialog.Footer>
-</ModalDialog>
-`;
-
-exports[`<UploadConfirmModal /> renders with errors 1`] = `
+exports[`<UploadConfirmModal /> renders without error 1`] = `
 <ModalDialog
   hasCloseButton={false}
+  isBlocking={true}
   isOpen={true}
   onClose={[MockFunction exitHandler]}
   title="Add a text description to your file"
@@ -119,9 +73,7 @@ exports[`<UploadConfirmModal /> renders with errors 1`] = `
   </ModalDialog.Header>
   <ModalDialog.Body>
     <div>
-      <Form.Group
-        key="0"
-      >
+      <Form.Group>
         <FormLabel>
           <strong>
             Description for: 
@@ -132,33 +84,9 @@ exports[`<UploadConfirmModal /> renders with errors 1`] = `
             file1
           </span>
         </FormLabel>
-        <Form.Control
-          isInvalid={true}
-          name="file-0-description"
-          onChange={[MockFunction onFileDescriptionChange]}
-        />
-        <Form.Control.Feedback
-          type="invalid"
-        >
-          Please enter a file description
-        </Form.Control.Feedback>
-      </Form.Group>
-      <Form.Group
-        key="1"
-      >
-        <FormLabel>
-          <strong>
-            Description for: 
-          </strong>
-          <span
-            className="file-name-ellipsis"
-          >
-            file2
-          </span>
-        </FormLabel>
         <Form.Control
           isInvalid={false}
-          name="file-1-description"
+          name="file-description"
           onChange={[MockFunction onFileDescriptionChange]}
         />
       </Form.Group>