Merge 69ccc04 into bee8fc5

andela · Oct 18, 2018 · bbe6cee · bbe6cee
2 parents bee8fc5 + 69ccc04
commit bbe6cee
Show file tree

Hide file tree

Showing 5 changed files with 8 additions and 87 deletions.
diff --git a/client/src/routes/AuthRoute.jsx b/client/src/routes/AuthRoute.jsx
diff --git a/client/src/routes/index.jsx b/client/src/routes/index.jsx
@@ -7,8 +7,8 @@ import 'react-toastify/dist/ReactToastify.css';
 import Favorite from '../modules/Teams/components/FavoriteTeams';
 import Home from '../modules/Home/container';
 import Preloader from '../modules/common/Preloader';
-import AuthRoute from './AuthRoute';
-import CreateTeamContainer from '../modules/CreateTeam/container';
+import SignIn from '../modules/Auth/container';
+import CreateTeam from '../modules/CreateTeam/container';
 import Teams from '../modules/Teams/container';
 import RequireAuth from './RequireAuth';
 
@@ -31,8 +31,8 @@ export default class Routes extends Component {
           <Switch>
             <Route path="/teams/favorites" exact component={RequireAuth(Favorite)} />
             <Route path="/teams" exact component={Home} />
-            <AuthRoute />
-            <Route path="/teams/create" component={RequireAuth(CreateTeamContainer)} />
+            <Route path="/" exact component={SignIn} />
+            <Route path="/teams/create" component={RequireAuth(CreateTeam)} />
             <Route path="/teams/:id" exact component={RequireAuth(Teams)} />
           </Switch>
         </React.Fragment>

diff --git a/client/src/tests/__mocks__/mockLocalStorage.js b/client/src/tests/__mocks__/mockLocalStorage.js
@@ -7,8 +7,4 @@ export default {
   removeItem(key) {
    return delete localStorage[key]; //eslint-disable-line
   },
-
-  getItem(key) {
-    return localStorage[key];
-  }
 };
diff --git a/client/src/tests/routes/AuthRoute.test.jsx b/client/src/tests/routes/AuthRoute.test.jsx
diff --git a/jest.config.js b/jest.config.js
@@ -11,14 +11,14 @@ module.exports = {
   ],
   'moduleNameMapper': {
     '\\.(jpg|jpeg|png|gif|eot|otf|webp|svg|ttf|woff|woff2|mp4|webm|wav|mp3|m4a|aac|oga)$': '<rootDir>/client/src/tests/__mocks__/assetsTransformer.js',
-    '\\.(css|less|scss)$': '<rootDir>/client/src/tests/__mocks__/assetsTransformer.js'
+    '\\.(css|less|scss)$': '<rootDir>/client/src/tests/__mocks__/assetsTransformer.js',
   },
   'collectCoverage': true,
-  'collectCoverageFrom': ["client/src/**/*.{js,jsx}"],
+  'collectCoverageFrom': ["client/src/**/*.jsx", "client/src/redux/**/*.js"],
   'testPathIgnorePatterns': [
-    '<rootDir>/client/src/tests/__mocks__'
+    '<rootDir>/client/src/tests/__mocks__',
   ],
-  'coveragePathIgnorePatterns': ['/node_modules', '<rootDir>/client/src/index.tsx', '<rootDir>/client/src/tests'],
+  'coveragePathIgnorePatterns': ['/node_modules', '<rootDir>/client/src/index.tsx', `'<rootDir>/client/src/tests'`],
   'snapshotSerializers': ['enzyme-to-json/serializer'],
   'setupTestFrameworkScriptFile': '<rootDir>/client/src/setupEnzyme.js'
 };