From b4b338d758a0c17d3fce7b490a806750ef14525e Mon Sep 17 00:00:00 2001
From: douglas <douglascvas@gmail.com>
Date: Wed, 5 Sep 2018 18:41:22 +1000
Subject: [PATCH] #30 - Trying to fix build in circleci

---
 backend/src/main/database/RefreshDatabase.js          | 2 +-
 backend/src/test/rides/CreateRide.integration.test.js | 6 +++---
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/backend/src/main/database/RefreshDatabase.js b/backend/src/main/database/RefreshDatabase.js
index e7c9f9ee..193d4486 100644
--- a/backend/src/main/database/RefreshDatabase.js
+++ b/backend/src/main/database/RefreshDatabase.js
@@ -25,7 +25,7 @@ class RefreshDatabase {
       .then(() => {
         let result = Promise.resolve();
         changeSet.forEach(fileName => {
-          result = result.then(this.execute(fileName, this.databaseManager))
+          result = result.then(() => this.execute(fileName, this.databaseManager))
         });
         return result;
       })
diff --git a/backend/src/test/rides/CreateRide.integration.test.js b/backend/src/test/rides/CreateRide.integration.test.js
index 3459c250..6784f5d2 100644
--- a/backend/src/test/rides/CreateRide.integration.test.js
+++ b/backend/src/test/rides/CreateRide.integration.test.js
@@ -20,10 +20,10 @@ let pickupTimeAndDateInUTC;
 
 before(async () => {
   databaseManager = new DatabaseManager();
-  mockDatabaseManager = new DatabaseManager();
   connection = databaseManager.createConnection() ;
+  mockDatabaseManager = new DatabaseManager();
   mockDatabaseManager.createConnection = () => connection;
-  mockDatabaseManager.closeConnection = () => null;
+  mockDatabaseManager.closeConnection = () => Promise.resolve();
 });
 
 after(async () => {
@@ -42,7 +42,7 @@ afterEach(async () => {
 });
 
 beforeEach(function setupData() {
-  loginData = {email: RandomUtils.randomEmail()}
+  loginData = {email: RandomUtils.randomEmail()};
   pickupTimeAndDateInUTC = moment();
   const clientEmail = `client.test.${Date.now()}@carpal.com`;
   rideRequest = {