From e0e79b5cf5850fa5b37bc317344571c8725c3d4d Mon Sep 17 00:00:00 2001 From: Zainab Amir Date: Mon, 22 Feb 2021 17:19:57 +0500 Subject: [PATCH] VAN-393: use sentence case for text (#150) --- src/common-components/messages.jsx | 2 +- .../tests/ConfirmationAlert.test.jsx | 2 +- src/forgot-password/messages.js | 2 +- .../tests/ForgotPasswordPage.test.jsx | 4 +-- src/login/messages.jsx | 21 +++++-------- src/login/tests/LoginFailure.test.jsx | 8 ++--- src/login/tests/LoginPage.test.jsx | 4 +-- .../__snapshots__/LoginPage.test.jsx.snap | 22 +++++++------- src/register/messages.jsx | 22 +++++++------- src/register/tests/RegistrationPage.test.jsx | 26 ++++++++-------- .../RegistrationPage.test.jsx.snap | 30 +++++++++---------- src/reset-password/messages.js | 14 ++++----- .../tests/ResetPasswordPage.test.jsx | 2 +- .../ResetPasswordPage.test.jsx.snap | 18 +++++------ 14 files changed, 86 insertions(+), 91 deletions(-) diff --git a/src/common-components/messages.jsx b/src/common-components/messages.jsx index b8970c8f..ffebfbf3 100644 --- a/src/common-components/messages.jsx +++ b/src/common-components/messages.jsx @@ -9,7 +9,7 @@ const messages = defineMessages({ // Confirmation Alert Message 'forgot.password.confirmation.title': { id: 'forgot.password.confirmation.title', - defaultMessage: 'Check Your Email', + defaultMessage: 'Check your email', description: 'Forgot password confirmation message title', }, 'forgot.password.confirmation.support.link': { diff --git a/src/common-components/tests/ConfirmationAlert.test.jsx b/src/common-components/tests/ConfirmationAlert.test.jsx index abbedc48..b80f1dbb 100644 --- a/src/common-components/tests/ConfirmationAlert.test.jsx +++ b/src/common-components/tests/ConfirmationAlert.test.jsx @@ -21,7 +21,7 @@ describe('ConfirmationAlert', () => { , ); - const expectedMessage = 'Check Your Email' + const expectedMessage = 'Check your email' + 'You entered test@example.com. If this email address is associated with your edX account, ' + 'we will send a message with password recovery instructions to this email address.' + 'If you do not receive a password reset message after 1 minute, verify that you entered ' diff --git a/src/forgot-password/messages.js b/src/forgot-password/messages.js index 07d88bc7..649b5ed3 100644 --- a/src/forgot-password/messages.js +++ b/src/forgot-password/messages.js @@ -43,7 +43,7 @@ const messages = defineMessages({ }, 'forgot.password.empty.email.field.error': { id: 'forgot.password.empty.email.field.error', - defaultMessage: 'Please enter your Email.', + defaultMessage: 'Please enter your email.', description: 'Error message that appears when user tries to submit empty email field', }, 'forgot.password.invalid.email.heading': { diff --git a/src/forgot-password/tests/ForgotPasswordPage.test.jsx b/src/forgot-password/tests/ForgotPasswordPage.test.jsx index fa9e3583..8a98ec29 100644 --- a/src/forgot-password/tests/ForgotPasswordPage.test.jsx +++ b/src/forgot-password/tests/ForgotPasswordPage.test.jsx @@ -111,7 +111,7 @@ describe('ForgotPasswordPage', () => { }); it('should display empty email validation message', async () => { - const validationMessage = 'Failed to send forgot password email.Please enter your Email.'; + const validationMessage = 'Failed to send forgot password email.Please enter your email.'; const forgotPasswordPage = mount(reduxWrapper()); await act(async () => { await forgotPasswordPage.find('button.btn-primary').simulate('click'); }); @@ -141,7 +141,7 @@ describe('ForgotPasswordPage', () => { }); it('should display error message on blur event', async () => { - const validationMessage = 'Please enter your Email.'; + const validationMessage = 'Please enter your email.'; const forgotPasswordPage = mount(reduxWrapper()); const emailInput = forgotPasswordPage.find('input#forgot-password-input'); diff --git a/src/login/messages.jsx b/src/login/messages.jsx index 834dfe41..d2cac667 100644 --- a/src/login/messages.jsx +++ b/src/login/messages.jsx @@ -18,7 +18,7 @@ const messages = defineMessages({ }, 'other.sign.in.issues': { id: 'other.sign.in.issues', - defaultMessage: 'Other sign-in issues', + defaultMessage: 'Other sign in issues', description: 'A link that redirects to sign-in issues help', }, 'need.other.help.signing.in.collapsible.menu': { @@ -48,14 +48,9 @@ const messages = defineMessages({ }, 'create.an.account': { id: 'create.an.account', - defaultMessage: 'Create an Account', + defaultMessage: 'Create an account', description: 'Message on button to return to register page', }, - 'institution.login.sign.in': { - id: 'institution.login.sign.in', - defaultMessage: 'Sign In', - description: 'Sign In text', - }, 'or.sign.in.with': { id: 'or.sign.in.with', defaultMessage: 'or sign in with', @@ -98,12 +93,12 @@ const messages = defineMessages({ }, 'email.validation.message': { id: 'email.validation.message', - defaultMessage: 'Please enter your Email.', + defaultMessage: 'Please enter your email.', description: 'Validation message that appears when email is empty', }, 'password.validation.message': { id: 'password.validation.message', - defaultMessage: 'Please enter your Password.', + defaultMessage: 'Please enter your password.', description: 'Validation message that appears when password is empty', }, 'password.label': { @@ -118,8 +113,8 @@ const messages = defineMessages({ }, 'sign.in.heading': { id: 'sign.in.heading', - defaultMessage: 'Sign In', - description: 'Sign In text', + defaultMessage: 'Sign in', + description: 'Sign in text', }, // Account Activation Strings 'account.activation.success.message.title': { @@ -149,7 +144,7 @@ const messages = defineMessages({ }, 'internal.server.error.message': { id: 'internal.server.error.message', - defaultMessage: 'An error has occurred. Try refreshing the page, or check your Internet connection.', + defaultMessage: 'An error has occurred. Try refreshing the page, or check your internet connection.', description: 'Error message that appears when server responds with 500 error code', }, 'login.rate.limit.reached.message': { @@ -164,7 +159,7 @@ const messages = defineMessages({ }, 'contact.support.link': { id: 'contact.support.link', - defaultMessage: 'contact {platformName} Support', + defaultMessage: 'contact {platformName} support', description: 'Link text used in inactive user error message to go to learner help center', }, 'login.failed.link.text': { diff --git a/src/login/tests/LoginFailure.test.jsx b/src/login/tests/LoginFailure.test.jsx index 33ce54b4..fc406320 100644 --- a/src/login/tests/LoginFailure.test.jsx +++ b/src/login/tests/LoginFailure.test.jsx @@ -58,7 +58,7 @@ describe('LoginFailureMessage', () => { const expectedMessage = 'We couldn\'t sign you in.In order to sign in, you need to activate your account. ' + 'We just sent an activation link to text@example.com. If you do not receive an email, ' - + 'check your spam folders or contact openedX Support.'; + + 'check your spam folders or contact openedX support.'; expect(loginFailureMessage.find('#login-failure-alert').first().text()).toEqual(expectedMessage); expect(loginFailureMessage.find('#login-failure-alert').find('a').props().href).toEqual('https://support.edx.org/'); @@ -94,7 +94,7 @@ describe('LoginFailureMessage', () => { , ); - const expectedMessage = 'We couldn\'t sign you in.An error has occurred. Try refreshing the page, or check your Internet connection.'; + const expectedMessage = 'We couldn\'t sign you in.An error has occurred. Try refreshing the page, or check your internet connection.'; expect(loginFailureMessage.find('#login-failure-alert').first().text()).toEqual(expectedMessage); }); @@ -102,7 +102,7 @@ describe('LoginFailureMessage', () => { props = { loginError: { errorCode: INVALID_FORM, - context: { email: 'Please enter your Email.', password: 'Please enter your Password.' }, + context: { email: 'Please enter your email.', password: 'Please enter your password.' }, }, }; @@ -112,7 +112,7 @@ describe('LoginFailureMessage', () => { , ); - const expectedMessage = 'We couldn\'t sign you in.Please enter your Email.Please enter your Password.'; + const expectedMessage = 'We couldn\'t sign you in.Please enter your email.Please enter your password.'; expect(loginFailureMessage.find('#login-failure-alert').first().text()).toEqual(expectedMessage); }); diff --git a/src/login/tests/LoginPage.test.jsx b/src/login/tests/LoginPage.test.jsx index 69b68b63..6a892a77 100644 --- a/src/login/tests/LoginPage.test.jsx +++ b/src/login/tests/LoginPage.test.jsx @@ -147,7 +147,7 @@ describe('LoginPage', () => { }); it('updates the error state for empty email input on form submission', () => { - const errorState = { email: 'Please enter your Email.', password: '' }; + const errorState = { email: 'Please enter your email.', password: '' }; store.dispatch = jest.fn(store.dispatch); const loginPage = (mount(reduxWrapper())).find('LoginPage'); @@ -191,7 +191,7 @@ describe('LoginPage', () => { }); it('updates the error state for invalid password', () => { - const errorState = { email: '', password: 'Please enter your Password.' }; + const errorState = { email: '', password: 'Please enter your password.' }; store.dispatch = jest.fn(store.dispatch); const loginPage = (mount(reduxWrapper())).find('LoginPage'); diff --git a/src/login/tests/__snapshots__/LoginPage.test.jsx.snap b/src/login/tests/__snapshots__/LoginPage.test.jsx.snap index dbbc32d5..cc11790b 100644 --- a/src/login/tests/__snapshots__/LoginPage.test.jsx.snap +++ b/src/login/tests/__snapshots__/LoginPage.test.jsx.snap @@ -18,7 +18,7 @@ exports[`LoginPage should match TPA provider snapshot 1`] = ` onClick={[Function]} target="_self" > - Create an Account + Create an account .

@@ -28,7 +28,7 @@ exports[`LoginPage should match TPA provider snapshot 1`] = `

- Sign In + Sign in

- Create an Account + Create an account .

@@ -206,7 +206,7 @@ exports[`LoginPage should match default section snapshot 1`] = `

- Sign In + Sign in

- Check Your Email + Check your email

@@ -376,7 +376,7 @@ exports[`LoginPage should match forget password alert message snapshot 1`] = ` onClick={[Function]} target="_self" > - Create an Account + Create an account .

@@ -386,7 +386,7 @@ exports[`LoginPage should match forget password alert message snapshot 1`] = `

- Sign In + Sign in

- Create an Account + Create an account .

@@ -528,7 +528,7 @@ exports[`LoginPage should match pending button state snapshot 1`] = `

- Sign In + Sign in

- Create an Account + Create an account .

@@ -707,7 +707,7 @@ exports[`LoginPage should show error message 1`] = `

- Sign In + Sign in

{ }; const emptyFieldValidation = { - name: 'Please enter your Full Name.', - username: 'Please enter your Public Username.', - email: 'Please enter your Email.', - password: 'Please enter your Password.', + name: 'Please enter your full name.', + username: 'Please enter your public username.', + email: 'Please enter your email.', + password: 'Please enter your password.', country: 'Select your country or region of residence.', }; @@ -340,10 +340,10 @@ describe('RegistrationPageTests', () => { it('should display validationAlertMessages incase of invalid form submission', () => { const alertMessages = { - name: [{ user_message: 'Please enter your Full Name.' }], - username: [{ user_message: 'Please enter your Public Username.' }], - email: [{ user_message: 'Please enter your Email.' }], - password: [{ user_message: 'Please enter your Password.' }], + name: [{ user_message: 'Please enter your full name.' }], + username: [{ user_message: 'Please enter your public username.' }], + email: [{ user_message: 'Please enter your email.' }], + password: [{ user_message: 'Please enter your password.' }], country: [{ user_message: 'Select your country or region of residence.' }], }; store.dispatch = jest.fn(store.dispatch); @@ -355,10 +355,10 @@ describe('RegistrationPageTests', () => { it('should not update validationAlertMessages on blur event', () => { const alertMessages = { - name: [{ user_message: 'Please enter your Full Name.' }], - username: [{ user_message: 'Please enter your Public Username.' }], - email: [{ user_message: 'Please enter your Email.' }], - password: [{ user_message: 'Please enter your Password.' }], + name: [{ user_message: 'Please enter your full name.' }], + username: [{ user_message: 'Please enter your public username.' }], + email: [{ user_message: 'Please enter your email.' }], + password: [{ user_message: 'Please enter your password.' }], country: [{ user_message: 'Select your country or region of residence.' }], }; store.dispatch = jest.fn(store.dispatch); @@ -388,7 +388,7 @@ describe('RegistrationPageTests', () => { const registrationPage = mount(reduxWrapper()); expect(registrationPage.find('div.alert-heading').length).toEqual(1); - const expectedMessage = 'We couldn\'t create your account.An error has occurred. Try refreshing the page, or check your Internet connection.'; + const expectedMessage = 'We couldn\'t create your account.An error has occurred. Try refreshing the page, or check your internet connection.'; expect(registrationPage.find('div.alert').first().text()).toEqual(expectedMessage); }); diff --git a/src/register/tests/__snapshots__/RegistrationPage.test.jsx.snap b/src/register/tests/__snapshots__/RegistrationPage.test.jsx.snap index 329c1e96..f86727cd 100644 --- a/src/register/tests/__snapshots__/RegistrationPage.test.jsx.snap +++ b/src/register/tests/__snapshots__/RegistrationPage.test.jsx.snap @@ -45,7 +45,7 @@ exports[`RegistrationPageTests should match TPA provider snapshot 1`] = ` onChange={[Function]} onClick={[Function]} onFocus={[Function]} - placeholder="Full Name (required)" + placeholder="Full name (required)" required={true} type="text" value="" @@ -65,7 +65,7 @@ exports[`RegistrationPageTests should match TPA provider snapshot 1`] = ` onChange={[Function]} onClick={[Function]} onFocus={[Function]} - placeholder="Public Username (required)" + placeholder="Public username (required)" required={true} type="text" value="" @@ -125,14 +125,14 @@ exports[`RegistrationPageTests should match TPA provider snapshot 1`] = ` onChange={[Function]} onClick={[Function]} onFocus={[Function]} - placeholder="Country or Region of Residence (required)" + placeholder="Country or region of residence (required)" required={true} value="" >