scratchfoundation/scratch-www
1
0
Fork 0
mirror of https://github.com/scratchfoundation/scratch-www.git synced 2025-03-25 20:29:45 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions4

switch validation error message to just ‘Required’

Browse source
This commit is contained in:
Ben Wheeler 2019-08-11 16:13:07 -04:00
parent 4fa85e5c3b
commit ca6711e860
4 changed files with 8 additions and 8 deletions

2
src/components/join-flow/birthdate-step.jsx
View file

@ -53,7 +53,7 @@ class BirthDateStep extends React.Component {
}
validateSelect (selection) {
if (selection === 'null') {
return this.props.intl.formatMessage({id: 'form.validationRequired'});
return this.props.intl.formatMessage({id: 'general.required'});
}
return null;
}

2
src/components/join-flow/country-step.jsx
View file

@ -36,7 +36,7 @@ class CountryStep extends React.Component {
}
validateSelect (selection) {
if (selection === 'null') {
return this.props.intl.formatMessage({id: 'form.validationRequired'});
return this.props.intl.formatMessage({id: 'general.required'});
}
return null;
}

6
src/lib/validate.js
View file

@ -3,7 +3,7 @@ const api = require('./api');
module.exports.validateUsernameLocally = username => {
if (!username || username === '') {
return {valid: false, errMsgId: 'form.validationRequired'};
return {valid: false, errMsgId: 'general.required'};
} else if (username.length < 3) {
return {valid: false, errMsgId: 'form.validationUsernameMinLength'};
} else if (username.length > 20) {
@ -42,7 +42,7 @@ module.exports.validateUsernameRemotely = username => (
module.exports.validatePassword = password => {
if (!password) {
return {valid: false, errMsgId: 'form.validationRequired'};
return {valid: false, errMsgId: 'general.required'};
} else if (password.length < 6) {
return {valid: false, errMsgId: 'registration.validationPasswordLength'};
} else if (password === 'password') {
@ -53,7 +53,7 @@ module.exports.validatePassword = password => {
module.exports.validatePasswordConfirm = (password, passwordConfirm) => {
if (!passwordConfirm) {
return {valid: false, errMsgId: 'form.validationRequired'};
return {valid: false, errMsgId: 'general.required'};
} else if (password !== passwordConfirm) {
// TODO: add a new string for this case
return {valid: false, errMsgId: 'general.error'};

6
test/unit/lib/validate.test.js
View file

@ -11,7 +11,7 @@ describe('unit test lib/validate.js', () => {
response = validate.validateUsernameLocally('abc-def-ghi');
expect(response).toEqual({valid: true});
response = validate.validateUsernameLocally('');
expect(response).toEqual({valid: false, errMsgId: 'form.validationRequired'});
expect(response).toEqual({valid: false, errMsgId: 'general.required'});
response = validate.validateUsernameLocally('ab');
expect(response).toEqual({valid: false, errMsgId: 'form.validationUsernameMinLength'});
response = validate.validateUsernameLocally('abcdefghijklmnopqrstu');
@ -34,7 +34,7 @@ describe('unit test lib/validate.js', () => {
response = validate.validatePassword('passwo');
expect(response).toEqual({valid: true});
response = validate.validatePassword('');
expect(response).toEqual({valid: false, errMsgId: 'form.validationRequired'});
expect(response).toEqual({valid: false, errMsgId: 'general.required'});
response = validate.validatePassword('abcde');
expect(response).toEqual({valid: false, errMsgId: 'registration.validationPasswordLength'});
response = validate.validatePassword('password');
@ -51,7 +51,7 @@ describe('unit test lib/validate.js', () => {
response = validate.validatePasswordConfirm('passwo', 'passwo');
expect(response).toEqual({valid: true});
response = validate.validatePasswordConfirm('', '');
expect(response).toEqual({valid: false, errMsgId: 'form.validationRequired'});
expect(response).toEqual({valid: false, errMsgId: 'general.required'});
response = validate.validatePasswordConfirm('abcdef', 'abcdefg');
expect(response).toEqual({valid: false, errMsgId: 'general.error'});
response = validate.validatePasswordConfirm('abcdef', '123456');