From d39f2b2907aa49f5fa383d2246875220a77c818c Mon Sep 17 00:00:00 2001 From: Anike Arni Date: Tue, 28 Mar 2017 11:26:11 -0300 Subject: [#932] Adds logic to go to next step --- .../forms/admin_recovery_code_form.js | 9 ++-- .../forms/admin_recovery_code_form.spec.js | 11 ++++- .../forms/user_recovery_code_form.js | 31 ++++++++++++++ web-ui/src/account_recovery/page.js | 48 ++++++++++++++++------ web-ui/src/account_recovery/page.spec.js | 24 +++++++++-- 5 files changed, 102 insertions(+), 21 deletions(-) create mode 100644 web-ui/src/account_recovery/forms/user_recovery_code_form.js (limited to 'web-ui') diff --git a/web-ui/src/account_recovery/forms/admin_recovery_code_form.js b/web-ui/src/account_recovery/forms/admin_recovery_code_form.js index 68889e40..ea71566b 100644 --- a/web-ui/src/account_recovery/forms/admin_recovery_code_form.js +++ b/web-ui/src/account_recovery/forms/admin_recovery_code_form.js @@ -24,8 +24,8 @@ import SubmitButton from 'src/common/submit_button/submit_button'; import './admin_recovery_code_form.scss'; -export const AdminRecoveryCodeForm = ({ t }) => ( -
+export const AdminRecoveryCodeForm = ({ t, next }) => ( +

{t('account-recovery.admin-form.title')}

  • {t('account-recovery.admin-form.tip1')}
    • @@ -34,11 +34,12 @@ export const AdminRecoveryCodeForm = ({ t }) => (
-
+ ); AdminRecoveryCodeForm.propTypes = { - t: React.PropTypes.func.isRequired + t: React.PropTypes.func.isRequired, + next: React.PropTypes.func.isRequired }; export default translate('', { wait: true })(AdminRecoveryCodeForm); diff --git a/web-ui/src/account_recovery/forms/admin_recovery_code_form.spec.js b/web-ui/src/account_recovery/forms/admin_recovery_code_form.spec.js index 6df392fa..0e922212 100644 --- a/web-ui/src/account_recovery/forms/admin_recovery_code_form.spec.js +++ b/web-ui/src/account_recovery/forms/admin_recovery_code_form.spec.js @@ -5,10 +5,14 @@ import { AdminRecoveryCodeForm } from 'src/account_recovery/forms/admin_recovery describe('AdminRecoveryCodeForm', () => { let adminRecoveryCodeForm; + let mockNext; beforeEach(() => { const mockTranslations = key => key; - adminRecoveryCodeForm = shallow(); + mockNext = expect.createSpy(); + adminRecoveryCodeForm = shallow( + + ); }); it('renders title for admin recovery code', () => { @@ -26,4 +30,9 @@ describe('AdminRecoveryCodeForm', () => { it('renders button for next step', () => { expect(adminRecoveryCodeForm.find('SubmitButton').props().buttonText).toEqual('account-recovery.admin-form.button'); }); + + it('submits form to next step', () => { + adminRecoveryCodeForm.find('form').simulate('submit'); + expect(mockNext).toHaveBeenCalled(); + }); }); diff --git a/web-ui/src/account_recovery/forms/user_recovery_code_form.js b/web-ui/src/account_recovery/forms/user_recovery_code_form.js new file mode 100644 index 00000000..2eec96ba --- /dev/null +++ b/web-ui/src/account_recovery/forms/user_recovery_code_form.js @@ -0,0 +1,31 @@ +/* + * Copyright (c) 2017 ThoughtWorks, Inc. + * + * Pixelated is free software: you can redistribute it and/or modify + * it under the terms of the GNU Affero General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * Pixelated is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU Affero General Public License for more details. + * + * You should have received a copy of the GNU Affero General Public License + * along with Pixelated. If not, see . + */ + +import React from 'react'; +import { translate } from 'react-i18next'; + +export const UserRecoveryCodeForm = ({ t }) => ( +
+

{t('account-recovery.user-form.title')}

+
+); + +UserRecoveryCodeForm.propTypes = { + t: React.PropTypes.func.isRequired +}; + +export default translate('', { wait: true })(UserRecoveryCodeForm); diff --git a/web-ui/src/account_recovery/page.js b/web-ui/src/account_recovery/page.js index 2a2f6fe6..93781729 100644 --- a/web-ui/src/account_recovery/page.js +++ b/web-ui/src/account_recovery/page.js @@ -20,25 +20,49 @@ import { translate } from 'react-i18next'; import DocumentTitle from 'react-document-title'; import Header from 'src/common/header/header'; import AdminRecoveryCodeForm from 'src/account_recovery/forms/admin_recovery_code_form'; +import UserRecoveryCodeForm from 'src/account_recovery/forms/user_recovery_code_form'; import Footer from 'src/common/footer/footer'; import 'font-awesome/scss/font-awesome.scss'; import './page.scss'; -export const Page = ({ t }) => ( - -
-
-
-
- +export class Page extends React.Component { + + constructor(props) { + super(props); + this.state = { step: 0 }; + } + + nextStep = (event) => { + event.preventDefault(); + this.setState({ step: this.state.step + 1 }); + } + + steps = { + 0: , + 1: + } + + mainContent = () => this.steps[this.state.step]; + + render() { + const t = this.props.t; + return ( + +
+
+
+
+ {this.mainContent()} +
+
+
-
-
- -); + + ); + } +} Page.propTypes = { t: React.PropTypes.func.isRequired diff --git a/web-ui/src/account_recovery/page.spec.js b/web-ui/src/account_recovery/page.spec.js index 2d8559d6..37c7be6f 100644 --- a/web-ui/src/account_recovery/page.spec.js +++ b/web-ui/src/account_recovery/page.spec.js @@ -5,6 +5,7 @@ import React from 'react'; import { Page } from 'src/account_recovery/page'; import Header from 'src/common/header/header'; import AdminRecoveryCodeForm from 'src/account_recovery/forms/admin_recovery_code_form'; +import UserRecoveryCodeForm from 'src/account_recovery/forms/user_recovery_code_form'; import Footer from 'src/common/footer/footer'; describe('Account Recovery Page', () => { @@ -23,11 +24,26 @@ describe('Account Recovery Page', () => { expect(page.find(Header).length).toEqual(1); }); - it('renders admin recovery code form', () => { - expect(page.find(AdminRecoveryCodeForm).length).toEqual(1); - }); - it('renders footer', () => { expect(page.find(Footer).length).toEqual(1); }); + + context('main content', () => { + let pageInstance; + + beforeEach(() => { + pageInstance = page.instance(); + }); + + it('renders admin recovery code form as default form', () => { + expect(page.find(AdminRecoveryCodeForm).length).toEqual(1); + }); + + it('renders user recovery code form when admin code submitted', () => { + pageInstance.nextStep({ preventDefault: () => {} }); + + expect(page.find(AdminRecoveryCodeForm).length).toEqual(0); + expect(page.find(UserRecoveryCodeForm).length).toEqual(1); + }); + }); }); -- cgit v1.2.3