diff --git a/src/register/RegistrationFields/NameField/NameField.test.jsx b/src/register/RegistrationFields/NameField/NameField.test.jsx
index 986e5f6b..eb527544 100644
--- a/src/register/RegistrationFields/NameField/NameField.test.jsx
+++ b/src/register/RegistrationFields/NameField/NameField.test.jsx
@@ -67,43 +67,43 @@ describe('NameField', () => {
describe('Test Name Field', () => {
it('should run first name field validation when onBlur is fired', () => {
- props.name = 'firstname';
+ props.name = 'firstName';
const { container } = render(routerWrapper(reduxWrapper()));
- const firstNameInput = container.querySelector('input#firstname');
- fireEvent.blur(firstNameInput, { target: { value: '', name: 'firstname' } });
+ const firstNameInput = container.querySelector('input#firstName');
+ fireEvent.blur(firstNameInput, { target: { value: '', name: 'firstName' } });
expect(props.handleErrorChange).toHaveBeenCalledTimes(1);
expect(props.handleErrorChange).toHaveBeenCalledWith(
- 'firstname',
+ 'firstName',
'Enter your first name',
);
});
it('should update first name field error for frontend validations', () => {
- props.name = 'firstname';
+ props.name = 'firstName';
const { container } = render(routerWrapper(reduxWrapper()));
- const firstNameInput = container.querySelector('input#firstname');
- fireEvent.blur(firstNameInput, { target: { value: 'https://invalid-name.com', name: 'firstname' } });
+ const firstNameInput = container.querySelector('input#firstName');
+ fireEvent.blur(firstNameInput, { target: { value: 'https://invalid-name.com', name: 'firstName' } });
expect(props.handleErrorChange).toHaveBeenCalledTimes(1);
expect(props.handleErrorChange).toHaveBeenCalledWith(
- 'firstname',
+ 'firstName',
'Enter a valid first name',
);
});
it('should clear first name error on focus', () => {
- props.name = 'firstname';
+ props.name = 'firstName';
const { container } = render(routerWrapper(reduxWrapper()));
- const firstNameInput = container.querySelector('input#firstname');
- fireEvent.focus(firstNameInput, { target: { value: '', name: 'firstname' } });
+ const firstNameInput = container.querySelector('input#firstName');
+ fireEvent.focus(firstNameInput, { target: { value: '', name: 'firstName' } });
expect(props.handleErrorChange).toHaveBeenCalledTimes(1);
expect(props.handleErrorChange).toHaveBeenCalledWith(
- 'firstname',
+ 'firstName',
'',
);
});
@@ -115,12 +115,12 @@ describe('NameField', () => {
shouldFetchUsernameSuggestions: true,
fullName: 'test test',
};
- props.name = 'lastname';
+ props.name = 'lastName';
const { container } = render(routerWrapper(reduxWrapper()));
- const lastNameInput = container.querySelector('input#lastname');
+ const lastNameInput = container.querySelector('input#lastName');
// Enter a valid name so that frontend validations are passed
- fireEvent.blur(lastNameInput, { target: { value: 'test', name: 'lastname' } });
+ fireEvent.blur(lastNameInput, { target: { value: 'test', name: 'lastName' } });
expect(store.dispatch).toHaveBeenCalledWith(fetchRealtimeValidations({ name: props.fullName }));
});
@@ -137,41 +137,41 @@ describe('NameField', () => {
},
});
- props.name = 'lastname';
+ props.name = 'lastName';
store.dispatch = jest.fn(store.dispatch);
const { container } = render(routerWrapper(reduxWrapper()));
- const lastNameInput = container.querySelector('input#lastname');
+ const lastNameInput = container.querySelector('input#lastName');
- fireEvent.focus(lastNameInput, { target: { value: 'test', name: 'lastname' } });
+ fireEvent.focus(lastNameInput, { target: { value: 'test', name: 'lastName' } });
- expect(store.dispatch).toHaveBeenCalledWith(clearRegistrationBackendError('lastname'));
+ expect(store.dispatch).toHaveBeenCalledWith(clearRegistrationBackendError('lastName'));
});
it('should run last name field validation when onBlur is fired', () => {
- props.name = 'lastname';
+ props.name = 'lastName';
const { container } = render(routerWrapper(reduxWrapper()));
- const lastNameInput = container.querySelector('input#lastname');
- fireEvent.blur(lastNameInput, { target: { value: '', name: 'lastname' } });
+ const lastNameInput = container.querySelector('input#lastName');
+ fireEvent.blur(lastNameInput, { target: { value: '', name: 'lastName' } });
expect(props.handleErrorChange).toHaveBeenCalledTimes(1);
expect(props.handleErrorChange).toHaveBeenCalledWith(
- 'lastname',
+ 'lastName',
'Enter your last name',
);
});
it('should update last name field error for frontend validation', () => {
- props.name = 'lastname';
+ props.name = 'lastName';
const { container } = render(routerWrapper(reduxWrapper()));
- const lastNameInput = container.querySelector('input#lastname');
- fireEvent.blur(lastNameInput, { target: { value: 'https://invalid-name.com', name: 'lastname' } });
+ const lastNameInput = container.querySelector('input#lastName');
+ fireEvent.blur(lastNameInput, { target: { value: 'https://invalid-name.com', name: 'lastName' } });
expect(props.handleErrorChange).toHaveBeenCalledTimes(1);
expect(props.handleErrorChange).toHaveBeenCalledWith(
- 'lastname',
+ 'lastName',
'Enter a valid last name',
);
});
diff --git a/src/register/RegistrationFields/NameField/validator.js b/src/register/RegistrationFields/NameField/validator.js
index 922ae1c9..36036bf9 100644
--- a/src/register/RegistrationFields/NameField/validator.js
+++ b/src/register/RegistrationFields/NameField/validator.js
@@ -12,13 +12,13 @@ export const INVALID_NAME_REGEX = /https?:\/\/(?:[-\w.]|(?:%[\da-fA-F]{2}))*/g;
const validateName = (value, fieldName, formatMessage) => {
let fieldError;
if (!value.trim()) {
- fieldError = fieldName === 'lastname'
- ? formatMessage(messages['empty.lastname.field.error'])
- : formatMessage(messages['empty.firstname.field.error']);
+ fieldError = fieldName === 'lastName'
+ ? formatMessage(messages['empty.lastName.field.error'])
+ : formatMessage(messages['empty.firstName.field.error']);
} else if (URL_REGEX.test(value) || HTML_REGEX.test(value) || INVALID_NAME_REGEX.test(value)) {
- fieldError = fieldName === 'lastname'
- ? formatMessage(messages['lastname.validation.message'])
- : formatMessage(messages['firstname.validation.message']);
+ fieldError = fieldName === 'lastName'
+ ? formatMessage(messages['lastName.validation.message'])
+ : formatMessage(messages['firstName.validation.message']);
}
return fieldError;
};
diff --git a/src/register/RegistrationPage.jsx b/src/register/RegistrationPage.jsx
index 1584be98..c5e616cd 100644
--- a/src/register/RegistrationPage.jsx
+++ b/src/register/RegistrationPage.jsx
@@ -120,10 +120,10 @@ const RegistrationPage = (props) => {
}
if (pipelineUserDetails && Object.keys(pipelineUserDetails).length !== 0) {
const {
- firstname = '', lastname = '', username = '', email = '',
+ firstName = '', lastName = '', username = '', email = '',
} = pipelineUserDetails;
setFormFields(prevState => ({
- ...prevState, firstname, lastname, username, email,
+ ...prevState, firstName, lastName, username, email,
}));
dispatch(setUserPipelineDataLoaded(true));
}
@@ -312,22 +312,22 @@ const RegistrationPage = (props) => {
/>