Merge branch 'stage' of https://github.com/andela/firestar-backend in…

…to ft-signup-user-167730738

.eslintrc

@@ -10,6 +10,7 @@
       "one-var": 0,
       "one-var-declaration-per-line": 0,
       "new-cap": 0,
+      "no-useless-catch":0,
       "consistent-return": 0,
       "no-param-reassign": 0,
       "comma-dangle": 0,

package.json

@@ -10,7 +10,7 @@
     "lint": "eslint \"**/*.js\" --ignore-pattern node_modules/ --fix",
     "clean": "rm -rf ./dist && mkdir dist",
     "build": "npm run clean && babel ./src -d dist",
-    "heroku-postbuild": "npm run build && npm run undo:prod && npm run migrate:prod && sequelize db:seed:all",
+    "heroku-postbuild": "npm run build && npm run migrate:prod",
     "start": "node dist/index.js",
     "test:script": "cross-env NODE_ENV=development babel-node src/helpers/test.js",
     "start:dev": "cross-env NODE_ENV=development nodemon --exec babel-node -- src/index.js",

src/__tests__/routes/users/resetPassword.js

@@ -47,7 +47,7 @@ const seedTestDb = async () => {
     email: 'youremail3@andela.com',
     expireTime: new Date(),
     resetToken: '$2a$10$Yc4fNidn3ih0Z0wRajFhq.AwneQLYR2RWWYQT7PGJdJj4UN1BGJ1K'
-  }),
+  });
 
   await db.resets.create({
     email: 'youremail4@andela.com',
@@ -173,4 +173,4 @@ describe('Forgot and Reset Password Test', () => {
       });
     });
   });
-});
+});