diff --git a/src/MainApp.jsx b/src/MainApp.jsx index 75f1aac006..89188594ba 100755 --- a/src/MainApp.jsx +++ b/src/MainApp.jsx @@ -24,7 +24,7 @@ import { ForgotPasswordPage } from './forgot-password'; import Logistration from './logistration/Logistration'; import { ProgressiveProfiling } from './progressive-profiling'; import { RecommendationsPage } from './recommendations'; -import { RegistrationPage } from './register'; +import { EmbedableRegistrationForm } from './register'; import { ResetPasswordPage } from './reset-password'; import './index.scss'; @@ -44,7 +44,7 @@ const MainApp = () => ( } /> diff --git a/src/common-components/RedirectLogistration.jsx b/src/common-components/RedirectLogistration.jsx index 213cf2721c..07ca619985 100644 --- a/src/common-components/RedirectLogistration.jsx +++ b/src/common-components/RedirectLogistration.jsx @@ -5,7 +5,7 @@ import PropTypes from 'prop-types'; import { Redirect } from 'react-router-dom'; import { - AUTHN_PROGRESSIVE_PROFILING, RECOMMENDATIONS, REDIRECT, + AUTHN_PROGRESSIVE_PROFILING, RECOMMENDATIONS, } from '../data/constants'; import { setCookie } from '../data/utils'; @@ -19,8 +19,6 @@ const RedirectLogistration = (props) => { redirectToRecommendationsPage, educationLevel, userId, - registrationEmbedded, - host, } = props; let finalRedirectUrl = ''; @@ -40,13 +38,6 @@ const RedirectLogistration = (props) => { // TODO: Do we still need this cookie? setCookie('van-504-returning-user', true); - if (registrationEmbedded) { - window.parent.postMessage({ - action: REDIRECT, - redirectUrl: getConfig().POST_REGISTRATION_REDIRECT_URL, - }, host); - return null; - } const registrationResult = { redirectUrl: finalRedirectUrl, success }; return ( { + const { + backedUpFormData, + backendCountryCode, + backendValidations, + fieldDescriptions, + registrationError, + registrationErrorCode, + registrationResult, + submitState, + usernameSuggestions, + validationApiRateLimited, + // Actions + getRegistrationDataFromBackend, + validateFromBackend, + clearBackendError, + } = props; + + const { formatMessage } = useIntl(); + const countryList = useMemo(() => getCountryList(getLocale()), []); + const queryParams = useMemo(() => getAllPossibleQueryParams(), []); + const registrationEmbedded = isHostAvailableInQueryParams(); + const { cta, host } = queryParams; + const flags = { + showConfigurableEdxFields: getConfig().SHOW_CONFIGURABLE_EDX_FIELDS, + showConfigurableRegistrationFields: getConfig().ENABLE_DYNAMIC_REGISTRATION_FIELDS, + showMarketingEmailOptInCheckbox: getConfig().MARKETING_EMAILS_OPT_IN, + }; + + const [formFields, setFormFields] = useState({ ...backedUpFormData.formFields }); + const [configurableFormFields, setConfigurableFormFields] = useState({ ...backedUpFormData.configurableFormFields }); + const [errors, setErrors] = useState({ ...backedUpFormData.errors }); + const [emailSuggestion, setEmailSuggestion] = useState({ ...backedUpFormData.emailSuggestion }); + const [errorCode, setErrorCode] = useState({ type: '', count: 0 }); + const [formStartTime, setFormStartTime] = useState(null); + const [focusedField, setFocusedField] = useState(null); + + const buttonLabel = cta ? formatMessage(messages['create.account.cta.button'], { label: cta }) : formatMessage(messages['create.account.for.free.button']); + + useEffect(() => { + if (!formStartTime) { + sendPageEvent('login_and_registration', 'register'); + const payload = { ...queryParams, is_register_page: true }; + getRegistrationDataFromBackend(payload); + setFormStartTime(Date.now()); + } + }, [formStartTime, getRegistrationDataFromBackend, queryParams]); + + useEffect(() => { + if (backendValidations) { + setErrors(prevErrors => ({ ...prevErrors, ...backendValidations })); + } + }, [backendValidations]); + + useEffect(() => { + if (registrationErrorCode) { + setErrorCode(prevState => ({ type: registrationErrorCode, count: prevState.count + 1 })); + } + }, [registrationErrorCode]); + + useEffect(() => { + if (backendCountryCode && backendCountryCode !== configurableFormFields?.country?.countryCode) { + let countryCode = ''; + let countryDisplayValue = ''; + + const selectedCountry = countryList.find( + (country) => (country[COUNTRY_CODE_KEY].toLowerCase() === backendCountryCode.toLowerCase()), + ); + if (selectedCountry) { + countryCode = selectedCountry[COUNTRY_CODE_KEY]; + countryDisplayValue = selectedCountry[COUNTRY_DISPLAY_KEY]; + } + setConfigurableFormFields(prevState => ( + { + ...prevState, + country: { + countryCode, displayValue: countryDisplayValue, + }, + } + )); + } + }, [backendCountryCode, countryList]); // eslint-disable-line react-hooks/exhaustive-deps + + /** + * We need to remove the placeholder from the field, adding a space will do that. + * This is needed because we are placing the username suggestions on top of the field. + */ + useEffect(() => { + if (usernameSuggestions.length && !formFields.username) { + setFormFields(prevState => ({ ...prevState, username: ' ' })); + } + }, [usernameSuggestions, formFields]); + + useEffect(() => { + if (registrationResult.success) { + // Optimizely registration conversion event + window.optimizely = window.optimizely || []; + window.optimizely.push({ + type: 'event', + eventName: 'authn-registration-conversion', + }); + + // We probably don't need this cookie because this fires the same event as + // above for optimizely using GTM. + setCookie(getConfig().REGISTER_CONVERSION_COOKIE_NAME, true); + // This is used by the "User Retention Rate Event" on GTM + setCookie('authn-returning-user'); + + // Fire GTM event used for integration with impact.com + window.dataLayer = window.dataLayer || []; + window.dataLayer.push({ + event: 'ImpactRegistrationEvent', + }); + + window.parent.postMessage({ + action: REDIRECT, + redirectUrl: getConfig().POST_REGISTRATION_REDIRECT_URL, + }, host); + } + }, [registrationResult, host]); + + const validateInput = (fieldName, value, payload, shouldValidateFromBackend, setError = true) => { + let fieldError = ''; + let confirmEmailError = ''; // This is to handle the use case where the form contains "confirm email" field + let countryFieldCode = ''; + + switch (fieldName) { + case 'name': + if (!value.trim()) { + fieldError = formatMessage(messages['empty.name.field.error']); + } else if (value && value.match(urlRegex)) { + fieldError = formatMessage(messages['name.validation.message']); + } else if (value && !payload.username.trim() && shouldValidateFromBackend) { + validateFromBackend(payload); + } + break; + case 'email': + if (!value) { + fieldError = formatMessage(messages['empty.email.field.error']); + } else if (value.length <= 2) { + fieldError = formatMessage(messages['email.invalid.format.error']); + } else { + const [username, domainName] = value.split('@'); + // Check if email address is invalid. If we have a suggestion for invalid email + // provide that along with the error message. + if (!emailRegex.test(value)) { + fieldError = formatMessage(messages['email.invalid.format.error']); + setEmailSuggestion({ + suggestion: getSuggestionForInvalidEmail(domainName, username), + type: 'error', + }); + } else { + const response = validateEmailAddress(value, username, domainName); + if (response.hasError) { + fieldError = formatMessage(messages['email.invalid.format.error']); + delete response.hasError; + } + setEmailSuggestion({ ...response }); + + if (configurableFormFields.confirm_email && value !== configurableFormFields.confirm_email) { + confirmEmailError = formatMessage(messages['email.do.not.match']); + } + } + } + break; + case 'username': + if (!value || value.length <= 1 || value.length > 30) { + fieldError = formatMessage(messages['username.validation.message']); + } else if (!value.match(/^[a-zA-Z0-9_-]*$/i)) { + fieldError = formatMessage(messages['username.format.validation.message']); + } + break; + case 'password': + if (!value || !LETTER_REGEX.test(value) || !NUMBER_REGEX.test(value) || value.length < 8) { + fieldError = formatMessage(messages['password.validation.message']); + } + break; + case 'country': + if (flags.showConfigurableEdxFields || flags.showConfigurableRegistrationFields) { + const { + countryCode, displayValue, error, + } = validateCountryField(value.displayValue.trim(), countryList, formatMessage(messages['empty.country.field.error'])); + fieldError = error; + countryFieldCode = countryCode; + setConfigurableFormFields(prevState => ({ ...prevState, country: { countryCode, displayValue } })); + } + break; + default: + if (flags.showConfigurableRegistrationFields) { + if (!value && fieldDescriptions[fieldName]?.error_message) { + fieldError = fieldDescriptions[fieldName].error_message; + } else if (fieldName === 'confirm_email' && formFields.email && value !== formFields.email) { + fieldError = formatMessage(messages['email.do.not.match']); + } + } + break; + } + if (setError) { + setErrors(prevErrors => ({ + ...prevErrors, + confirm_email: flags.showConfigurableRegistrationFields ? confirmEmailError : '', + [fieldName]: fieldError, + })); + } + return { fieldError, countryFieldCode }; + }; + + const isFormValid = (payload, focusedFieldError) => { + const fieldErrors = { ...errors }; + let isValid = !focusedFieldError; + Object.keys(payload).forEach(key => { + if (!payload[key]) { + fieldErrors[key] = formatMessage(messages[`empty.${key}.field.error`]); + } + if (fieldErrors[key]) { + isValid = false; + } + }); + + if (flags.showConfigurableEdxFields) { + if (!configurableFormFields.country.displayValue) { + fieldErrors.country = formatMessage(messages['empty.country.field.error']); + } + if (fieldErrors.country) { + isValid = false; + } + } + + if (flags.showConfigurableRegistrationFields) { + Object.keys(fieldDescriptions).forEach(key => { + if (key === 'country' && !configurableFormFields.country.displayValue) { + fieldErrors[key] = formatMessage(messages['empty.country.field.error']); + } else if (!configurableFormFields[key]) { + fieldErrors[key] = fieldDescriptions[key].error_message; + } + if (fieldErrors[key]) { + isValid = false; + } + }); + } + + if (focusedField) { + fieldErrors[focusedField] = focusedFieldError; + } + setErrors({ ...fieldErrors }); + return isValid; + }; + + const handleSuggestionClick = (event, fieldName, suggestion = '') => { + event.preventDefault(); + setErrors(prevErrors => ({ ...prevErrors, [fieldName]: '' })); + switch (fieldName) { + case 'email': + setFormFields(prevState => ({ ...prevState, email: emailSuggestion.suggestion })); + setEmailSuggestion({ suggestion: '', type: '' }); + break; + case 'username': + setFormFields(prevState => ({ ...prevState, username: suggestion })); + props.resetUsernameSuggestions(); + break; + default: + break; + } + }; + + const handleEmailSuggestionClosed = () => setEmailSuggestion({ suggestion: '', type: '' }); + + const handleUsernameSuggestionClosed = () => props.resetUsernameSuggestions(); + + const handleOnChange = (event) => { + const { name } = event.target; + let value = event.target.type === 'checkbox' ? event.target.checked : event.target.value; + if (registrationError[name]) { + clearBackendError(name); + setErrors(prevErrors => ({ ...prevErrors, [name]: '' })); + } + if (name === 'username') { + if (value.length > 30) { + return; + } + if (value.startsWith(' ')) { + value = value.trim(); + } + } + + setFormFields(prevState => ({ ...prevState, [name]: value })); + }; + + const handleOnBlur = (event) => { + const { name, value } = event.target; + + if (name === 'name') { + validateInput( + name, + value, + { name: formFields.name, username: formFields.username, form_field_key: name }, + !validationApiRateLimited, + false, + ); + } + }; + + const handleOnFocus = (event) => { + const { name, value } = event.target; + setErrors(prevErrors => ({ ...prevErrors, [name]: '' })); + clearBackendError(name); + // Since we are removing the form errors from the focused field, we will + // need to rerun the validation for focused field on form submission. + setFocusedField(name); + + if (name === 'username') { + props.resetUsernameSuggestions(); + // If we added a space character to username field to display the suggestion + // remove it before user enters the input. This is to ensure user doesn't + // have a space prefixed to the username. + if (value === ' ') { + setFormFields(prevState => ({ ...prevState, [name]: '' })); + } + } + }; + + const registerUser = () => { + const totalRegistrationTime = (Date.now() - formStartTime) / 1000; + let payload = { ...formFields }; + + const { fieldError: focusedFieldError, countryFieldCode } = focusedField ? ( + validateInput( + focusedField, + (focusedField in fieldDescriptions || ['country', 'marketingEmailsOptIn'].includes(focusedField)) ? ( + configurableFormFields[focusedField] + ) : formFields[focusedField], + payload, + false, + false, + ) + ) : ''; + + if (!isFormValid(payload, focusedFieldError)) { + setErrorCode(prevState => ({ type: FORM_SUBMISSION_ERROR, count: prevState.count + 1 })); + return; + } + + Object.keys(configurableFormFields).forEach((fieldName) => { + if (fieldName === 'country') { + payload[fieldName] = focusedField === 'country' ? countryFieldCode : configurableFormFields[fieldName].countryCode; + } else { + payload[fieldName] = configurableFormFields[fieldName]; + } + }); + + // Don't send the marketing email opt-in value if the flag is turned off + if (!flags.showMarketingEmailOptInCheckbox) { + delete payload.marketingEmailsOptIn; + } + + payload = snakeCaseObject(payload); + payload.totalRegistrationTime = totalRegistrationTime; + + // add query params to the payload + payload = { ...payload, ...queryParams }; + props.registerNewUser(payload); + }; + + const handleSubmit = (e) => { + e.preventDefault(); + registerUser(); + }; + + return ( + <> + + {formatMessage(messages['register.page.title'], { siteName: getConfig().SITE_NAME })} + +
+ +
+ + handleSuggestionClick(e, 'email')} + handleOnClose={handleEmailSuggestionClosed} + emailSuggestion={emailSuggestion} + errorMessage={errors.email} + helpText={[formatMessage(messages['help.text.email'])]} + floatingLabel={formatMessage(messages['registration.email.label'])} + /> + + + + e.preventDefault()} + /> + +
+ + + ); +}; + +const mapStateToProps = state => { + const registerPageState = state.register; + return { + backedUpFormData: registerPageState.registrationFormData, + backendCountryCode: registerPageState.backendCountryCode, + backendValidations: validationsSelector(state), + fieldDescriptions: fieldDescriptionSelector(state), + registrationError: registerPageState.registrationError, + registrationErrorCode: registrationErrorSelector(state), + registrationResult: registerPageState.registrationResult, + submitState: registerPageState.submitState, + validationApiRateLimited: registerPageState.validationApiRateLimited, + usernameSuggestions: registerPageState.usernameSuggestions, + }; +}; + +EmbedableRegistrationForm.propTypes = { + backedUpFormData: PropTypes.shape({ + configurableFormFields: PropTypes.shape({}), + formFields: PropTypes.shape({}), + errors: PropTypes.shape({}), + emailSuggestion: PropTypes.shape({}), + }), + backendCountryCode: PropTypes.string, + backendValidations: PropTypes.shape({ + name: PropTypes.string, + email: PropTypes.string, + username: PropTypes.string, + password: PropTypes.string, + }), + fieldDescriptions: PropTypes.shape({}), + registrationError: PropTypes.shape({}), + registrationErrorCode: PropTypes.string, + registrationResult: PropTypes.shape({ + redirectUrl: PropTypes.string, + success: PropTypes.bool, + }), + submitState: PropTypes.string, + usernameSuggestions: PropTypes.arrayOf(PropTypes.string), + validationApiRateLimited: PropTypes.bool, + // Actions + clearBackendError: PropTypes.func.isRequired, + getRegistrationDataFromBackend: PropTypes.func.isRequired, + registerNewUser: PropTypes.func.isRequired, + resetUsernameSuggestions: PropTypes.func.isRequired, + validateFromBackend: PropTypes.func.isRequired, +}; + +EmbedableRegistrationForm.defaultProps = { + backedUpFormData: { + configurableFormFields: { + marketingEmailsOptIn: true, + }, + formFields: { + name: '', email: '', username: '', password: '', + }, + errors: { + name: '', email: '', username: '', password: '', + }, + emailSuggestion: { + suggestion: '', type: '', + }, + }, + backendCountryCode: '', + backendValidations: null, + fieldDescriptions: {}, + registrationError: {}, + registrationErrorCode: '', + registrationResult: null, + submitState: DEFAULT_STATE, + usernameSuggestions: [], + validationApiRateLimited: false, +}; + +export default connect( + mapStateToProps, + { + clearBackendError: clearRegistertionBackendError, + getRegistrationDataFromBackend: getThirdPartyAuthContext, + resetUsernameSuggestions: clearUsernameSuggestions, + validateFromBackend: fetchRealtimeValidations, + registerNewUser, + }, +)(EmbedableRegistrationForm); diff --git a/src/register/RegistrationPage.jsx b/src/register/RegistrationPage.jsx index 90cb1ad0d5..35d520a081 100644 --- a/src/register/RegistrationPage.jsx +++ b/src/register/RegistrationPage.jsx @@ -9,7 +9,6 @@ import { getCountryList, getLocale, useIntl, } from '@edx/frontend-platform/i18n'; import { Form, Spinner, StatefulButton } from '@edx/paragon'; -import classNames from 'classnames'; import PropTypes from 'prop-types'; import { Helmet } from 'react-helmet'; import Skeleton from 'react-loading-skeleton'; @@ -32,7 +31,7 @@ import { } from './data/constants'; import { registrationErrorSelector, validationsSelector } from './data/selectors'; import { - getSuggestionForInvalidEmail, validateCountryField, validateEmailAddress, + emailRegex, getSuggestionForInvalidEmail, urlRegex, validateCountryField, validateEmailAddress, } from './data/utils'; import messages from './messages'; import RegistrationFailure from './RegistrationFailure'; @@ -47,16 +46,12 @@ import { } from '../common-components/data/selectors'; import EnterpriseSSO from '../common-components/EnterpriseSSO'; import { - COMPLETE_STATE, DEFAULT_STATE, - INVALID_NAME_REGEX, LETTER_REGEX, NUMBER_REGEX, PENDING_STATE, REGISTER_PAGE, VALID_EMAIL_REGEX, + COMPLETE_STATE, DEFAULT_STATE, LETTER_REGEX, NUMBER_REGEX, PENDING_STATE, REGISTER_PAGE, } from '../data/constants'; import { - getAllPossibleQueryParams, getTpaHint, getTpaProvider, isHostAvailableInQueryParams, setCookie, + getAllPossibleQueryParams, getTpaHint, getTpaProvider, setCookie, } from '../data/utils'; -const emailRegex = new RegExp(VALID_EMAIL_REGEX, 'i'); -const urlRegex = new RegExp(INVALID_NAME_REGEX); - const RegistrationPage = (props) => { const { backedUpFormData, @@ -87,8 +82,6 @@ const RegistrationPage = (props) => { const { formatMessage } = useIntl(); const countryList = useMemo(() => getCountryList(getLocale()), []); const queryParams = useMemo(() => getAllPossibleQueryParams(), []); - const registrationEmbedded = isHostAvailableInQueryParams(); - const { cta, host } = queryParams; const tpaHint = useMemo(() => getTpaHint(), []); const flags = { showConfigurableEdxFields: getConfig().SHOW_CONFIGURABLE_EDX_FIELDS, @@ -109,7 +102,7 @@ const RegistrationPage = (props) => { providers, currentProvider, secondaryProviders, finishAuthUrl, } = thirdPartyAuthContext; const platformName = getConfig().SITE_NAME; - const buttonLabel = cta ? formatMessage(messages['create.account.cta.button'], { label: cta }) : formatMessage(messages['create.account.for.free.button']); + const buttonLabel = formatMessage(messages['create.account.for.free.button']); /** * If auto submitting register form, we will check tos and honor code fields if they exist for feature parity. @@ -424,17 +417,15 @@ const RegistrationPage = (props) => { const handleOnBlur = (event) => { const { name, value } = event.target; - if (registrationEmbedded) { - if (name === 'name') { - validateInput( - name, - value, - { name: formFields.name, username: formFields.username, form_field_key: name }, - !validationApiRateLimited, - false, - ); - } - return; + + if (name === 'name') { + validateInput( + name, + value, + { name: formFields.name, username: formFields.username, form_field_key: name }, + !validationApiRateLimited, + false, + ); } const payload = { name: formFields.name, @@ -540,12 +531,10 @@ const RegistrationPage = (props) => { {formatMessage(messages['register.page.title'], { siteName: getConfig().SITE_NAME })} { ) : (
{ countryList={countryList} email={formFields.email} fieldErrors={errors} - registrationEmbedded={registrationEmbedded} formFields={configurableFormFields} setFieldErrors={setErrors} setFormFields={setConfigurableFormFields} @@ -645,15 +630,13 @@ const RegistrationPage = (props) => { onClick={handleSubmit} onMouseDown={(e) => e.preventDefault()} /> - {!registrationEmbedded && ( - - )} +
)} diff --git a/src/register/data/utils.js b/src/register/data/utils.js index 190cb539bd..d151cbe22f 100644 --- a/src/register/data/utils.js +++ b/src/register/data/utils.js @@ -7,6 +7,9 @@ import { DEFAULT_SERVICE_PROVIDER_DOMAINS, DEFAULT_TOP_LEVEL_DOMAINS, } from './constants'; +import { + INVALID_NAME_REGEX, VALID_EMAIL_REGEX, +} from '../../data/constants'; function getLevenshteinSuggestion(word, knownWords, similarityThreshold = 4) { if (!word) { @@ -110,3 +113,6 @@ export function validateCountryField(value, countryList, errorMessage) { } return { error, countryCode, displayValue }; } + +export const emailRegex = new RegExp(VALID_EMAIL_REGEX, 'i'); +export const urlRegex = new RegExp(INVALID_NAME_REGEX); diff --git a/src/register/index.js b/src/register/index.js index 496c0f7bb2..733df5cf56 100644 --- a/src/register/index.js +++ b/src/register/index.js @@ -1,4 +1,5 @@ export { default as RegistrationPage } from './RegistrationPage'; +export { default as EmbedableRegistrationForm } from './EmbedableRegistrationForm'; export { default as reducer } from './data/reducers'; export { default as saga } from './data/sagas'; export { storeName } from './data/selectors'; diff --git a/src/register/tests/EmbedableRegistrationForm.test.jsx b/src/register/tests/EmbedableRegistrationForm.test.jsx new file mode 100644 index 0000000000..4980155a61 --- /dev/null +++ b/src/register/tests/EmbedableRegistrationForm.test.jsx @@ -0,0 +1,683 @@ +import React from 'react'; +import { Provider } from 'react-redux'; + +import { getConfig, mergeConfig } from '@edx/frontend-platform'; +import { sendPageEvent } from '@edx/frontend-platform/analytics'; +import { + configure, getLocale, injectIntl, IntlProvider, +} from '@edx/frontend-platform/i18n'; +import { mount } from 'enzyme'; +import renderer from 'react-test-renderer'; +import configureStore from 'redux-mock-store'; + +import { + PENDING_STATE, +} from '../../data/constants'; +import { + clearUsernameSuggestions, + registerNewUser, +} from '../data/actions'; +import { + FIELDS, +} from '../data/constants'; +import EmbedableRegistrationForm from '../EmbedableRegistrationForm'; + +jest.mock('@edx/frontend-platform/analytics', () => ({ + sendPageEvent: jest.fn(), + sendTrackEvent: jest.fn(), +})); +jest.mock('@edx/frontend-platform/i18n', () => ({ + ...jest.requireActual('@edx/frontend-platform/i18n'), + getLocale: jest.fn(), +})); + +const IntlEmbedableRegistrationForm = injectIntl(EmbedableRegistrationForm); +const mockStore = configureStore(); + +describe('RegistrationPage', () => { + mergeConfig({ + PRIVACY_POLICY: 'https://privacy-policy.com', + TOS_AND_HONOR_CODE: 'https://tos-and-honot-code.com', + REGISTER_CONVERSION_COOKIE_NAME: process.env.REGISTER_CONVERSION_COOKIE_NAME, + }); + + let props = {}; + let store = {}; + const registrationFormData = { + configurableFormFields: { + marketingEmailsOptIn: true, + }, + formFields: { + name: '', email: '', username: '', password: '', + }, + emailSuggestion: { + suggestion: '', type: '', + }, + errors: { + name: '', email: '', username: '', password: '', + }, + }; + + const reduxWrapper = children => ( + + {children} + + ); + + const initialState = { + register: { + registrationResult: { success: false, redirectUrl: '' }, + registrationError: {}, + registrationFormData, + }, + }; + + beforeEach(() => { + store = mockStore(initialState); + window.parent.postMessage = jest.fn(); + configure({ + loggingService: { logError: jest.fn() }, + config: { + ENVIRONMENT: 'production', + LANGUAGE_PREFERENCE_COOKIE_NAME: 'yum', + }, + messages: { 'es-419': {}, de: {}, 'en-us': {} }, + }); + props = { + registrationResult: jest.fn(), + handleInstitutionLogin: jest.fn(), + institutionLogin: false, + }; + window.location = { search: '' }; + }); + + afterEach(() => { + jest.clearAllMocks(); + }); + + const populateRequiredFields = (registrationPage, payload, isThirdPartyAuth = false) => { + registrationPage.find('input#name').simulate('change', { target: { value: payload.name, name: 'name' } }); + registrationPage.find('input#username').simulate('change', { target: { value: payload.username, name: 'username' } }); + registrationPage.find('input#email').simulate('change', { target: { value: payload.email, name: 'email' } }); + + registrationPage.find('input[name="country"]').simulate('change', { target: { value: payload.country, name: 'country' } }); + registrationPage.find('input[name="country"]').simulate('blur', { target: { value: payload.country, name: 'country' } }); + + if (!isThirdPartyAuth) { + registrationPage.find('input#password').simulate('change', { target: { value: payload.password, name: 'password' } }); + } + }; + + describe('Test Registration Page', () => { + mergeConfig({ + SHOW_CONFIGURABLE_EDX_FIELDS: true, + }); + + const emptyFieldValidation = { + name: 'Enter your full name', + username: 'Username must be between 2 and 30 characters', + email: 'Enter your email', + password: 'Password criteria has not been met', + country: 'Select your country or region of residence', + }; + + // ******** test registration form submission ******** + + it('should submit form for valid input', () => { + getLocale.mockImplementation(() => ('en-us')); + jest.spyOn(global.Date, 'now').mockImplementation(() => 0); + + delete window.location; + window.location = { href: getConfig().BASE_URL, search: '?next=/course/demo-course-url' }; + + const payload = { + name: 'John Doe', + username: 'john_doe', + email: 'john.doe@gmail.com', + password: 'password1', + country: 'Pakistan', + honor_code: true, + totalRegistrationTime: 0, + next: '/course/demo-course-url', + }; + + store.dispatch = jest.fn(store.dispatch); + const registrationPage = mount(reduxWrapper()); + populateRequiredFields(registrationPage, payload); + registrationPage.find('button.btn-brand').simulate('click'); + expect(store.dispatch).toHaveBeenCalledWith(registerNewUser({ ...payload, country: 'PK' })); + }); + + it('should submit form with marketing email opt in value', () => { + mergeConfig({ + MARKETING_EMAILS_OPT_IN: 'true', + }); + + jest.spyOn(global.Date, 'now').mockImplementation(() => 0); + + const payload = { + name: 'John Doe', + username: 'john_doe', + email: 'john.doe@gmail.com', + password: 'password1', + country: 'Pakistan', + honor_code: true, + totalRegistrationTime: 0, + marketing_emails_opt_in: true, + }; + + store.dispatch = jest.fn(store.dispatch); + const registrationPage = mount(reduxWrapper()); + populateRequiredFields(registrationPage, payload); + registrationPage.find('button.btn-brand').simulate('click'); + expect(store.dispatch).toHaveBeenCalledWith(registerNewUser({ ...payload, country: 'PK' })); + + mergeConfig({ + MARKETING_EMAILS_OPT_IN: '', + }); + }); + + it('should not dispatch registerNewUser on empty form Submission', () => { + store.dispatch = jest.fn(store.dispatch); + + const registrationPage = mount(reduxWrapper()); + registrationPage.find('button.btn-brand').simulate('click'); + expect(store.dispatch).not.toHaveBeenCalledWith(registerNewUser({})); + }); + + // // ******** test registration form validations ******** + + it('should show error messages for required fields on empty form submission', () => { + const registrationPage = mount(reduxWrapper()); + registrationPage.find('button.btn-brand').simulate('click'); + + expect(registrationPage.find('div[feedback-for="name"]').text()).toEqual(emptyFieldValidation.name); + expect(registrationPage.find('div[feedback-for="username"]').text()).toEqual(emptyFieldValidation.username); + expect(registrationPage.find('div[feedback-for="email"]').text()).toEqual(emptyFieldValidation.email); + expect(registrationPage.find('div[feedback-for="password"]').text()).toContain(emptyFieldValidation.password); + expect(registrationPage.find('div[feedback-for="country"]').text()).toEqual(emptyFieldValidation.country); + + const alertBanner = 'We couldn\'t create your account.Please check your responses and try again.'; + expect(registrationPage.find('#validation-errors').first().text()).toEqual(alertBanner); + }); + + it('should run validations for focused field on form submission', () => { + const registrationPage = mount(reduxWrapper()); + registrationPage.find('input[name="country"]').simulate('focus'); + registrationPage.find('button.btn-brand').simulate('click'); + + expect(registrationPage.find('div[feedback-for="country"]').text()).toEqual(emptyFieldValidation.country); + }); + + it('should give email suggestions for common service provider domain typos', async () => { + store.dispatch = jest.fn(store.dispatch); + const registrationPage = mount(reduxWrapper()); + + registrationPage.find('input#email').simulate('focus'); + registrationPage.find('input#email').simulate('change', { target: { value: 'johns@yopmail.com', name: 'email' } }); + registrationPage.find('input#email').simulate('blur'); + registrationPage.find('button.btn-brand').simulate('click'); + expect(registrationPage.find('#email-warning').text()).toEqual('Did you mean: johns@hotmail.com?'); + }); + it('should click on email suggestions for common service provider domain typos', () => { + store.dispatch = jest.fn(store.dispatch); + const registrationPage = mount(reduxWrapper()); + + registrationPage.find('input#email').simulate('focus'); + registrationPage.find('input#email').simulate('change', { target: { value: 'john@yopmail.com', name: 'email' } }); + registrationPage.find('input#email').simulate('blur'); + registrationPage.find('button.btn-brand').simulate('click'); + registrationPage.find('.email-suggestion-alert-warning').first().simulate('click'); + expect(registrationPage.find('input#email').props().value).toEqual('john@hotmail.com'); + }); + + it('should give error for common top level domain mistakes', () => { + store.dispatch = jest.fn(store.dispatch); + const registrationPage = mount(reduxWrapper()); + + registrationPage.find('input#email').simulate('focus'); + registrationPage + .find('input#email') + .simulate('change', { target: { value: 'john@gmail.mistake', name: 'email' } }); + + registrationPage.find('input#email').simulate('blur'); + registrationPage.find('button.btn-brand').simulate('click'); + + expect(registrationPage.find('.email-suggestion__text').text()).toEqual('Did you mean john@gmail.com?'); + }); + + it('should update props with validations returned by registration api', () => { + store = mockStore({ + ...initialState, + register: { + ...initialState.register, + registrationError: { + username: [{ userMessage: 'It looks like this username is already taken' }], + email: [{ userMessage: `This email is already associated with an existing or previous ${ getConfig().SITE_NAME } account` }], + }, + }, + }); + const registrationPage = mount(reduxWrapper()).find('EmbedableRegistrationForm'); + expect(registrationPage.prop('backendValidations')).toEqual({ + email: `This email is already associated with an existing or previous ${ getConfig().SITE_NAME } account`, + username: 'It looks like this username is already taken', + }); + }); + + it('should remove space from the start of username', () => { + const registrationPage = mount(reduxWrapper()); + registrationPage.find('input#username').simulate('change', { target: { value: ' test-user', name: 'username' } }); + + expect(registrationPage.find('input#username').prop('value')).toEqual('test-user'); + }); + it('should remove extra character if username is more than 30 character long', () => { + const registrationPage = mount(reduxWrapper()); + registrationPage.find('input#username').simulate('change', { target: { value: 'why_this_is_not_valid_username_', name: 'username' } }); + + expect(registrationPage.find('input#username').prop('value')).toEqual(''); + }); + + it('should give error with suggestion for common top level domain mistakes', () => { + const registrationPage = mount(reduxWrapper()); + registrationPage.find('input#email').simulate('focus'); + registrationPage.find('input#email').simulate('change', { target: { value: 'ahtesham@hotmail', name: 'email' } }); + registrationPage.find('input#email').simulate('blur'); + registrationPage.find('button.btn-brand').simulate('click'); + + const receievedMessage = 'Did you mean ahtesham@hotmail.com?'; + expect(registrationPage.find('.email-suggestion__text').text()).toEqual(receievedMessage); + }); + + // // ******** test field focus in functionality ******** + + it('should clear field related error messages on input field Focus', () => { + const registrationPage = mount(reduxWrapper()); + registrationPage.find('button.btn-brand').simulate('click'); + + expect(registrationPage.find('div[feedback-for="name"]').text()).toEqual(emptyFieldValidation.name); + registrationPage.find('input#name').simulate('focus'); + expect(registrationPage.find('div[feedback-for="name"]').exists()).toBeFalsy(); + + expect(registrationPage.find('div[feedback-for="username"]').text()).toEqual(emptyFieldValidation.username); + registrationPage.find('input#username').simulate('focus'); + expect(registrationPage.find('div[feedback-for="username"]').exists()).toBeFalsy(); + + expect(registrationPage.find('div[feedback-for="email"]').text()).toEqual(emptyFieldValidation.email); + registrationPage.find('input#email').simulate('focus'); + expect(registrationPage.find('div[feedback-for="email"]').exists()).toBeFalsy(); + + expect(registrationPage.find('div[feedback-for="password"]').text()).toContain(emptyFieldValidation.password); + registrationPage.find('input#password').simulate('focus'); + expect(registrationPage.find('div[feedback-for="password"]').exists()).toBeFalsy(); + + expect(registrationPage.find('div[feedback-for="country"]').text()).toEqual(emptyFieldValidation.country); + registrationPage.find('input[name="country"]').simulate('focus'); + expect(registrationPage.find('div[feedback-for="country"]').exists()).toBeFalsy(); + }); + + it('should clear username suggestions when username field is focused in', () => { + store.dispatch = jest.fn(store.dispatch); + + const registrationPage = mount(reduxWrapper()); + registrationPage.find('input#username').simulate('focus'); + + expect(store.dispatch).toHaveBeenCalledWith(clearUsernameSuggestions()); + }); + + // // ******** test form buttons and fields ******** + + it('should match default button state', () => { + const registrationPage = mount(reduxWrapper()); + expect(registrationPage.find('button[type="submit"] span').first().text()) + .toEqual('Create an account for free'); + }); + + it('should match pending button state', () => { + store = mockStore({ + ...initialState, + register: { + ...initialState.register, + submitState: PENDING_STATE, + }, + }); + + const registrationPage = mount(reduxWrapper()); + const button = registrationPage.find('button[type="submit"] span').first(); + + expect(button.find('.sr-only').text()).toEqual('pending'); + }); + + it('should display opt-in/opt-out checkbox', () => { + mergeConfig({ + MARKETING_EMAILS_OPT_IN: 'true', + }); + + const registrationPage = mount(reduxWrapper()); + expect(registrationPage.find('div.form-field--checkbox').length).toEqual(1); + + mergeConfig({ + MARKETING_EMAILS_OPT_IN: '', + }); + }); + + it('should show button label based on cta query params value', () => { + const buttonLabel = 'Register'; + delete window.location; + window.location = { href: getConfig().BASE_URL, search: `?cta=${buttonLabel}` }; + const registrationPage = mount(reduxWrapper()); + expect(registrationPage.find('button[type="submit"] span').first().text()).toEqual(buttonLabel); + }); + + it('should check registration conversion cookie', () => { + store = mockStore({ + ...initialState, + register: { + ...initialState.register, + registrationResult: { + success: true, + }, + }, + }); + + renderer.create(reduxWrapper()); + expect(document.cookie).toMatch(`${getConfig().REGISTER_CONVERSION_COOKIE_NAME}=true`); + }); + + it('should show username suggestions in case of conflict with an existing username', () => { + store = mockStore({ + ...initialState, + register: { + ...initialState.register, + usernameSuggestions: ['test_1', 'test_12', 'test_123'], + registrationFormData: { + ...registrationFormData, + errors: { + ...registrationFormData.errors, + username: 'It looks like this username is already taken', + }, + }, + }, + }); + + const registrationPage = mount(reduxWrapper()); + expect(registrationPage.find('button.username-suggestions--chip').length).toEqual(3); + }); + + it('should show username suggestions when full name is populated', () => { + store = mockStore({ + ...initialState, + register: { + ...initialState.register, + usernameSuggestions: ['test_1', 'test_12', 'test_123'], + registrationFormData: { + ...registrationFormData, + username: ' ', + }, + }, + }); + + const registrationPage = mount(reduxWrapper()); + registrationPage.find('input#name').simulate('change', { target: { value: 'test name', name: 'name' } }); + + expect(registrationPage.find('button.username-suggestions--chip').length).toEqual(3); + }); + + it('should click on username suggestions when full name is populated', () => { + store = mockStore({ + ...initialState, + register: { + ...initialState.register, + usernameSuggestions: ['test_1', 'test_12', 'test_123'], + registrationFormData: { + ...registrationFormData, + username: ' ', + }, + }, + }); + + const registrationPage = mount(reduxWrapper()); + registrationPage.find('input#name').simulate('change', { target: { value: 'test name', name: 'name' } }); + registrationPage.find('.username-suggestions--chip').first().simulate('click'); + expect(registrationPage.find('input#username').props().value).toEqual('test_1'); + }); + + it('should clear username suggestions when close icon is clicked', () => { + store = mockStore({ + ...initialState, + register: { + ...initialState.register, + usernameSuggestions: ['test_1', 'test_12', 'test_123'], + registrationFormData: { + ...registrationFormData, + username: ' ', + }, + }, + }); + store.dispatch = jest.fn(store.dispatch); + + const registrationPage = mount(reduxWrapper()); + registrationPage.find('input#name').simulate('change', { target: { value: 'test name', name: 'name' } }); + registrationPage.find('button.username-suggestions__close__button').at(0).simulate('click'); + expect(store.dispatch).toHaveBeenCalledWith(clearUsernameSuggestions()); + }); + + // // ******** miscellaneous tests ******** + + it('should send page event when register page is rendered', () => { + mount(reduxWrapper()); + expect(sendPageEvent).toHaveBeenCalledWith('login_and_registration', 'register'); + }); + + it('should update state from country code present in redux store', () => { + store = mockStore({ + ...initialState, + register: { + ...initialState.register, + backendCountryCode: 'PK', + }, + }); + + const registrationPage = mount(reduxWrapper()); + expect(registrationPage.find('input[name="country"]').props().value).toEqual('Pakistan'); + }); + + it('should update form fields state if updated in redux store', () => { + store = mockStore({ + ...initialState, + register: { + ...initialState.register, + registrationFormData: { + ...registrationFormData, + formFields: { + name: 'John Doe', + username: 'john_doe', + email: 'john.doe@yopmail.com', + password: 'password1', + }, + emailSuggestion: { + suggestion: 'john.doe@hotmail.com', type: 'warning', + }, + }, + }, + }); + + const registrationPage = mount(reduxWrapper()).find('EmbedableRegistrationForm'); + + expect(registrationPage.find('input#name').props().value).toEqual('John Doe'); + expect(registrationPage.find('input#username').props().value).toEqual('john_doe'); + expect(registrationPage.find('input#email').props().value).toEqual('john.doe@yopmail.com'); + expect(registrationPage.find('input#password').props().value).toEqual('password1'); + expect(registrationPage.find('.email-suggestion-alert-warning').first().text()).toEqual('john.doe@hotmail.com'); + }); + + it('should set country in component state when form is translated used i18n', () => { + getLocale.mockImplementation(() => ('ar-ae')); + + const registrationPage = mount(reduxWrapper()); + registrationPage.find('input[name="country"]').simulate('click'); + registrationPage.find('button.dropdown-item').at(0).simulate('click', { target: { value: 'أفغانستان ', name: 'countryItem' } }); + expect(registrationPage.find('div[feedback-for="country"]').exists()).toBeFalsy(); + }); + + it('should clear the registation validation error on change event on field focused', () => { + store = mockStore({ + ...initialState, + register: { + ...initialState.register, + registrationError: { + errorCode: 'duplicate-email', + email: [{ userMessage: `This email is already associated with an existing or previous ${ getConfig().SITE_NAME } account` }], + }, + }, + }); + + store.dispatch = jest.fn(store.dispatch); + const clearBackendError = jest.fn(); + const registrationPage = mount(reduxWrapper()); + registrationPage.find('input#email').simulate('change', { target: { value: 'a@gmail.com', name: 'email' } }); + expect(registrationPage.find('div[feedback-for="email"]').exists()).toBeFalsy(); + }); + }); + + describe('Test Configurable Fields', () => { + mergeConfig({ + ENABLE_DYNAMIC_REGISTRATION_FIELDS: true, + SHOW_CONFIGURABLE_EDX_FIELDS: true, + }); + + it('should render fields returned by backend', () => { + store = mockStore({ + ...initialState, + commonComponents: { + ...initialState.commonComponents, + fieldDescriptions: { + profession: { name: 'profession', type: 'text', label: 'Profession' }, + terms_of_service: { + name: FIELDS.TERMS_OF_SERVICE, + error_message: 'You must agree to the Terms and Service agreement of our site', + }, + }, + }, + }); + const registrationPage = mount(reduxWrapper()); + expect(registrationPage.find('#profession').exists()).toBeTruthy(); + expect(registrationPage.find('#tos').exists()).toBeTruthy(); + }); + + it('should submit form with fields returned by backend in payload', () => { + getLocale.mockImplementation(() => ('en-us')); + jest.spyOn(global.Date, 'now').mockImplementation(() => 0); + store = mockStore({ + ...initialState, + commonComponents: { + ...initialState.commonComponents, + fieldDescriptions: { + profession: { name: 'profession', type: 'text', label: 'Profession' }, + }, + extendedProfile: ['profession'], + }, + }); + + const payload = { + name: 'John Doe', + username: 'john_doe', + email: 'john.doe@example.com', + password: 'password1', + country: 'Pakistan', + honor_code: true, + profession: 'Engineer', + totalRegistrationTime: 0, + }; + + store.dispatch = jest.fn(store.dispatch); + const registrationPage = mount(reduxWrapper()); + + populateRequiredFields(registrationPage, payload); + registrationPage.find('input#profession').simulate('change', { target: { value: 'Engineer', name: 'profession' } }); + registrationPage.find('button.btn-brand').simulate('click'); + expect(store.dispatch).toHaveBeenCalledWith(registerNewUser({ ...payload, country: 'PK' })); + }); + + it('should show error messages for required fields on empty form submission', () => { + const professionError = 'Enter your profession'; + const countryError = 'Select your country or region of residence'; + const confirmEmailError = 'Enter your email'; + + store = mockStore({ + ...initialState, + commonComponents: { + ...initialState.commonComponents, + fieldDescriptions: { + profession: { + name: 'profession', type: 'text', label: 'Profession', error_message: professionError, + }, + confirm_email: { + name: 'confirm_email', type: 'text', label: 'Confirm Email', error_message: confirmEmailError, + }, + country: { name: 'country' }, + }, + }, + }); + + const registrationPage = mount(reduxWrapper()); + registrationPage.find('button.btn-brand').simulate('click'); + + expect(registrationPage.find('#profession-error').last().text()).toEqual(professionError); + expect(registrationPage.find('div[feedback-for="country"]').text()).toEqual(countryError); + expect(registrationPage.find('#confirm_email-error').last().text()).toEqual(confirmEmailError); + }); + + it('should show error if email and confirm email fields do not match', () => { + store = mockStore({ + ...initialState, + commonComponents: { + ...initialState.commonComponents, + fieldDescriptions: { + confirm_email: { + name: 'confirm_email', type: 'text', label: 'Confirm Email', + }, + }, + }, + }); + const registrationPage = mount(reduxWrapper()); + + registrationPage.find('input#email').simulate('change', { target: { value: 'test1@gmail.com', name: 'email' } }); + registrationPage.find('input#confirm_email').simulate('change', { target: { value: 'test2@gmail.com', name: 'confirm_email' } }); + registrationPage.find('input#confirm_email').simulate('focus'); + registrationPage.find('button.btn-brand').simulate('click'); + expect(registrationPage.find('div#confirm_email-error').text()).toEqual('The email addresses do not match.'); + }); + + it('should run validations for configurable focused field on form submission', () => { + const professionError = 'Enter your profession'; + store = mockStore({ + ...initialState, + commonComponents: { + ...initialState.commonComponents, + fieldDescriptions: { + profession: { + name: 'profession', type: 'text', label: 'Profession', error_message: professionError, + }, + }, + }, + }); + + const registrationPage = mount(reduxWrapper()); + registrationPage.find('input#profession').simulate('focus', { target: { value: '', name: 'profession' } }); + registrationPage.find('button.btn-brand').simulate('click'); + + expect(registrationPage.find('#profession-error').last().text()).toEqual(professionError); + }); + + it('should not run country field validation when onBlur is fired by drop-down arrow icon click', () => { + getLocale.mockImplementation(() => ('en-us')); + + const registrationPage = mount(reduxWrapper()); + registrationPage.find('input[name="country"]').simulate('blur', { + target: { value: '', name: 'country' }, + relatedTarget: { type: 'button', className: 'btn-icon pgn__form-autosuggest__icon-button' }, + }); + expect(registrationPage.find('div[feedback-for="country"]').exists()).toBeFalsy(); + }); + }); +}); diff --git a/src/register/tests/RegistrationPage.test.jsx b/src/register/tests/RegistrationPage.test.jsx index e6a9ff5ea7..06637923e3 100644 --- a/src/register/tests/RegistrationPage.test.jsx +++ b/src/register/tests/RegistrationPage.test.jsx @@ -250,18 +250,6 @@ describe('RegistrationPage', () => { // ******** test registration form validations ******** - it('should not run validations on blur event when embedded variant is rendered', () => { - delete window.location; - window.location = { href: getConfig().BASE_URL.concat(REGISTER_PAGE), search: '?host=http://localhost/host-website' }; - const registrationPage = mount(reduxWrapper()); - - registrationPage.find('input#username').simulate('blur', { target: { value: '', name: 'username' } }); - expect(registrationPage.find('div[feedback-for="username"]').exists()).toBeFalsy(); - - registrationPage.find('input[name="country"]').simulate('blur', { target: { value: '', name: 'country' } }); - expect(registrationPage.find('div[feedback-for="country"]').exists()).toBeFalsy(); - }); - it('should show error messages for required fields on empty form submission', () => { const registrationPage = mount(reduxWrapper()); registrationPage.find('button.btn-brand').simulate('click'); @@ -619,14 +607,6 @@ describe('RegistrationPage', () => { }); }); - it('should show button label based on cta query params value', () => { - const buttonLabel = 'Register'; - delete window.location; - window.location = { href: getConfig().BASE_URL, search: `?cta=${buttonLabel}` }; - const registrationPage = mount(reduxWrapper()); - expect(registrationPage.find('button[type="submit"] span').first().text()).toEqual(buttonLabel); - }); - it('should display no password field when current provider is present', () => { store = mockStore({ ...initialState, @@ -882,41 +862,6 @@ describe('RegistrationPage', () => { expect(registrationPage.find(`button#${ssoProvider.id}`).hasClass(`btn-tpa btn-${ssoProvider.id}`)).toEqual(true); }); - it('should call the postMessage API when embedded variant is rendered', () => { - getLocale.mockImplementation(() => ('en-us')); - mergeConfig({ - ENABLE_PROGRESSIVE_PROFILING_ON_AUTHN: true, - }); - - window.parent.postMessage = jest.fn(); - - delete window.location; - window.location = { href: getConfig().BASE_URL.concat(AUTHN_PROGRESSIVE_PROFILING), search: '?host=http://localhost/host-website' }; - - store = mockStore({ - ...initialState, - register: { - ...initialState.register, - registrationResult: { - success: true, - }, - }, - commonComponents: { - optionalFields: { - extended_profile: {}, - fields: { - level_of_education: { name: 'level_of_education', error_message: false }, - }, - }, - }, - }); - const progressiveProfilingPage = mount(reduxWrapper( - , - )); - progressiveProfilingPage.update(); - expect(window.parent.postMessage).toHaveBeenCalledTimes(2); - }); - it('should render icon if icon classes are missing in providers', () => { ssoProvider.iconClass = null; store = mockStore({