From 3945c47a53c7cae3208380e21eb3959daac2730a Mon Sep 17 00:00:00 2001
From: Andreas Gasser <andreas.gasser@novartis.com>
Date: Wed, 8 May 2019 13:48:50 +0200
Subject: [PATCH] fix(#107): fixed failing test cases and removed prop type
 warnings

---
 src/app/Privacy.jsx                           |  1 +
 .../__snapshots__/Privacy.test.js.snap        | 44 +++++++++++--------
 src/auth/login/__tests__/LoginForm.test.js    |  6 +--
 src/auth/login/__tests__/LoginView.test.js    |  2 +-
 src/auth/register/CheckEmailForm.jsx          |  2 +-
 .../register/__tests__/CheckEmailForm.test.js | 35 ++++++++++-----
 .../register/__tests__/RegisterForm.test.js   | 34 +++++++++-----
 .../register/__tests__/RegisterView.test.js   |  2 +-
 .../__snapshots__/AddImageButton.test.js.snap |  4 +-
 .../__snapshots__/Attribute.test.js.snap      |  6 +--
 .../__snapshots__/Faces.test.js.snap          | 43 +++++++++---------
 src/images/list/__tests__/ImageList.test.js   |  8 +++-
 src/redux/images/__tests__/index.test.js      |  2 +-
 src/redux/user/index.js                       |  2 +-
 src/setupTests.js                             |  2 +-
 .../__snapshots__/Footer.test.js.snap         |  6 +--
 src/ui/form/Form.jsx                          |  8 ++--
 src/ui/form/__tests__/Form.test.js            | 23 ++++++----
 .../__snapshots__/ButtonGroup.test.js.snap    |  4 +-
 .../__tests__/__snapshots__/Form.test.js.snap | 10 +++--
 src/user/UpdateUserForm.jsx                   |  4 +-
 src/user/__tests__/UpdateUserForm.test.js     |  2 +-
 22 files changed, 154 insertions(+), 96 deletions(-)

diff --git a/src/app/Privacy.jsx b/src/app/Privacy.jsx
index 10177fb..d98bab3 100644
--- a/src/app/Privacy.jsx
+++ b/src/app/Privacy.jsx
@@ -28,6 +28,7 @@ const PrivacyView = () => (
       This page informs you of our policies regarding the collection, use, and disclosure of personal data when you use
       our Service and the choices you have associated with that data. Our Privacy Policy for Rekognition is managed with
       the help of
+      {' '}
       <a href="https://privacypolicies.com/free-privacy-policy-generator/">Privacy Policies</a>
     </p>
 
diff --git a/src/app/__tests__/__snapshots__/Privacy.test.js.snap b/src/app/__tests__/__snapshots__/Privacy.test.js.snap
index 2954d12..daef7ee 100644
--- a/src/app/__tests__/__snapshots__/Privacy.test.js.snap
+++ b/src/app/__tests__/__snapshots__/Privacy.test.js.snap
@@ -26,9 +26,9 @@ exports[`Privacy test suite should render consistently 1`] = `
 .c2 {
   margin-top: 12px;
   margin-bottom: 0px;
-  font-size: 18px;
-  line-height: 24px;
-  max-width: 432px;
+  font-size: 50px;
+  line-height: 56px;
+  max-width: 1200px;
   font-weight: 600;
 }
 
@@ -63,9 +63,9 @@ exports[`Privacy test suite should render consistently 1`] = `
 
 @media only screen and (max-width:768px) {
   .c2 {
-    font-size: 18px;
-    line-height: 24px;
-    max-width: 432px;
+    font-size: 34px;
+    line-height: 40px;
+    max-width: 816px;
   }
 }
 
@@ -6896,7 +6896,7 @@ string",
                         className="c0 c1"
                       >
                         <Heading
-                          level="4"
+                          level={1}
                           margin={
                             Object {
                               "bottom": "none",
@@ -6906,8 +6906,8 @@ string",
                           responsive={true}
                         >
                           <StyledHeading
-                            as="h4"
-                            level={4}
+                            as="h1"
+                            level={1}
                             margin={
                               Object {
                                 "bottom": "none",
@@ -7793,7 +7793,7 @@ string",
                             }
                           >
                             <StyledComponent
-                              as="h4"
+                              as="h1"
                               forwardedComponent={
                                 Object {
                                   "$$typeof": Symbol(react.forward_ref),
@@ -7834,7 +7834,7 @@ string",
                                 }
                               }
                               forwardedRef={null}
-                              level={4}
+                              level={1}
                               margin={
                                 Object {
                                   "bottom": "none",
@@ -8719,11 +8719,11 @@ string",
                                 }
                               }
                             >
-                              <h4
+                              <h1
                                 className="c2"
                               >
                                 Privacy Policy
-                              </h4>
+                              </h1>
                             </StyledComponent>
                           </StyledHeading>
                         </Heading>
@@ -8731,16 +8731,18 @@ string",
                           Effective date: September 20, 2018
                         </p>
                         <p>
-                          Rekognition ("us", "we", or "our") operates the www.rekognition.gasserandreas.com website and the Rekognition mobile application (hereinafter referred to as the "Service").
+                          Rekognition ("us", "we", or "our") operates the
+                           
+                          www.rekognition.gasserandreas.com website and the Rekognition mobile application (hereinafter referred to as the "Service").
                         </p>
                         <p>
                           This page informs you of our policies regarding the collection, use, and disclosure of personal data when you use our Service and the choices you have associated with that data. Our Privacy Policy for Rekognition is managed with the help of
+                           
                           <a
                             href="https://privacypolicies.com/free-privacy-policy-generator/"
                           >
                             Privacy Policies
                           </a>
-                          .
                         </p>
                         <p>
                           We use your data to provide and improve the Service. By using the Service, you agree to the collection and use of information in accordance with this policy. Unless otherwise defined in this Privacy Policy, the terms used in this Privacy Policy have the same meanings as in our Terms and Conditions.
@@ -8758,7 +8760,9 @@ string",
                           Personal Data
                         </h4>
                         <p>
-                          While using our Service, we may ask you to provide us with certain personally identifiable information that can be used to contact or identify you ("Personal Data"). Personally identifiable information may include, but is not limited to:
+                          While using our Service, we may ask you to provide us with certain personally identifiable information that can be used to contact or identify you ("Personal Data"). Personally identifiable information
+                           
+                          may include, but is not limited to:
                         </p>
                         <ul>
                           <li>
@@ -8898,7 +8902,9 @@ string",
                           Service Providers
                         </h2>
                         <p>
-                          We may employ third party companies and individuals to facilitate our Service ("Service Providers"), to provide the Service on our behalf, to perform Service-related services or to assist us in analyzing how our Service is used.
+                          We may employ third party companies and individuals to facilitate our
+                           
+                          Service ("Service Providers"), to provide the Service on our behalf, to perform Service-related services or to assist us in analyzing how our Service is used.
                         </p>
                         <p>
                           These third parties have access to your Personal Data only to perform these tasks on our behalf and are obligated not to disclose or use it for any other purpose.
@@ -8933,7 +8939,9 @@ string",
                           Links To Other Sites
                         </h2>
                         <p>
-                          Our Service may contain links to other sites that are not operated by us. If you click on a third party link, you will be directed to that third party's site. We strongly advise you to review the Privacy Policy of every site you visit.
+                          Our Service may contain links to other sites that are not operated by us. If you click on a third party link, you will be directed to that third party's site. We strongly advise
+                           
+                          you to review the Privacy Policy of every site you visit.
                         </p>
                         <p>
                           We have no control over and assume no responsibility for the content, privacy policies or practices of any third party sites or services.
diff --git a/src/auth/login/__tests__/LoginForm.test.js b/src/auth/login/__tests__/LoginForm.test.js
index bb02047..6854f94 100644
--- a/src/auth/login/__tests__/LoginForm.test.js
+++ b/src/auth/login/__tests__/LoginForm.test.js
@@ -52,7 +52,7 @@ describe('Login form test suite', () => {
         errors: inputFields.reduce(
           (prev, cur) => ({
             ...prev,
-            [cur]: true,
+            [cur]: `Error ${cur}`,
           }),
           {},
         ),
@@ -89,7 +89,7 @@ describe('Login form test suite', () => {
         errors: inputFields.reduce(
           (prev, cur) => ({
             ...prev,
-            [cur]: true,
+            [cur]: `Error: ${cur}`,
           }),
           {},
         ),
@@ -115,7 +115,7 @@ describe('Login form test suite', () => {
     it('should show error message if error props is set', () => {
       const props = {
         ...getFormProps(),
-        error: true,
+        error: 'custom error',
       };
       const wrapper = mount(<LoginForm {...props} />);
       expect(wrapper).toBeTruthy();
diff --git a/src/auth/login/__tests__/LoginView.test.js b/src/auth/login/__tests__/LoginView.test.js
index c330a8f..80bedb2 100644
--- a/src/auth/login/__tests__/LoginView.test.js
+++ b/src/auth/login/__tests__/LoginView.test.js
@@ -20,7 +20,7 @@ describe('LoginView test suite', () => {
   beforeEach(() => {
     initialProps = {
       isAuthenticated: false,
-      histroy: {
+      history: {
         push: jest.fn(),
       },
       loginRequest: {
diff --git a/src/auth/register/CheckEmailForm.jsx b/src/auth/register/CheckEmailForm.jsx
index 092656d..cd71168 100644
--- a/src/auth/register/CheckEmailForm.jsx
+++ b/src/auth/register/CheckEmailForm.jsx
@@ -97,7 +97,7 @@ const CheckEmailForm = (props) => {
 
 CheckEmailForm.propTypes = {
   error: PropTypes.node,
-  validEmail: PropTypes.string,
+  validEmail: PropTypes.bool,
   values: PropTypes.shape({}).isRequired,
   touched: PropTypes.shape({}).isRequired,
   errors: PropTypes.shape({}).isRequired,
diff --git a/src/auth/register/__tests__/CheckEmailForm.test.js b/src/auth/register/__tests__/CheckEmailForm.test.js
index 9afb8e5..392653d 100644
--- a/src/auth/register/__tests__/CheckEmailForm.test.js
+++ b/src/auth/register/__tests__/CheckEmailForm.test.js
@@ -24,9 +24,20 @@ describe('Register form test suite', () => {
       return props;
     };
 
+    const defaultProps = {
+      error: '',
+    };
+
+    const getCheckEmailForm = props => mount(
+      <CheckEmailForm
+        {...defaultProps}
+        {...props}
+      />,
+    );
+
     it('should render', () => {
       const props = getFormProps();
-      const wrapper = mount(<CheckEmailForm {...props} />);
+      const wrapper = getCheckEmailForm(props);
       expect(wrapper).toBeTruthy();
     });
 
@@ -44,12 +55,12 @@ describe('Register form test suite', () => {
         errors: inputFields.reduce(
           (prev, cur) => ({
             ...prev,
-            [cur]: true,
+            [cur]: `Error ${cur}`,
           }),
           {},
         ),
       };
-      const wrapper = mount(<CheckEmailForm {...props} />);
+      const wrapper = getCheckEmailForm(props);
 
       // test fields
       const fields = wrapper.find(Field);
@@ -78,12 +89,12 @@ describe('Register form test suite', () => {
         errors: inputFields.reduce(
           (prev, cur) => ({
             ...prev,
-            [cur]: true,
+            [cur]: `Error: ${cur}`,
           }),
           {},
         ),
       };
-      const wrapper = mount(<CheckEmailForm {...props} />);
+      const wrapper = getCheckEmailForm(props);
 
       // test fields
       const fields = wrapper.find(Field);
@@ -104,7 +115,7 @@ describe('Register form test suite', () => {
         ...getFormProps(),
         error,
       };
-      const wrapper = mount(<CheckEmailForm {...props} />);
+      const wrapper = getCheckEmailForm(props);
       expect(wrapper).toBeTruthy();
 
       // check for error message
@@ -119,7 +130,7 @@ describe('Register form test suite', () => {
         ...getFormProps(),
         validEmail,
       };
-      const wrapper = mount(<CheckEmailForm {...props} />);
+      const wrapper = getCheckEmailForm(props);
       expect(wrapper).toBeTruthy();
 
       // check for error message
@@ -134,7 +145,7 @@ describe('Register form test suite', () => {
         dirty: true,
         submitting: true,
       };
-      const wrapper = mount(<CheckEmailForm {...props} />);
+      const wrapper = getCheckEmailForm(props);
       const resetButton = wrapper.find(Button).filterWhere(n => n.props().testId === 'jestResetButton');
       expect(resetButton.props().disabled).toBeTruthy();
     });
@@ -144,7 +155,7 @@ describe('Register form test suite', () => {
         ...getFormProps(),
         submitting: true,
       };
-      const wrapper = mount(<CheckEmailForm {...props} />);
+      const wrapper = getCheckEmailForm(props);
       const submitButton = wrapper.find(Button).filterWhere(n => n.props().testId === 'jestSubmitButton');
       expect(submitButton.props().disabled).toBeTruthy();
     });
@@ -154,14 +165,14 @@ describe('Register form test suite', () => {
         ...getFormProps(),
         submitting: true,
       };
-      const wrapper = mount(<CheckEmailForm {...props} />);
+      const wrapper = getCheckEmailForm(props);
       const submitButton = wrapper.find(Button).filterWhere(n => n.props().testId === 'jestSubmitButton');
       expect(submitButton.props().loading).toBeTruthy();
     });
 
     // important to trigger Formik
     it('submit button should be type of submit', () => {
-      const wrapper = mount(<CheckEmailForm {...getFormProps()} />);
+      const wrapper = getCheckEmailForm(getFormProps());
       const submitButton = wrapper.find(Button).filterWhere(n => n.props().testId === 'jestSubmitButton');
       expect(submitButton.props().type).toEqual('submit');
     });
@@ -174,7 +185,7 @@ describe('Register form test suite', () => {
         dirty: true,
       };
 
-      const wrapper = mount(<CheckEmailForm {...props} />);
+      const wrapper = getCheckEmailForm(props);
       const resetButton = wrapper.find(Button).filterWhere(n => n.props().testId === 'jestResetButton');
       expect(resetButton.exists()).toBeTruthy();
 
diff --git a/src/auth/register/__tests__/RegisterForm.test.js b/src/auth/register/__tests__/RegisterForm.test.js
index 8511486..b35e506 100644
--- a/src/auth/register/__tests__/RegisterForm.test.js
+++ b/src/auth/register/__tests__/RegisterForm.test.js
@@ -33,6 +33,20 @@ describe('Register form test suite', () => {
       };
     };
 
+    const initialProps = {
+      history: {
+        push: jest.fn(),
+      },
+      onCancel: jest.fn(),
+    };
+
+    const getRegisterForm = props => mount(
+      <RegisterForm
+        {...initialProps}
+        {...props}
+      />,
+    );
+
     const disabledFilter = (a) => {
       const { disabled } = a.props();
 
@@ -41,7 +55,7 @@ describe('Register form test suite', () => {
 
     it('should render', () => {
       const props = getFormProps();
-      const wrapper = mount(<RegisterForm {...props} />);
+      const wrapper = getRegisterForm(props);
       expect(wrapper).toBeTruthy();
     });
 
@@ -59,12 +73,12 @@ describe('Register form test suite', () => {
         errors: inputFields.reduce(
           (prev, cur) => ({
             ...prev,
-            [cur]: true,
+            [cur]: `Error: ${cur}`,
           }),
           {},
         ),
       };
-      const wrapper = mount(<RegisterForm {...props} />);
+      const wrapper = getRegisterForm(props);
 
       // test fields
       const fields = wrapper.find(Field).filterWhere(disabledFilter);
@@ -101,7 +115,7 @@ describe('Register form test suite', () => {
           {},
         ),
       };
-      const wrapper = mount(<RegisterForm {...props} />);
+      const wrapper = getRegisterForm(props);
 
       // test fields
       const fields = wrapper.find(Field).filterWhere(disabledFilter);
@@ -125,7 +139,7 @@ describe('Register form test suite', () => {
         ...getFormProps(),
         error,
       };
-      const wrapper = mount(<RegisterForm {...props} />);
+      const wrapper = getRegisterForm(props);
       expect(wrapper).toBeTruthy();
 
       // check for error message
@@ -140,7 +154,7 @@ describe('Register form test suite', () => {
         dirty: true,
         submitting: true,
       };
-      const wrapper = mount(<RegisterForm {...props} />);
+      const wrapper = getRegisterForm(props);
       const resetButton = wrapper.find(Button).filterWhere(n => n.props().testId === 'jestResetButton');
       expect(resetButton.props().disabled).toBeTruthy();
     });
@@ -150,7 +164,7 @@ describe('Register form test suite', () => {
         ...getFormProps(),
         submitting: true,
       };
-      const wrapper = mount(<RegisterForm {...props} />);
+      const wrapper = getRegisterForm(props);
       const submitButton = wrapper.find(Button).filterWhere(n => n.props().testId === 'jestSubmitButton');
       expect(submitButton.props().disabled).toBeTruthy();
     });
@@ -160,14 +174,14 @@ describe('Register form test suite', () => {
         ...getFormProps(),
         submitting: true,
       };
-      const wrapper = mount(<RegisterForm {...props} />);
+      const wrapper = getRegisterForm(props);
       const submitButton = wrapper.find(Button).filterWhere(n => n.props().testId === 'jestSubmitButton');
       expect(submitButton.props().loading).toBeTruthy();
     });
 
     // important to trigger Formik
     it('submit button should be type of submit', () => {
-      const wrapper = mount(<RegisterForm {...getFormProps()} />);
+      const wrapper = getRegisterForm(getFormProps());
       const submitButton = wrapper.find(Button).filterWhere(n => n.props().testId === 'jestSubmitButton');
       expect(submitButton.props().type).toEqual('submit');
     });
@@ -179,7 +193,7 @@ describe('Register form test suite', () => {
         onCancel: jest.fn(),
       };
 
-      const wrapper = mount(<RegisterForm {...props} />);
+      const wrapper = getRegisterForm(props);
       const resetButton = wrapper.find(Button).filterWhere(n => n.props().testId === 'jestResetButton');
       expect(resetButton.exists()).toBeTruthy();
 
diff --git a/src/auth/register/__tests__/RegisterView.test.js b/src/auth/register/__tests__/RegisterView.test.js
index 7e6f5a5..de0ce6d 100644
--- a/src/auth/register/__tests__/RegisterView.test.js
+++ b/src/auth/register/__tests__/RegisterView.test.js
@@ -21,7 +21,7 @@ describe('RegisterView test suite', () => {
   beforeEach(() => {
     initialProps = {
       isAuthenticated: false,
-      histroy: {
+      history: {
         push: jest.fn(),
       },
       signupRequest: {
diff --git a/src/images/__tests__/__snapshots__/AddImageButton.test.js.snap b/src/images/__tests__/__snapshots__/AddImageButton.test.js.snap
index 721d27a..0069f0e 100644
--- a/src/images/__tests__/__snapshots__/AddImageButton.test.js.snap
+++ b/src/images/__tests__/__snapshots__/AddImageButton.test.js.snap
@@ -20188,7 +20188,7 @@ string",
                                                   className="c1"
                                                 >
                                                   <p>
-                                                    Hey it seems your image to big for being uploaded. We only allow uploading images up to 
+                                                    Hey it seems your image to big for being uploaded. We only allow uploading images up to
                                                     <strong>
                                                       6 MB
                                                     </strong>
@@ -65874,7 +65874,7 @@ string",
                                                   className="c1"
                                                 >
                                                   <p>
-                                                    Hey it seems your image to big for being uploaded. We only allow uploading images up to 
+                                                    Hey it seems your image to big for being uploaded. We only allow uploading images up to
                                                     <strong>
                                                       6 MB
                                                     </strong>
diff --git a/src/images/detail/__tests__/__snapshots__/Attribute.test.js.snap b/src/images/detail/__tests__/__snapshots__/Attribute.test.js.snap
index ec9ed01..8bf751a 100644
--- a/src/images/detail/__tests__/__snapshots__/Attribute.test.js.snap
+++ b/src/images/detail/__tests__/__snapshots__/Attribute.test.js.snap
@@ -1544,11 +1544,11 @@ exports[`Image Detail Attribute Attribute styles test suite StyledConfidence sho
   display: inline-block;
   margin-left: 0.25rem;
   &:before {
-    content: \\"(\\";
+    content: '(';
   }
-  
+
   &:after {
-    content: \\")\\";
+    content: ')';
   }
 ",
         ],
diff --git a/src/images/detail/__tests__/__snapshots__/Faces.test.js.snap b/src/images/detail/__tests__/__snapshots__/Faces.test.js.snap
index d3c1c10..6363c2d 100644
--- a/src/images/detail/__tests__/__snapshots__/Faces.test.js.snap
+++ b/src/images/detail/__tests__/__snapshots__/Faces.test.js.snap
@@ -618,7 +618,8 @@ string",
   <h3
     level="1"
   >
-    Face 
+    Face
+     
     1
   </h3>
   <WithTheme(Box)
@@ -2095,12 +2096,13 @@ string",
   }
   forwardedRef={null}
   onClick={[Function]}
-  selected={true}
+  selected={false}
 >
   <h3
     level="1"
   >
-    Face 
+    Face
+     
     1
     <Text
       color="brand"
@@ -3124,11 +3126,11 @@ exports[`Faces test suite should render consistently 1`] = `
 }
 
 .c8:before {
-  content: "(";
+  content: '(';
 }
 
 .c8:after {
-  content: ")";
+  content: ')';
 }
 
 .c6 {
@@ -11922,7 +11924,7 @@ string",
                   >
                     <Styled(WithTheme(Box))
                       onClick={[Function]}
-                      selected={true}
+                      selected={false}
                     >
                       <StyledComponent
                         forwardedComponent={
@@ -12457,7 +12459,7 @@ string",
                         }
                         forwardedRef={null}
                         onClick={[Function]}
-                        selected={true}
+                        selected={false}
                       >
                         <WithTheme(Box)
                           className="c2"
@@ -12466,7 +12468,7 @@ string",
                           onClick={[Function]}
                           pad="none"
                           responsive={true}
-                          selected={true}
+                          selected={false}
                           theme={
                             Object {
                               "accordion": Object {
@@ -13351,7 +13353,7 @@ string",
                             onClick={[Function]}
                             pad="none"
                             responsive={true}
-                            selected={true}
+                            selected={false}
                             theme={
                               Object {
                                 "accordion": Object {
@@ -14237,7 +14239,7 @@ string",
                               onClick={[Function]}
                               pad="none"
                               responsive={true}
-                              selected={true}
+                              selected={false}
                               theme={
                                 Object {
                                   "accordion": Object {
@@ -15122,7 +15124,7 @@ string",
                                 onClick={[Function]}
                                 pad="none"
                                 responsive={true}
-                                selected={true}
+                                selected={false}
                                 theme={
                                   Object {
                                     "accordion": Object {
@@ -16074,7 +16076,7 @@ string",
                                   onClick={[Function]}
                                   pad="none"
                                   responsive={true}
-                                  selected={true}
+                                  selected={false}
                                   theme={
                                     Object {
                                       "accordion": Object {
@@ -16955,12 +16957,13 @@ string",
                                   <div
                                     className="c2 c0"
                                     onClick={[Function]}
-                                    selected={true}
+                                    selected={false}
                                   >
                                     <h3
                                       level="1"
                                     >
-                                      Face 
+                                      Face
+                                       
                                       1
                                       <Text
                                         color="brand"
@@ -37059,11 +37062,11 @@ string",
   display: inline-block;
   margin-left: 0.25rem;
   &:before {
-    content: \\"(\\";
+    content: '(';
   }
-  
+
   &:after {
-    content: \\")\\";
+    content: ')';
   }
 ",
                                                                                   ],
@@ -43999,11 +44002,11 @@ string",
   display: inline-block;
   margin-left: 0.25rem;
   &:before {
-    content: \\"(\\";
+    content: '(';
   }
-  
+
   &:after {
-    content: \\")\\";
+    content: ')';
   }
 ",
                                                                                   ],
diff --git a/src/images/list/__tests__/ImageList.test.js b/src/images/list/__tests__/ImageList.test.js
index 44a873d..7b9cc99 100644
--- a/src/images/list/__tests__/ImageList.test.js
+++ b/src/images/list/__tests__/ImageList.test.js
@@ -101,7 +101,13 @@ describe('ImageList test suite', () => {
   });
 
   describe('ListItem test suite', () => {
-    const getListItem = props => mount(<ListItem image={initialProps.images[0]} {...props} />);
+    const getListItem = props => mount(
+      <ListItem
+        image={initialProps.images[0]}
+        onClick={jest.fn()}
+        {...props}
+      />,
+    );
 
     it('should render', () => {
       const wrapper = getListItem();
diff --git a/src/redux/images/__tests__/index.test.js b/src/redux/images/__tests__/index.test.js
index 1f0cfde..5a2a101 100644
--- a/src/redux/images/__tests__/index.test.js
+++ b/src/redux/images/__tests__/index.test.js
@@ -207,7 +207,7 @@ describe('images complex action test suite', () => {
       const HOC_ACTIONS = testUtils.createHocActions({
         baseType: 'IMAGES_ADD_REQUEST',
         payload: { addImage },
-        error: 'Not a valid file type',
+        error: new Error('Not a valid file type'),
         errorIsHandled: true,
       });
 
diff --git a/src/redux/user/index.js b/src/redux/user/index.js
index 554883d..15cff56 100644
--- a/src/redux/user/index.js
+++ b/src/redux/user/index.js
@@ -38,7 +38,7 @@ export const updateUser = hocAsyncAction(USER_UPDATE_USER_REQUEST, user => (disp
   };
 
   return GraphApi.mutation(UPDATE_USER, variables).then((data) => {
-    dispatch(userSetUser(data.user));
+    dispatch(userSetUser(data.updateUser.user));
 
     return data;
   });
diff --git a/src/setupTests.js b/src/setupTests.js
index 59f9ef0..4a022a6 100644
--- a/src/setupTests.js
+++ b/src/setupTests.js
@@ -92,7 +92,7 @@ const createFormitState = (formElements = {}) => ({
   ),
   dirty: false,
   submitting: false,
-  error: false,
+  error: '',
   handleChange: jest.fn(),
   handleBlur: jest.fn(),
   handleSubmit: jest.fn(),
diff --git a/src/ui/__tests__/__snapshots__/Footer.test.js.snap b/src/ui/__tests__/__snapshots__/Footer.test.js.snap
index ad4b35c..16bdc58 100644
--- a/src/ui/__tests__/__snapshots__/Footer.test.js.snap
+++ b/src/ui/__tests__/__snapshots__/Footer.test.js.snap
@@ -6906,7 +6906,7 @@ string",
                   className="c0 c1"
                 >
                   <span>
-                    Created by: 
+                    Created by:
                     <WithTheme(Anchor)
                       href="https://andreasgasser.com"
                       target="_blank"
@@ -20104,7 +20104,7 @@ string",
                   className="c0 c1"
                 >
                   <span>
-                    Created by: 
+                    Created by:
                     <WithTheme(Anchor)
                       href="https://andreasgasser.com"
                       target="_blank"
@@ -34743,7 +34743,7 @@ string",
                   className="c0 c1"
                 >
                   <span>
-                    Created by: 
+                    Created by:
                     <WithTheme(Anchor)
                       href="https://andreasgasser.com"
                       target="_blank"
diff --git a/src/ui/form/Form.jsx b/src/ui/form/Form.jsx
index 5782acd..3f7cad1 100644
--- a/src/ui/form/Form.jsx
+++ b/src/ui/form/Form.jsx
@@ -71,15 +71,17 @@ export const Field = ({
 
 Field.propTypes = {
   inline: PropTypes.bool,
-  id: PropTypes.string.isRequired,
-  label: PropTypes.node.isRequired,
-  error: PropTypes.node,
+  id: PropTypes.string,
+  label: PropTypes.node,
+  error: PropTypes.oneOfType([PropTypes.node, PropTypes.string]),
   children: PropTypes.node.isRequired,
 };
 
 Field.defaultProps = {
   inline: false,
   error: undefined,
+  id: undefined,
+  label: null,
 };
 
 const StyledFieldRow = styled(Grommet.Box)`
diff --git a/src/ui/form/__tests__/Form.test.js b/src/ui/form/__tests__/Form.test.js
index fc8e0ba..27f1a08 100644
--- a/src/ui/form/__tests__/Form.test.js
+++ b/src/ui/form/__tests__/Form.test.js
@@ -10,12 +10,16 @@ const {
   StyledFieldLabel, StyledFieldFeedback, StyledTextInput, StyledCheckBox, StyledFieldRow,
 } = __testables__;
 
-const getShallowField = (props = {}) => shallow(<Field {...props} />);
-const getMountField = (props = {}) => mount(<Field {...props} />);
+const initialProps = {
+  children: <p>child</p>,
+};
+
+const getShallowField = (props = {}) => shallow(<Field {...initialProps} {...props} />);
+const getMountField = (props = {}) => mount(<Field {...initialProps} {...props} />);
 
 // Field component tests
 it('Field should render correctly', () => {
-  const wrapper = shallow(<Field />);
+  const wrapper = getShallowField();
   expect(toJson(wrapper.dive())).toMatchSnapshot();
 });
 
@@ -36,7 +40,7 @@ it('Field should render content', () => {
 });
 
 it('Field should not render label if no label is passed in', () => {
-  const output = getShallowField();
+  const output = getShallowField({ label: undefined });
   expect(output.find(StyledFieldLabel).length).toEqual(0);
 });
 
@@ -53,7 +57,7 @@ it('Field should render label with custom props', () => {
 
   // check for label component
   const label = output.find(StyledFieldLabel);
-  expect(label).toBeTruthy();
+  expect(label.exists()).toBeTruthy();
 
   // check for label props
   const labelProps = label.props();
@@ -82,7 +86,8 @@ it('Field should render Feedback with error', () => {
 
 // Input tests
 it('TextInput should work correctly', () => {
-  expect(shallow(<TextInput />));
+  const wrapper = shallow(<TextInput />);
+  expect(wrapper.exists()).toBeTruthy();
 });
 
 it('Input styles should be consistent', () => {
@@ -102,7 +107,8 @@ it('Error Input should render correctly', () => {
 
 // Checkbox tests
 it('CheckBox should work correctly', () => {
-  expect(shallow(<CheckBox />));
+  const wrapper = shallow(<CheckBox />);
+  expect(wrapper.exists()).toBeTruthy();
 });
 
 it('Checkbox styles should be consistent', () => {
@@ -117,7 +123,8 @@ it('Checkbox Input should render correctly', () => {
 
 // Test StyledFieldRow
 it('FieldRow should work correctly', () => {
-  expect(shallow(<FieldRow />));
+  const wrapper = shallow(<FieldRow><p>fieldrow</p></FieldRow>);
+  expect(wrapper.exists()).toBeTruthy();
 });
 
 it('FieldRow styles should be consistent', () => {
diff --git a/src/ui/form/__tests__/__snapshots__/ButtonGroup.test.js.snap b/src/ui/form/__tests__/__snapshots__/ButtonGroup.test.js.snap
index c82fbb8..aa84ff5 100644
--- a/src/ui/form/__tests__/__snapshots__/ButtonGroup.test.js.snap
+++ b/src/ui/form/__tests__/__snapshots__/ButtonGroup.test.js.snap
@@ -29,7 +29,9 @@ exports[`ButtonGroup should render correctly 1`] = `
   }
   forwardedRef={null}
 >
-  <button>
+  <button
+    type="button"
+  >
     Click me
   </button>
 </StyledComponent>
diff --git a/src/ui/form/__tests__/__snapshots__/Form.test.js.snap b/src/ui/form/__tests__/__snapshots__/Form.test.js.snap
index 1707084..2e95f1c 100644
--- a/src/ui/form/__tests__/__snapshots__/Form.test.js.snap
+++ b/src/ui/form/__tests__/__snapshots__/Form.test.js.snap
@@ -4040,7 +4040,7 @@ exports[`Extended Field should render correctly 1`] = `
         "isStatic": false,
         "rules": Array [
           "
-  margin: .75rem 0;
+  margin: 0.75rem 0;
 
   ",
           [Function],
@@ -4082,7 +4082,7 @@ exports[`Field should render correctly 1`] = `
         "isStatic": false,
         "rules": Array [
           "
-  margin: .75rem 0;
+  margin: 0.75rem 0;
 
   ",
           [Function],
@@ -4102,7 +4102,11 @@ exports[`Field should render correctly 1`] = `
   }
   forwardedRef={null}
   inline={false}
-/>
+>
+  <p>
+    child
+  </p>
+</StyledComponent>
 `;
 
 exports[`FieldRow styles should be consistent 1`] = `
diff --git a/src/user/UpdateUserForm.jsx b/src/user/UpdateUserForm.jsx
index 393f9e0..2212d54 100644
--- a/src/user/UpdateUserForm.jsx
+++ b/src/user/UpdateUserForm.jsx
@@ -130,11 +130,11 @@ UpdateUserForm.propTypes = {
   handleSubmit: PropTypes.func.isRequired,
   handleReset: PropTypes.func.isRequired,
   submitting: PropTypes.bool.isRequired,
-  error: PropTypes.bool,
+  error: PropTypes.string,
 };
 
 UpdateUserForm.defaultProps = {
-  error: false,
+  error: null,
 };
 
 const EnhancedUpdateUserForm = formikEnhancer(UpdateUserForm);
diff --git a/src/user/__tests__/UpdateUserForm.test.js b/src/user/__tests__/UpdateUserForm.test.js
index 9a8d57e..0901845 100644
--- a/src/user/__tests__/UpdateUserForm.test.js
+++ b/src/user/__tests__/UpdateUserForm.test.js
@@ -43,7 +43,7 @@ describe('Register form test suite', () => {
         errors: inputFields.reduce(
           (prev, cur) => ({
             ...prev,
-            [cur]: true,
+            [cur]: `Error: ${cur}`,
           }),
           {},
         ),