Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

LINK-1530 | Improve phone number validation #65

Merged
merged 1 commit into from
Sep 8, 2023
Merged

LINK-1530 | Improve phone number validation #65

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
40 changes: 39 additions & 1 deletion src/utils/__tests__/validationUtils.test.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import { getErrorText } from '../validationUtils';
import { getErrorText, isValidPhoneNumber } from '../validationUtils';

describe('getErrorText', () => {
it('should return error text', () => {
Expand All @@ -13,3 +13,41 @@ describe('getErrorText', () => {
expect(t).toBeCalledWith(error.key, error);
});
});

describe('isValidPhoneNumber function', () => {
const validCases: string[][] = [
['0441234567'],
['044 1234 567'],
['044 123 4567'],
['044 1234567'],
['+358441234567'],
['+358 44 123 4567'],
['+358 44 1234 567'],
['+358 441234567'],
];
test.each(validCases)(
'should return true value if phone number is valid, %p',
async (phoneNumber) => {
expect(isValidPhoneNumber(phoneNumber)).toBe(true);
}
);

const invalidCases: string[][] = [
['044 1234 56x'],
['044 123x 567'],
['04x 1234 567'],
['044 1234 567'],
['044 123 4567'],
['044 1234567'],
['+358 44 123 4567'],
['+358 44 123 4567'],
['+358 44 1234 567'],
['+358 441234567'],
];
test.each(invalidCases)(
'should return false value if phone number is invalid, %p',
async (phoneNumber) => {
expect(isValidPhoneNumber(phoneNumber)).toBe(false);
}
);
});
2 changes: 1 addition & 1 deletion src/utils/validationUtils.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ export const createMinErrorMessage = (
};

export const isValidPhoneNumber = (phone: string): boolean =>
/^\+?\(?\d{1,3}\)? ?-?\d{1,3} ?-?\d{3,5} ?-?\d{4}( ?-?\d{3})?/.test(phone);
/^\+?\(?\d{1,3}\)? ?-?\d{1,3} ?-?\d{3,5} ?-?\d{3,4}( ?-?\d{3})?/.test(phone);

export const isValidZip = (zip: string): boolean => /^\d{5}$/.test(zip);

Expand Down