fix merge conflict

andela · Jul 15, 2019 · bc788b3 · bc788b3
1 parent 1084833
commit bc788b3
Show file tree

Hide file tree

Showing 13 changed files with 74 additions and 132 deletions.
diff --git a/jest.config.js b/jest.config.js
@@ -15,7 +15,6 @@ module.exports = {
     '!jest.config.js',
     '!<rootDir>/server.js',
     '!webpack.common.js',
-    '!**/*.scss',
     '!webpack.dev.js',
     '!webpack.prod.js',
     '!**/src/App.jsx',

diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -23,8 +23,6 @@
   },
   "homepage": "https://github.com/andela/freyja-ah-frontend#readme",
   "dependencies": {
-    "@babel/polyfill": "^7.4.4",
-    "@babel/runtime": "^7.5.4",
     "@fortawesome/fontawesome-svg-core": "^1.2.19",
     "@fortawesome/free-brands-svg-icons": "^5.9.0",
     "@fortawesome/free-solid-svg-icons": "^5.9.0",

diff --git a/src/components/Heading/heading.js → src/components/Heading/Heading.js b/src/components/Heading/heading.js → src/components/Heading/Heading.js
diff --git a/src/components/Heading/heading.scss b/src/components/Heading/heading.scss
@@ -6,4 +6,4 @@ $color: #212529;
   margin-bottom: 3%;
   margin-top: 2%;
   text-align: center;
-}
+}
diff --git a/src/components/ResetPassword/ResetPassword.js b/src/components/ResetPassword/ResetPassword.js
@@ -3,6 +3,7 @@ import {
   CardText, CardBody, CardSubtitle, FormGroup,
 } from 'reactstrap';
 import { connect } from 'react-redux';
+import { FontAwesomeIcon } from '@fortawesome/react-fontawesome';
 import propTypes from 'prop-types';
 import './resetpassword.scss';
 import * as actions from '../../../store/actions/authActions/resetPassword';
@@ -12,6 +13,7 @@ import Input from '../Inputs/Input';
 import Footer from '../Footer/Footer';
 import { Header } from '../Header/Header';
 import { Heading } from '../Heading/Heading';
+
 /**
  * @description
  * @param
@@ -34,8 +36,7 @@ export class ResetPasswordCard extends Component {
   }
 
   handleSubmit() {
-    const { ResetPassword } = this.props;
-    const { history } = this.props;
+    const { ResetPassword, history } = this.props;
     const { email } = this.state;
     ResetPassword(email, history);
   }
@@ -49,7 +50,7 @@ export class ResetPasswordCard extends Component {
         <Card>
           <CardBody>
             <CardSubtitle>
-              <i className="fas fa-lock" />
+              <FontAwesomeIcon icon="lock" />
             </CardSubtitle>
             <Heading title="Forgot Password?" />
             <CardText>

diff --git a/src/components/ResetPassword/resetpassword.scss b/src/components/ResetPassword/resetpassword.scss
@@ -51,10 +51,6 @@ $success-color: #008000;
   .card-subtitle {
 		margin-bottom: 20px;
     text-align: center;
-
-    .fa-lock {
-      font-size: 50px;
-    }
   }
 
   .card-text {
@@ -67,8 +63,7 @@ $success-color: #008000;
     font-size: 20px;
 		line-height: 20px;
 		margin-bottom: 20px;
-    text-align: center;
-
+    text-align: center; 
   }
 
   .form-group {
@@ -117,7 +112,6 @@ $success-color: #008000;
 		  transition: 0.2s;
       width: 100%;
 
-
       &:hover {
         background-color: $form-color;
         opacity: 0.6;

diff --git a/src/index.html b/src/index.html
@@ -3,9 +3,7 @@
 
 <head>
   <title></title>
-  <link href="https://fonts.googleapis.com/css?family=Roboto:300,400,500&display=swap" rel="stylesheet">
   <meta name="viewport" content="width=device-width, initial-scale=1" />
-  <script src="https://kit.fontawesome.com/b86fe9836a.js"></script>
 </head>
 
 <body>

diff --git a/src/index.js b/src/index.js
@@ -2,17 +2,16 @@ import React from 'react';
 import ReactDom from 'react-dom';
 import { Provider } from 'react-redux';
 import { library } from '@fortawesome/fontawesome-svg-core';
-import '@babel/polyfill';
 import 'bootstrap/dist/css/bootstrap.min.css';
-import { faUserFriends, faCertificate, faPeopleCarry } from '@fortawesome/free-solid-svg-icons';
+import { faUserFriends, faCertificate, faPeopleCarry, faLock } from '@fortawesome/free-solid-svg-icons';
 import { fab } from '@fortawesome/free-brands-svg-icons';
 import { BrowserRouter } from 'react-router-dom';
 import Routes from './routes/routes';
 import store from '../store';
 
 import './style.css';
 
-library.add(faUserFriends, faCertificate, faPeopleCarry);
+library.add(faUserFriends, faCertificate, faPeopleCarry, faLock);
 
 library.add(fab);
 

diff --git a/src/test/actions/authActions/resetPassword.spec.js b/src/test/actions/authActions/resetPassword.spec.js
@@ -5,59 +5,54 @@ import { ResetPasswordCard } from '../../../components/ResetPassword/ResetPasswo
 
 
 describe('Test methods', () => {
-  beforeEach(() => {
-    sinon.spy(ResetPasswordCard.prototype, 'handleSubmit');
-    sinon.spy(ResetPasswordCard.prototype, 'handleEmail');
+  sinon.spy(ResetPasswordCard.prototype, 'handleSubmit');
+  sinon.spy(ResetPasswordCard.prototype, 'handleEmail');
+
+
+  function shallowSetup() {
+    const props = {
+      ResetPassword: () => {},
+      loading: true,
+      passwordResetSuccess: 'please check you email',
+      passwordResetError: 'invalid email',
+    };
+
+    const enzymeWrapper = shallow(<ResetPasswordCard {...props} />);
+
+    return {
+      props,
+      enzymeWrapper,
+    };
+  }
+
+  describe('Shallow rendered Reset password Card', () => {
+    it('should render a card with the details of the Reset password page', () => {
+      const { enzymeWrapper } = shallowSetup();
+      expect(enzymeWrapper.find('.error').text()).toBe('invalid email');
+      expect(enzymeWrapper.find('.success').text()).toBe('please check you email');
+      expect(enzymeWrapper.find('Button').text()).toBe('<Button />');
+      expect(enzymeWrapper.find('CardText').first().text()).toBe('<CardText />');
+    });
   });
-  it('should tes', () => {
-    expect(2).toBe(2);
-  });
-});
-
-function shallowSetup() {
-  const props = {
-    ResetPassword: () => {},
-    loading: true,
-    passwordResetSuccess: 'please check you email',
-    passwordResetError: 'invalid email',
-  };
-
-  const enzymeWrapper = shallow(<ResetPasswordCard {...props} />);
-
-  return {
-    props,
-    enzymeWrapper,
-  };
-}
-
-describe('Shallow rendered Reset password Card', () => {
-  it('should render a card with the details of the Reset password page', () => {
-    const { enzymeWrapper } = shallowSetup();
-    expect(enzymeWrapper.find('.error').text()).toBe('invalid email');
-    expect(enzymeWrapper.find('.success').text()).toBe('please check you email');
-    expect(enzymeWrapper.find('Button').text()).toBe('<Button />');
-    expect(enzymeWrapper.find('i').first().text()).toBe('');
-    expect(enzymeWrapper.find('CardText').first().text()).toBe('<CardText />');
-  });
-});
-
-describe('Reset Password', () => {
-  let wrapper;
-  beforeEach(() => {
-    const { enzymeWrapper } = shallowSetup();
-    wrapper = enzymeWrapper;
-  });
-  it('should update the state property _**`formOpen`**_ and call handleOpen when edit button is clicked', () => {
-    const button = wrapper.find('Button').first();
-    button.simulate('click');
-    expect(ResetPasswordCard.prototype.handleSubmit.calledOnce).toBe(true);
-  });
-
-  it('should display current values in edit fields', () => {
-    const input = wrapper.find('InputField');
-    const mockedEvent = { target: {} };
-    input.simulate('change', mockedEvent);
 
-    expect(ResetPasswordCard.prototype.handleEmail.calledOnce).toBe(true);
+  describe('Reset Password', () => {
+    let wrapper;
+    beforeEach(() => {
+      const { enzymeWrapper } = shallowSetup();
+      wrapper = enzymeWrapper;
+    });
+    it('should update the state property _**`formOpen`**_ and call handleOpen when edit button is clicked', () => {
+      const button = wrapper.find('Button').first();
+      button.simulate('click');
+      expect(ResetPasswordCard.prototype.handleSubmit.calledOnce).toBe(true);
+    });
+
+    it('should display current values in edit fields', () => {
+      const input = wrapper.find('InputField');
+      const mockedEvent = { target: {} };
+      input.simulate('change', mockedEvent);
+
+      expect(ResetPasswordCard.prototype.handleEmail.calledOnce).toBe(true);
+    });
   });
 });
diff --git a/src/test/components/heading.spec.js b/src/test/components/heading.spec.js
@@ -1,7 +1,7 @@
 import React from 'react';
 import { shallow } from 'enzyme';
 import toJson from 'enzyme-to-json';
-import { Heading } from '../../components/Heading/heading';
+import { Heading } from '../../components/Heading/Heading';
 
 const setUp = (props = {}) => {
   const component = shallow(<Heading {...props} title="create an account" />);

diff --git a/src/test/reducers/resetPassword.spec.js b/src/test/reducers/resetPassword.spec.js
@@ -7,27 +7,27 @@ describe('reset password reducer', () => {
   });
 
   it('should handle LOADING', () => {
-    expect(
-      reducer(initialState,
-        {
-          type: 'LOADING',
-        }),
-    ).toMatchSnapshot();
+    expect(reducer(
+      initialState,
+      {
+        type: 'LOADING',
+      },
+    )).toMatchSnapshot();
   });
   it('should handle PASSWORD_RESET_ERROR', () => {
-    expect(
-      reducer(initialState,
-        {
-          type: 'PASSWORD_RESET_ERROR',
-        }),
-    ).toMatchSnapshot();
+    expect(reducer(
+      initialState,
+      {
+        type: 'PASSWORD_RESET_ERROR',
+      },
+    )).toMatchSnapshot();
   });
   it('should handle PASSWORD_RESET_SUCCESS', () => {
-    expect(
-      reducer(initialState,
-        {
-          type: 'PASSWORD_RESET_SUCCESS',
-        }),
-    ).toMatchSnapshot();
+    expect(reducer(
+      initialState,
+      {
+        type: 'PASSWORD_RESET_SUCCESS',
+      },
+    )).toMatchSnapshot();
   });
 });
diff --git a/store/reducers/authReducer.js~HEAD b/store/reducers/authReducer.js~HEAD