From 50d64627a924234ef5858b82bee8c9c33fb08f09 Mon Sep 17 00:00:00 2001 From: Sriram Viswanathan Date: Tue, 4 Apr 2017 17:57:48 -0300 Subject: [#938] Adds backup account step to forgot password flow with @anikarni --- .../backup_account_step/backup_account_step.js | 35 ++++++++++++++++++++++ .../backup_account_step.spec.js | 17 +++++++++++ 2 files changed, 52 insertions(+) create mode 100644 web-ui/src/account_recovery/backup_account_step/backup_account_step.js create mode 100644 web-ui/src/account_recovery/backup_account_step/backup_account_step.spec.js (limited to 'web-ui/src/account_recovery/backup_account_step') diff --git a/web-ui/src/account_recovery/backup_account_step/backup_account_step.js b/web-ui/src/account_recovery/backup_account_step/backup_account_step.js new file mode 100644 index 00000000..b4dcbaaf --- /dev/null +++ b/web-ui/src/account_recovery/backup_account_step/backup_account_step.js @@ -0,0 +1,35 @@ +/* + * 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 BackupAccountStep = ({ t }) => ( +
+ {t('account-recovery.backup-account-step.image-description')} +

{t('account-recovery.backup-account-step.title')}

+
+); + +BackupAccountStep.propTypes = { + t: React.PropTypes.func.isRequired +}; + +export default translate('', { wait: true })(BackupAccountStep); diff --git a/web-ui/src/account_recovery/backup_account_step/backup_account_step.spec.js b/web-ui/src/account_recovery/backup_account_step/backup_account_step.spec.js new file mode 100644 index 00000000..3b27b369 --- /dev/null +++ b/web-ui/src/account_recovery/backup_account_step/backup_account_step.spec.js @@ -0,0 +1,17 @@ +import { shallow } from 'enzyme'; +import expect from 'expect'; +import React from 'react'; +import { BackupAccountStep } from './backup_account_step'; + +describe('BackupAccountStep', () => { + let backupAccountStep; + + beforeEach(() => { + const mockTranslations = key => key; + backupAccountStep = shallow(); + }); + + it('renders title for backup account step', () => { + expect(backupAccountStep.find('h1').text()).toEqual('account-recovery.backup-account-step.title'); + }); +}); -- cgit v1.2.3 From 8c4b36a93e8e089186e0ffce5aecc97d3ce9e8bc Mon Sep 17 00:00:00 2001 From: Sriram Viswanathan Date: Tue, 4 Apr 2017 18:27:19 -0300 Subject: [#938] Adds link to backup-account on the backup account step with @anikarni --- .../backup_account_step/backup_account_step.js | 6 ++++++ .../backup_account_step/backup_account_step.spec.js | 14 ++++++++++++++ 2 files changed, 20 insertions(+) (limited to 'web-ui/src/account_recovery/backup_account_step') diff --git a/web-ui/src/account_recovery/backup_account_step/backup_account_step.js b/web-ui/src/account_recovery/backup_account_step/backup_account_step.js index b4dcbaaf..f2498a8a 100644 --- a/web-ui/src/account_recovery/backup_account_step/backup_account_step.js +++ b/web-ui/src/account_recovery/backup_account_step/backup_account_step.js @@ -16,6 +16,7 @@ */ import React from "react"; import {translate} from "react-i18next"; +import SubmitButton from 'src/common/submit_button/submit_button'; export const BackupAccountStep = ({ t }) => (
@@ -25,6 +26,11 @@ export const BackupAccountStep = ({ t }) => ( alt={t('account-recovery.backup-account-step.image-description')} />

{t('account-recovery.backup-account-step.title')}

+
); diff --git a/web-ui/src/account_recovery/backup_account_step/backup_account_step.spec.js b/web-ui/src/account_recovery/backup_account_step/backup_account_step.spec.js index 3b27b369..561079c9 100644 --- a/web-ui/src/account_recovery/backup_account_step/backup_account_step.spec.js +++ b/web-ui/src/account_recovery/backup_account_step/backup_account_step.spec.js @@ -2,6 +2,7 @@ import { shallow } from 'enzyme'; import expect from 'expect'; import React from 'react'; import { BackupAccountStep } from './backup_account_step'; +import SubmitButton from 'src/common/submit_button/submit_button'; describe('BackupAccountStep', () => { let backupAccountStep; @@ -14,4 +15,17 @@ describe('BackupAccountStep', () => { it('renders title for backup account step', () => { expect(backupAccountStep.find('h1').text()).toEqual('account-recovery.backup-account-step.title'); }); + + it('renders submit button with given href', () => { + expect(backupAccountStep.find(SubmitButton).props().href).toEqual('/backup-account'); + }); + + it('renders submit button with given container element', () => { + expect(backupAccountStep.find(SubmitButton).props().containerElement).toEqual('a'); + }); + + it('renders submit button with given button text', () => { + expect(backupAccountStep.find(SubmitButton).props().buttonText) + .toEqual('account-recovery.backup-account-step.buttonText'); + }); }); -- cgit v1.2.3 From d8ade045a17be8de98ea2a501dbdb7ba166de094 Mon Sep 17 00:00:00 2001 From: Sriram Viswanathan Date: Tue, 4 Apr 2017 18:36:14 -0300 Subject: [#938] Fixes lint errors with @anikarni --- .../src/account_recovery/backup_account_step/backup_account_step.js | 4 ++-- .../account_recovery/backup_account_step/backup_account_step.spec.js | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) (limited to 'web-ui/src/account_recovery/backup_account_step') diff --git a/web-ui/src/account_recovery/backup_account_step/backup_account_step.js b/web-ui/src/account_recovery/backup_account_step/backup_account_step.js index f2498a8a..e0c31d88 100644 --- a/web-ui/src/account_recovery/backup_account_step/backup_account_step.js +++ b/web-ui/src/account_recovery/backup_account_step/backup_account_step.js @@ -14,8 +14,8 @@ * 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 React from 'react'; +import { translate } from 'react-i18next'; import SubmitButton from 'src/common/submit_button/submit_button'; export const BackupAccountStep = ({ t }) => ( diff --git a/web-ui/src/account_recovery/backup_account_step/backup_account_step.spec.js b/web-ui/src/account_recovery/backup_account_step/backup_account_step.spec.js index 561079c9..1d08670d 100644 --- a/web-ui/src/account_recovery/backup_account_step/backup_account_step.spec.js +++ b/web-ui/src/account_recovery/backup_account_step/backup_account_step.spec.js @@ -1,8 +1,8 @@ import { shallow } from 'enzyme'; import expect from 'expect'; import React from 'react'; -import { BackupAccountStep } from './backup_account_step'; import SubmitButton from 'src/common/submit_button/submit_button'; +import { BackupAccountStep } from './backup_account_step'; describe('BackupAccountStep', () => { let backupAccountStep; -- cgit v1.2.3 From 8198fa48d2e42d89457940590ec4b308ee541090 Mon Sep 17 00:00:00 2001 From: Sriram Viswanathan Date: Wed, 5 Apr 2017 11:17:29 -0300 Subject: [#938] Replaces submit button with a link button for redirection with @anikarni --- .../backup_account_step/backup_account_step.js | 5 ++--- .../backup_account_step/backup_account_step.spec.js | 10 +++------- 2 files changed, 5 insertions(+), 10 deletions(-) (limited to 'web-ui/src/account_recovery/backup_account_step') diff --git a/web-ui/src/account_recovery/backup_account_step/backup_account_step.js b/web-ui/src/account_recovery/backup_account_step/backup_account_step.js index e0c31d88..891b45ec 100644 --- a/web-ui/src/account_recovery/backup_account_step/backup_account_step.js +++ b/web-ui/src/account_recovery/backup_account_step/backup_account_step.js @@ -16,7 +16,7 @@ */ import React from 'react'; import { translate } from 'react-i18next'; -import SubmitButton from 'src/common/submit_button/submit_button'; +import LinkButton from 'src/common/link_button/link_button'; export const BackupAccountStep = ({ t }) => (
@@ -26,9 +26,8 @@ export const BackupAccountStep = ({ t }) => ( alt={t('account-recovery.backup-account-step.image-description')} />

{t('account-recovery.backup-account-step.title')}

-
diff --git a/web-ui/src/account_recovery/backup_account_step/backup_account_step.spec.js b/web-ui/src/account_recovery/backup_account_step/backup_account_step.spec.js index 1d08670d..38a5e560 100644 --- a/web-ui/src/account_recovery/backup_account_step/backup_account_step.spec.js +++ b/web-ui/src/account_recovery/backup_account_step/backup_account_step.spec.js @@ -1,7 +1,7 @@ import { shallow } from 'enzyme'; import expect from 'expect'; import React from 'react'; -import SubmitButton from 'src/common/submit_button/submit_button'; +import LinkButton from 'src/common/link_button/link_button'; import { BackupAccountStep } from './backup_account_step'; describe('BackupAccountStep', () => { @@ -17,15 +17,11 @@ describe('BackupAccountStep', () => { }); it('renders submit button with given href', () => { - expect(backupAccountStep.find(SubmitButton).props().href).toEqual('/backup-account'); - }); - - it('renders submit button with given container element', () => { - expect(backupAccountStep.find(SubmitButton).props().containerElement).toEqual('a'); + expect(backupAccountStep.find(LinkButton).props().href).toEqual('/backup-account'); }); it('renders submit button with given button text', () => { - expect(backupAccountStep.find(SubmitButton).props().buttonText) + expect(backupAccountStep.find(LinkButton).props().buttonText) .toEqual('account-recovery.backup-account-step.buttonText'); }); }); -- cgit v1.2.3