From 3ab484e2cc758d192b084ad7186c4bb34f35013a Mon Sep 17 00:00:00 2001
From: marcos8896 <elyomarcos@gmail.com>
Date: Fri, 7 Sep 2018 13:03:05 -0500
Subject: [PATCH] (#33) - Add integrationTestSetup usage to the diet.service
 tests

---
 .../__tests__/integration/diet.service.js     | 56 ++++++++-----------
 1 file changed, 23 insertions(+), 33 deletions(-)

diff --git a/common/services/__tests__/integration/diet.service.js b/common/services/__tests__/integration/diet.service.js
index 2d03dd9..32eb632 100644
--- a/common/services/__tests__/integration/diet.service.js
+++ b/common/services/__tests__/integration/diet.service.js
@@ -1,67 +1,58 @@
 'use strict';
 
-const {
-  getModelsSeeds,
-  getFakeModelsArray,
-  findSeedModel,
-} = require( '../../../../dev/testing/fixtures-utils' );
+jest.unmock( 'axios' );
 
-const {
-  resetTables,
-} = require( '../../../../dev/testing/database-utils' );
+const { integrationTestSetup } = require( '../../../../dev/testing/environment-utils' );
 
-const {
-  getBaseURLWithPort,
-  createTestingDatabase,
-  getApiTestPort,
-} = require( '../../../../dev/testing/environment-utils' );
+const { resetTables } = require( '../../../../dev/testing/database-utils' );
 
 const {
   createApiUnauth,
   createRegularCustomerApiAuth,
 } = require( '../../../../dev/testing/auth-utils' );
 
-const app = require( '../../../../server/server' );
+const {
+  getFakeModelsArray,
+  findSeedModel,
+} = require( '../../../../dev/testing/fixtures-utils' );
 
-jest.unmock( 'axios' );
+const app = require( '../../../../server/server' );
 
 let server, seedModels, apiPort, baseURL;
+const { Diet, Diet_Food_Detail } = app.models;
+const currentModels = ['Diet', 'Diet_Food_Detail', 'Customer', 'Administrator'];
+
+//---------------------------------------------------------------------
 
 const resetCurrentModels = () => {
 
   return resetTables(
     app.dataSources.mysql_ds,
-    ['Diet', 'Diet_Food_Detail', 'Customer']
+    currentModels,
   );
 
 };
 
-const { Diet, Diet_Food_Detail } = app.models;
-//---------------------------------------------------------------------
-
 beforeAll( async () => {
 
-  const [allModelSeeds] = await Promise.all( [
-    getModelsSeeds(),
-    createTestingDatabase(),
-  ] ).catch( err => {
-
-    throw err;
-
+  const {
+    retunedApiPort,
+    retunedBaseURL,
+    retunedSeedModels,
+  } = await integrationTestSetup({
+    datasource: app.dataSources.mysql_ds,
+    dbModelsToReset: currentModels,
   });
 
-  apiPort = getApiTestPort();
-  baseURL = getBaseURLWithPort( apiPort );
-  seedModels = allModelSeeds;
-
-  await resetCurrentModels();
+  apiPort = retunedApiPort;
+  baseURL = retunedBaseURL;
+  seedModels = retunedSeedModels;
 
 });
 
 
 beforeEach( () => server = app.listen( apiPort ) );
 
-
 afterEach( async () => {
 
   await resetCurrentModels();
@@ -69,7 +60,6 @@ afterEach( async () => {
 
 });
 
-
 describe( 'fullDietRegistration endpoint', () => {
 
   let dietSeedModel, dietSeedDetails;