test: update tests tckt-363

GSA-TTS · Nov 13, 2024 · 01d4038 · 01d4038
1 parent a89b9df
commit 01d4038
Show file tree

Hide file tree

Showing 3 changed files with 28 additions and 10 deletions.
diff --git a/packages/design/src/FormManager/FormEdit/components/common/PatternEditForm.tsx b/packages/design/src/FormManager/FormEdit/components/common/PatternEditForm.tsx
@@ -71,15 +71,15 @@ export const PatternEditForm = ({
 };
 
 const formErrorToReactHookFormError = (error: FormError): ErrorOption => {
-  if (error.type === 'required') {
+  if (error?.type === 'required') {
     return {
       type: 'required',
-      message: error.message,
+      message: error?.message,
     };
   } else {
     return {
       type: 'custom',
-      message: error.message,
+      message: error?.message,
     };
   }
 };
diff --git a/packages/forms/src/patterns/phone-number/phone-number.test.ts b/packages/forms/src/patterns/phone-number/phone-number.test.ts
@@ -18,7 +18,11 @@ describe('PhoneNumberPattern tests', () => {
       const invalidInput = '123456abc';
 
       expect(schema.safeParse(validInput).success).toBe(true);
-      expect(schema.safeParse(invalidInput).success).toBe(false);
+      const invalidResult = schema.safeParse(invalidInput);
+      expect(invalidResult.success).toBe(false);
+      expect(invalidResult.error?.issues[0].message).toBe(
+        'Phone number may only contain digits, spaces, parentheses, hyphens, and periods.'
+      );
     });
 
     it('should create schema for optional phone input', () => {
@@ -30,9 +34,16 @@ describe('PhoneNumberPattern tests', () => {
       const schema = createPhoneSchema(data);
       const validInput = '+12223334444';
       const emptyInput = '';
+      const invalidInput = '123456abc';
 
       expect(schema.safeParse(validInput).success).toBe(true);
       expect(schema.safeParse(emptyInput).success).toBe(true);
+
+      const invalidResult = schema.safeParse(invalidInput);
+      expect(invalidResult.success).toBe(false);
+      expect(invalidResult.error?.issues[0].message).toBe(
+        'Phone number may only contain digits, spaces, parentheses, hyphens, and periods.'
+      );
     });
 
     it('should fail with less than 10 digits', () => {
@@ -44,7 +55,11 @@ describe('PhoneNumberPattern tests', () => {
       const schema = createPhoneSchema(data);
       const shortInput = '123456789';
 
-      expect(schema.safeParse(shortInput).success).toBe(false);
+      const shortInputResult = schema.safeParse(shortInput);
+      expect(shortInputResult.success).toBe(false);
+      expect(shortInputResult.error?.issues[0].message).toBe(
+        'Phone number must contain at least 10 digits'
+      );
     });
   });
 
@@ -88,6 +103,9 @@ describe('PhoneNumberPattern tests', () => {
       const result = phoneNumberConfig.parseUserInput(pattern, invalidInput);
       if (!result.success) {
         expect(result.error).toBeDefined();
+        expect(result.error?.message).toContain(
+          'Phone number may only contain digits, spaces, parentheses, hyphens, and periods.'
+        );
       } else {
         expect.fail('Unexpected validation success');
       }

diff --git a/packages/forms/src/patterns/select-dropdown/select-dropdown.test.ts b/packages/forms/src/patterns/select-dropdown/select-dropdown.test.ts
@@ -79,7 +79,7 @@ describe('SelectDropdownPattern tests', () => {
       if (result.success) {
         expect(result.data).toBe('value1');
       } else {
-        throw new Error('Unexpected validation failure');
+        expect.fail('Unexpected validation failure');
       }
     });
 
@@ -105,11 +105,11 @@ describe('SelectDropdownPattern tests', () => {
       console.log('Test parse result (error case):', result);
       if (!result.success) {
         expect(result.error).toBeDefined();
-        expect(result.error.message).toBe(
+        expect(result.error?.message).toBe(
           "Invalid enum value. Expected 'value1' | 'value2', received 'invalid'"
         );
       } else {
-        throw new Error('Unexpected validation success');
+        expect.fail('Unexpected validation success');
       }
     });
 
@@ -132,7 +132,7 @@ describe('SelectDropdownPattern tests', () => {
         expect(result.data.required).toBe(true);
         expect(result.data.options.length).toBe(2);
       } else {
-        throw new Error('Unexpected validation failure');
+        expect.fail('Unexpected validation failure');
       }
     });
 
@@ -150,7 +150,7 @@ describe('SelectDropdownPattern tests', () => {
       if (!result.success) {
         expect(result.error).toBeDefined();
       } else {
-        throw new Error('Unexpected validation success');
+        expect.fail('Unexpected validation success');
       }
     });
   });