Fix state fields to be required, clean up tests

ustaxes · Jan 2, 2022 · 7ed8b06 · 7ed8b06
1 parent 8e1fa8d
commit 7ed8b06
Show file tree

Hide file tree

Showing 2 changed files with 27 additions and 21 deletions.
diff --git a/src/components/income/W2JobInfo.tsx b/src/components/income/W2JobInfo.tsx
@@ -70,8 +70,8 @@ const toIncomeW2 = (formData: IncomeW2UserInput): IncomeW2 => ({
   ssWithholding: parseFormNumberOrThrow(formData.ssWithholding),
   medicareWithholding: parseFormNumberOrThrow(formData.medicareWithholding),
   state: formData.state,
-  stateWages: parseFormNumber(formData.stateWages),
-  stateWithholding: parseFormNumber(formData.stateWithholding)
+  stateWages: parseFormNumberOrThrow(formData.stateWages),
+  stateWithholding: parseFormNumberOrThrow(formData.stateWithholding)
 })
 
 const toIncomeW2UserInput = (data: IncomeW2): IncomeW2UserInput => ({
@@ -199,14 +199,14 @@ export default function W2JobInfo(): ReactElement {
           name="stateWages"
           label={boxLabel('16', 'State wages, tips, etc')}
           patternConfig={Patterns.currency}
-          required={false}
+          required={true}
           sizes={{ xs: 12, lg: 6 }}
         />
         <LabeledInput
           name="stateWithholding"
           label={boxLabel('17', 'State income tax')}
           patternConfig={Patterns.currency}
-          required={false}
+          required={true}
           sizes={{ xs: 12, lg: 6 }}
         />
         <GenericLabeledDropdown

diff --git a/src/tests/components/income/W2JobInfo.test.tsx b/src/tests/components/income/W2JobInfo.test.tsx
@@ -80,6 +80,24 @@ const testInfo: Information = {
   stateResidencies: [{ state: 'AL' }]
 }
 
+const errors = {
+  inputRequired: () => screen.queryAllByText('Input is required'),
+  selectionRequired: () => screen.queryAllByText('Make a selection'),
+  inputWordFormat: () =>
+    screen.queryAllByText('Input should only include letters and spaces'),
+  einFormat: () =>
+    screen.queryAllByText('Input should be filled with 9 digits'),
+  all: () => {
+    // just a moment
+  }
+}
+errors.all = () => [
+  ...errors.inputRequired(),
+  ...errors.selectionRequired(),
+  ...errors.inputWordFormat(),
+  ...errors.einFormat()
+]
+
 describe('W2JobInfo', () => {
   afterEach(async () => {
     await waitFor(() => localStorage.clear())
@@ -142,8 +160,8 @@ describe('W2JobInfo', () => {
       clickButton('Save')
 
       await waitFor(() => {
-        expect(screen.getAllByText('Input is required')).toHaveLength(8)
-        expect(screen.getAllByText('Make a selection')).toHaveLength(2)
+        expect(errors.inputRequired()).toHaveLength(10)
+        expect(errors.selectionRequired()).toHaveLength(2)
       })
     })
 
@@ -154,11 +172,7 @@ describe('W2JobInfo', () => {
       changeByLabelText('Employer name', '123')
       clickButton('Save')
 
-      await waitFor(() =>
-        expect(
-          screen.getByText('Input should only include letters and spaces')
-        ).toBeInTheDocument()
-      )
+      await waitFor(() => expect(errors.inputWordFormat()).toHaveLength(1))
     })
 
     it('Employers Identification Number', async () => {
@@ -168,11 +182,7 @@ describe('W2JobInfo', () => {
       changeByLabelText(/Employer's Identification Number/, '123')
       clickButton('Save')
 
-      await waitFor(() =>
-        expect(
-          screen.getByText('Input should be filled with 9 digits')
-        ).toBeInTheDocument()
-      )
+      await waitFor(() => expect(errors.einFormat()).toHaveLength(1))
     })
 
     it('Occupation', async () => {
@@ -182,11 +192,7 @@ describe('W2JobInfo', () => {
       changeByLabelText('Occupation', '123')
       clickButton('Save')
 
-      await waitFor(() =>
-        expect(
-          screen.getByText('Input should only include letters and spaces')
-        ).toBeInTheDocument()
-      )
+      await waitFor(() => expect(errors.inputWordFormat()).toHaveLength(1))
     })
   })