diff options
author | Anike Arni <aarni@thoughtworks.com> | 2017-03-30 17:23:41 -0300 |
---|---|---|
committer | Anike Arni <aarni@thoughtworks.com> | 2017-03-31 18:29:48 -0300 |
commit | 7be03150100d319c6d373241f614a29b374cb74d (patch) | |
tree | 90a553dfa0b6f119300a00e6ef02788923035e5c /web-ui/src/account_recovery | |
parent | f40808a147d1135e8bbee6d78306a598cf5ca647 (diff) |
[#935] Submits user recovery code to new endpoint
with @deniscostadsc
Diffstat (limited to 'web-ui/src/account_recovery')
6 files changed, 62 insertions, 20 deletions
diff --git a/web-ui/src/account_recovery/new_password_form/new_password_form.js b/web-ui/src/account_recovery/new_password_form/new_password_form.js index f1097b0b..b18bc8ff 100644 --- a/web-ui/src/account_recovery/new_password_form/new_password_form.js +++ b/web-ui/src/account_recovery/new_password_form/new_password_form.js @@ -15,17 +15,23 @@ * along with Pixelated. If not, see <http://www.gnu.org/licenses/>. */ +import 'isomorphic-fetch'; import React from 'react'; import { translate } from 'react-i18next'; +import { submitForm } from 'src/common/util'; import InputField from 'src/common/input_field/input_field'; import SubmitButton from 'src/common/submit_button/submit_button'; import BackLink from 'src/common/back_link/back_link'; import './new_password_form.scss'; -export const NewPasswordForm = ({ t, previous }) => ( - <form className='account-recovery-form new-password'> +const submitHandler = code => event => ( + submitForm(event, '/account-recovery', { userCode: code }) +); + +export const NewPasswordForm = ({ t, previous, userCode }) => ( + <form className='account-recovery-form new-password' onSubmit={submitHandler(userCode)}> <img className='account-recovery-progress' src='/public/images/account-recovery/step_3.svg' @@ -47,7 +53,8 @@ export const NewPasswordForm = ({ t, previous }) => ( NewPasswordForm.propTypes = { t: React.PropTypes.func.isRequired, - previous: React.PropTypes.func.isRequired + previous: React.PropTypes.func.isRequired, + userCode: React.PropTypes.string.isRequired }; export default translate('', { wait: true })(NewPasswordForm); diff --git a/web-ui/src/account_recovery/new_password_form/new_password_form.spec.js b/web-ui/src/account_recovery/new_password_form/new_password_form.spec.js index d2bd350c..5ffd9720 100644 --- a/web-ui/src/account_recovery/new_password_form/new_password_form.spec.js +++ b/web-ui/src/account_recovery/new_password_form/new_password_form.spec.js @@ -1,6 +1,7 @@ import { shallow } from 'enzyme'; import expect from 'expect'; import React from 'react'; +import fetchMock from 'fetch-mock'; import { NewPasswordForm } from './new_password_form'; describe('NewPasswordForm', () => { @@ -11,7 +12,7 @@ describe('NewPasswordForm', () => { const mockTranslations = key => key; mockPrevious = expect.createSpy(); newPasswordForm = shallow( - <NewPasswordForm t={mockTranslations} previous={mockPrevious} /> + <NewPasswordForm t={mockTranslations} previous={mockPrevious} userCode='def234' /> ); }); @@ -37,4 +38,19 @@ describe('NewPasswordForm', () => { newPasswordForm.find('BackLink').simulate('click'); expect(mockPrevious).toHaveBeenCalled(); }); + + describe('Submit', () => { + beforeEach(() => { + fetchMock.post('/account-recovery', 200); + newPasswordForm.find('form').simulate('submit', { preventDefault: expect.createSpy() }); + }); + + it('posts to account recovery', () => { + expect(fetchMock.called('/account-recovery')).toBe(true, 'POST was not called'); + }); + + it('sends user code as content', () => { + expect(fetchMock.lastOptions('/account-recovery').body).toContain('"userCode":"def234"'); + }); + }); }); diff --git a/web-ui/src/account_recovery/page.js b/web-ui/src/account_recovery/page.js index 579f17cc..2d33e2fb 100644 --- a/web-ui/src/account_recovery/page.js +++ b/web-ui/src/account_recovery/page.js @@ -32,7 +32,7 @@ export class Page extends React.Component { constructor(props) { super(props); - this.state = { step: 0 }; + this.state = { step: 0, userCode: '' }; } nextStep = (event) => { @@ -44,13 +44,19 @@ export class Page extends React.Component { this.setState({ step: this.state.step - 1 }); } - steps = { - 0: <AdminRecoveryCodeForm next={this.nextStep} />, - 1: <UserRecoveryCodeForm previous={this.previousStep} next={this.nextStep} />, - 2: <NewPasswordForm previous={this.previousStep} /> + saveUserCode = (event) => { + this.setState({ userCode: event.target.value }); } - mainContent = () => this.steps[this.state.step]; + steps = () => ({ + 0: <AdminRecoveryCodeForm next={this.nextStep} />, + 1: (<UserRecoveryCodeForm + previous={this.previousStep} next={this.nextStep} saveCode={this.saveUserCode} + />), + 2: <NewPasswordForm previous={this.previousStep} userCode={this.state.userCode} /> + }) + + mainContent = () => this.steps()[this.state.step]; render() { const t = this.props.t; diff --git a/web-ui/src/account_recovery/page.spec.js b/web-ui/src/account_recovery/page.spec.js index 68debba0..31a748be 100644 --- a/web-ui/src/account_recovery/page.spec.js +++ b/web-ui/src/account_recovery/page.spec.js @@ -12,10 +12,12 @@ import NewPasswordFormWrapper from './new_password_form/new_password_form'; describe('Account Recovery Page', () => { let page; + let pageInstance; beforeEach(() => { const mockTranslations = key => key; page = shallow(<Page t={mockTranslations} />); + pageInstance = page.instance(); }); it('renders account recovery page title', () => { @@ -30,13 +32,12 @@ describe('Account Recovery Page', () => { expect(page.find(Footer).length).toEqual(1); }); - context('main content', () => { - let pageInstance; - - beforeEach(() => { - pageInstance = page.instance(); - }); + it('saves user code', () => { + pageInstance.saveUserCode({ target: { value: '123' } }); + expect(pageInstance.state.userCode).toEqual('123'); + }); + context('main content', () => { it('renders admin recovery code form as default form', () => { expect(page.find(AdminRecoveryCodeFormWrapper).length).toEqual(1); expect(page.find(UserRecoveryCodeFormWrapper).length).toEqual(0); diff --git a/web-ui/src/account_recovery/user_recovery_code_form/user_recovery_code_form.js b/web-ui/src/account_recovery/user_recovery_code_form/user_recovery_code_form.js index a4119885..c39c894d 100644 --- a/web-ui/src/account_recovery/user_recovery_code_form/user_recovery_code_form.js +++ b/web-ui/src/account_recovery/user_recovery_code_form/user_recovery_code_form.js @@ -24,7 +24,7 @@ import BackLink from 'src/common/back_link/back_link'; import './user_recovery_code_form.scss'; -export const UserRecoveryCodeForm = ({ t, previous, next }) => ( +export const UserRecoveryCodeForm = ({ t, previous, next, saveCode }) => ( <form className='account-recovery-form user-code' onSubmit={next}> <img className='account-recovery-progress' @@ -40,7 +40,10 @@ export const UserRecoveryCodeForm = ({ t, previous, next }) => ( /> <p>{t('account-recovery.user-form.description')}</p> </div> - <InputField name='admin-code' label={t('account-recovery.user-form.input-label')} /> + <InputField + name='user-code' label={t('account-recovery.user-form.input-label')} + onChange={saveCode} + /> <SubmitButton buttonText={t('account-recovery.button-next')} /> <BackLink text={t('account-recovery.back')} onClick={previous} /> </form> @@ -49,7 +52,8 @@ export const UserRecoveryCodeForm = ({ t, previous, next }) => ( UserRecoveryCodeForm.propTypes = { t: React.PropTypes.func.isRequired, previous: React.PropTypes.func.isRequired, - next: React.PropTypes.func.isRequired + next: React.PropTypes.func.isRequired, + saveCode: React.PropTypes.func.isRequired }; export default translate('', { wait: true })(UserRecoveryCodeForm); diff --git a/web-ui/src/account_recovery/user_recovery_code_form/user_recovery_code_form.spec.js b/web-ui/src/account_recovery/user_recovery_code_form/user_recovery_code_form.spec.js index e47f2e6c..386c3a19 100644 --- a/web-ui/src/account_recovery/user_recovery_code_form/user_recovery_code_form.spec.js +++ b/web-ui/src/account_recovery/user_recovery_code_form/user_recovery_code_form.spec.js @@ -7,14 +7,17 @@ describe('UserRecoveryCodeForm', () => { let userRecoveryCodeForm; let mockNext; let mockPrevious; + let mockSaveCode; beforeEach(() => { const mockTranslations = key => key; mockNext = expect.createSpy(); mockPrevious = expect.createSpy(); + mockSaveCode = expect.createSpy(); userRecoveryCodeForm = shallow( <UserRecoveryCodeForm - t={mockTranslations} next={mockNext} previous={mockPrevious} + t={mockTranslations} next={mockNext} + previous={mockPrevious} saveCode={mockSaveCode} /> ); }); @@ -44,4 +47,9 @@ describe('UserRecoveryCodeForm', () => { userRecoveryCodeForm.find('BackLink').simulate('click'); expect(mockPrevious).toHaveBeenCalled(); }); + + it('saves code on input change', () => { + userRecoveryCodeForm.find('InputField').simulate('change', '123'); + expect(mockSaveCode).toHaveBeenCalledWith('123'); + }); }); |