From 7a6419d1628db465ebd543fac187012e58b67138 Mon Sep 17 00:00:00 2001 From: Anike Arni Date: Mon, 27 Mar 2017 15:57:42 -0300 Subject: [#932] Adds admin code form --- .../forms/admin_recovery_code_form.js | 44 ++++++++++++++++++++++ .../forms/admin_recovery_code_form.scss | 0 .../forms/admin_recovery_code_form.spec.js | 29 ++++++++++++++ 3 files changed, 73 insertions(+) create mode 100644 web-ui/src/account_recovery/forms/admin_recovery_code_form.js create mode 100644 web-ui/src/account_recovery/forms/admin_recovery_code_form.scss create mode 100644 web-ui/src/account_recovery/forms/admin_recovery_code_form.spec.js (limited to 'web-ui/src/account_recovery/forms') 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 new file mode 100644 index 00000000..68889e40 --- /dev/null +++ b/web-ui/src/account_recovery/forms/admin_recovery_code_form.js @@ -0,0 +1,44 @@ +/* + * 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'; + +import InputField from 'src/common/input_field/input_field'; +import SubmitButton from 'src/common/submit_button/submit_button'; + +import './admin_recovery_code_form.scss'; + + +export const AdminRecoveryCodeForm = ({ t }) => ( +
+

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

+
    +
  • {t('account-recovery.admin-form.tip1')}
  • +
  • {t('account-recovery.admin-form.tip2')}
  • +
  • {t('account-recovery.admin-form.tip3')}
  • +
+ + +
+); + +AdminRecoveryCodeForm.propTypes = { + t: React.PropTypes.func.isRequired +}; + +export default translate('', { wait: true })(AdminRecoveryCodeForm); diff --git a/web-ui/src/account_recovery/forms/admin_recovery_code_form.scss b/web-ui/src/account_recovery/forms/admin_recovery_code_form.scss new file mode 100644 index 00000000..e69de29b 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 new file mode 100644 index 00000000..6df392fa --- /dev/null +++ b/web-ui/src/account_recovery/forms/admin_recovery_code_form.spec.js @@ -0,0 +1,29 @@ +import { shallow } from 'enzyme'; +import expect from 'expect'; +import React from 'react'; +import { AdminRecoveryCodeForm } from 'src/account_recovery/forms/admin_recovery_code_form'; + +describe('AdminRecoveryCodeForm', () => { + let adminRecoveryCodeForm; + + beforeEach(() => { + const mockTranslations = key => key; + adminRecoveryCodeForm = shallow(); + }); + + it('renders title for admin recovery code', () => { + expect(adminRecoveryCodeForm.find('h1').text()).toEqual('account-recovery.admin-form.title'); + }); + + it('renders tips for retrieving recovery code', () => { + expect(adminRecoveryCodeForm.find('li').length).toEqual(3); + }); + + it('renders input field for admin code', () => { + expect(adminRecoveryCodeForm.find('InputField').props().name).toEqual('admin-code'); + }); + + it('renders button for next step', () => { + expect(adminRecoveryCodeForm.find('SubmitButton').props().buttonText).toEqual('account-recovery.admin-form.button'); + }); +}); -- cgit v1.2.3 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 ++++++++++++++++++++++ 3 files changed, 46 insertions(+), 5 deletions(-) create mode 100644 web-ui/src/account_recovery/forms/user_recovery_code_form.js (limited to 'web-ui/src/account_recovery/forms') 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); -- cgit v1.2.3 From c7d135c20c70b6bd5936177db90a7b8ce2d278c0 Mon Sep 17 00:00:00 2001 From: Anike Arni Date: Tue, 28 Mar 2017 11:43:29 -0300 Subject: [#932] Tests next step of account recovery is translated --- .../forms/admin_recovery_code_form.js | 2 +- .../forms/user_recovery_code_form.spec.js | 19 +++++++++++++++++++ 2 files changed, 20 insertions(+), 1 deletion(-) create mode 100644 web-ui/src/account_recovery/forms/user_recovery_code_form.spec.js (limited to 'web-ui/src/account_recovery/forms') 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 ea71566b..0a28e8b2 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 @@ -25,7 +25,7 @@ import './admin_recovery_code_form.scss'; export const AdminRecoveryCodeForm = ({ t, next }) => ( -
+

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

  • {t('account-recovery.admin-form.tip1')}
  • diff --git a/web-ui/src/account_recovery/forms/user_recovery_code_form.spec.js b/web-ui/src/account_recovery/forms/user_recovery_code_form.spec.js new file mode 100644 index 00000000..ade96f9c --- /dev/null +++ b/web-ui/src/account_recovery/forms/user_recovery_code_form.spec.js @@ -0,0 +1,19 @@ +import { shallow } from 'enzyme'; +import expect from 'expect'; +import React from 'react'; +import { UserRecoveryCodeForm } from 'src/account_recovery/forms/user_recovery_code_form'; + +describe('UserRecoveryCodeForm', () => { + let userRecoveryCodeForm; + + beforeEach(() => { + const mockTranslations = key => key; + userRecoveryCodeForm = shallow( + + ); + }); + + it('renders title for user recovery code', () => { + expect(userRecoveryCodeForm.find('h1').text()).toEqual('account-recovery.user-form.title'); + }); +}); -- cgit v1.2.3