3 files changed, 115 insertions, 0 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
new file mode 100644
index 00000000..f1097b0b
--- /dev/null
+++ b/web-ui/src/account_recovery/new_password_form/new_password_form.js
@@ -0,0 +1,53 @@
+/*
+ * 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 <http://www.gnu.org/licenses/>.
+ */
+
+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 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'>
+    <img
+      className='account-recovery-progress'
+      src='/public/images/account-recovery/step_3.svg'
+      alt={t('account-recovery.new-password-form.image-description')}
+    />
+    <h1>{t('account-recovery.new-password-form.title')}</h1>
+    <InputField
+      type='password' name='new-password'
+      label={t('account-recovery.new-password-form.input-label1')}
+    />
+    <InputField
+      type='password' name='confirm-password'
+      label={t('account-recovery.new-password-form.input-label2')}
+    />
+    <SubmitButton buttonText={t('account-recovery.button-next')} />
+    <BackLink text={t('account-recovery.back')} onClick={previous} />
+  </form>
+);
+
+NewPasswordForm.propTypes = {
+  t: React.PropTypes.func.isRequired,
+  previous: React.PropTypes.func.isRequired
+};
+
+export default translate('', { wait: true })(NewPasswordForm);
diff --git a/web-ui/src/account_recovery/new_password_form/new_password_form.scss b/web-ui/src/account_recovery/new_password_form/new_password_form.scss
new file mode 100644
index 00000000..77623262
--- /dev/null
+++ b/web-ui/src/account_recovery/new_password_form/new_password_form.scss
@@ -0,0 +1,22 @@
+/*
+ * 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 <http://www.gnu.org/licenses/>.
+ */
+
+.new-password {
+  .input-field-group:first-of-type {
+    margin-bottom: 0;
+  }
+}
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
new file mode 100644
index 00000000..d2bd350c
--- /dev/null
+++ b/web-ui/src/account_recovery/new_password_form/new_password_form.spec.js
@@ -0,0 +1,40 @@
+import { shallow } from 'enzyme';
+import expect from 'expect';
+import React from 'react';
+import { NewPasswordForm } from './new_password_form';
+
+describe('NewPasswordForm', () => {
+  let newPasswordForm;
+  let mockPrevious;
+
+  beforeEach(() => {
+    const mockTranslations = key => key;
+    mockPrevious = expect.createSpy();
+    newPasswordForm = shallow(
+      <NewPasswordForm t={mockTranslations} previous={mockPrevious} />
+    );
+  });
+
+  it('renders title for new password form', () => {
+    expect(newPasswordForm.find('h1').text()).toEqual('account-recovery.new-password-form.title');
+  });
+
+  it('renders input for new password', () => {
+    expect(newPasswordForm.find('InputField').at(0).props().type).toEqual('password');
+    expect(newPasswordForm.find('InputField').at(0).props().label).toEqual('account-recovery.new-password-form.input-label1');
+  });
+
+  it('renders input to confirm new password', () => {
+    expect(newPasswordForm.find('InputField').at(1).props().type).toEqual('password');
+    expect(newPasswordForm.find('InputField').at(1).props().label).toEqual('account-recovery.new-password-form.input-label2');
+  });
+
+  it('renders submit button', () => {
+    expect(newPasswordForm.find('SubmitButton').props().buttonText).toEqual('account-recovery.button-next');
+  });
+
+  it('returns to previous step on link click', () => {
+    newPasswordForm.find('BackLink').simulate('click');
+    expect(mockPrevious).toHaveBeenCalled();
+  });
+});