Merge branch 'develop' into ee-review-prototype

DTS-STN · Jan 25, 2022 · adb171b · adb171b
2 parents aa78728 + 81eb62c
commit adb171b
Show file tree

Hide file tree

Showing 4 changed files with 5 additions and 4 deletions.
diff --git a/__tests__/components/TextField.test.tsx b/__tests__/components/TextField.test.tsx
@@ -35,7 +35,7 @@ describe('TextField component', () => {
 
     const field = screen.getByTestId('text-input')
     expect(field).toBeInTheDocument()
-    expect(field.tagName).toBe('TEXTAREA')
+    expect(field.tagName).toBe('INPUT')
     expect(field).toBeDefined()
     expect(field).toBeRequired()
   })
@@ -69,7 +69,7 @@ describe('TextField component', () => {
 
     const field = screen.getByTestId('text-input')
     expect(field).toBeInTheDocument()
-    expect(field.tagName).toBe('TEXTAREA')
+    expect(field.tagName).toBe('INPUT')
     expect(field).toBeDefined()
     expect(field).toBeRequired()
 

diff --git a/client-state/models/FormField.ts b/client-state/models/FormField.ts
@@ -64,6 +64,6 @@ export const FormField = types
     handleChange: flow(function* (e) {
       const inputVal = e?.target?.value ?? { key: e.value, text: e.label }
       self.setValue(inputVal)
-      yield (getParent(self, 2) as Instance<typeof Form>).sendAPIRequest()
+      yield (getParent(self, 2) as Instance<typeof Form>).sendAPIRequest() // the form field is 2 children from the form e.g. Form -> fields Object -> current form field instance
     }),
   }))
diff --git a/components/Forms/NumberField.tsx b/components/Forms/NumberField.tsx
@@ -52,7 +52,7 @@ export const NumberField: React.VFC<NumberFieldProps> = observer((props) => {
         id={name}
         name={name}
         className={`form-control text-content ${error ? ' border-danger' : ''}`}
-        data-testid={name}
+        data-testid="number-input"
         min={0}
         value={value != null ? (value as string) : ''}
         placeholder={placeholder}

diff --git a/components/Forms/TextField.tsx b/components/Forms/TextField.tsx
@@ -46,6 +46,7 @@ export const TextField: React.VFC<TextFieldProps> = observer((props) => {
       {error && <ErrorLabel errorMessage={error} />}
       <input
         type="text"
+        data-testid="text-input"
         className={`form-control text-content ${error ? ' border-danger' : ''}`}
         placeholder={placeholder}
         onChange={onChange}