Merge 9f6ce0b into b0223c2

package.json

@@ -8,7 +8,9 @@
     "coverage": "nyc report --reporter=text",
     "coveralls": "nyc report --reporter=text-lcov | coveralls",
     "lint": "eslint \"**/*.js\" --ignore-pattern node_modules/ --fix",
-    "build": "babel ./src -d dist",
+    "clean": "rm -rf ./dist && mkdir dist",
+    "build": "npm run clean && babel ./src -d dist",
+    "heroku-postbuild": "npm run build && npm run migrate:prod && sequelize db:seed:all",
     "start": "node dist/index.js",
     "start:dev": "nodemon --exec babel-node -- src/index.js",
     "migrate:dev": "sequelize db:migrate",
@@ -23,6 +25,13 @@
   "author": "Andela Simulations Programme",
   "license": "MIT",
   "dependencies": {
+    "@babel/cli": "^7.6.0",
+    "@babel/core": "^7.6.0",
+    "@babel/node": "^7.6.1",
+    "@babel/plugin-proposal-class-properties": "^7.5.5",
+    "@babel/plugin-proposal-nullish-coalescing-operator": "^7.4.4",
+    "@babel/plugin-proposal-optional-chaining": "^7.6.0",
+    "@babel/preset-env": "^7.6.0",
     "@hapi/joi": "^15.1.1",
     "@sendgrid/mail": "^6.4.0",
     "bcryptjs": "^2.4.3",
@@ -57,13 +66,6 @@
     "underscore": "^1.9.1"
   },
   "devDependencies": {
-    "@babel/cli": "^7.5.5",
-    "@babel/core": "^7.5.5",
-    "@babel/node": "^7.5.5",
-    "@babel/plugin-proposal-class-properties": "^7.5.5",
-    "@babel/plugin-proposal-nullish-coalescing-operator": "^7.4.4",
-    "@babel/plugin-proposal-optional-chaining": "^7.2.0",
-    "@babel/preset-env": "^7.5.5",
     "chai": "^4.2.0",
     "chai-http": "^4.3.0",
     "coveralls": "^3.0.6",

src/__tests__/routes/users/resetPassword.js

@@ -58,9 +58,9 @@ const seedTestDb = async () => {
 // Clear tables of seed
 const clearTestDb = async () => {
   try {
-    await models.User.destroy({ where: {}, force: true });
-    await models.Login.destroy({ where: {}, force: true });
-    await models.Reset.destroy({ where: {}, force: true });
+    await models.User.sync({ force: true });
+    await models.Login.sync({ force: true });
+    await models.Reset.sync({ force: true });
   } catch (err) {
     throw err;
   }

src/models/index.js

@@ -3,7 +3,6 @@ import Sequelize from 'sequelize';
 const env = process.env.NODE_ENV || 'development';
 // eslint-disable-next-line import/no-dynamic-require
 const config = require(`${__dirname}/../config/config.js`)[env];
-
 const sequelize = config.use_env_variable
   ? new Sequelize(process.env[config.use_env_variable], config)
   : new Sequelize(config.database, config.username, config.password, config);