fixed and refactored tests

Author: tomashq

helpers/amadeus/amadeusUtils.js

@@ -58,7 +58,7 @@ const amadeusEndpointRequest = async (ndcBody, action) => {
         response = await amadeusClient.booking.hotelBookings.post(requestStr);
         break;
     }
-    logRQRS(ndcBody, `${action}-response`);
+    logRQRS(response, `${action}-response`);
   } catch (error) {
     logRQRS(error, `${action}-error`);
     let errorMessage = 'Unknown error occurred'; //default error message
@@ -92,10 +92,39 @@ const assertAmadeusFault = (response, error) => {
 };
 
 
+const flightOffersSearch = async (request) => {
+  return await amadeusEndpointRequest(request, REQUESTS.SEARCHOFFERS);
+};
+
+const seatmapRequest = async (request) => {
+  return await amadeusEndpointRequest(request, REQUESTS.SEATMAP);
+};
+
+const flightOfferPrice = async (request) => {
+  return await amadeusEndpointRequest(request, REQUESTS.PRICEOFFERS);
+};
+
+const flightOrderCreate = async (request) => {
+  return await amadeusEndpointRequest(request, REQUESTS.ORDERCREATE);
+};
+
+const hotelSearch = async (request) => {
+  return await amadeusEndpointRequest(request, REQUESTS.HOTEL_SEARCH);
+};
+
+const hotelBook = async (request) => {
+  return await amadeusEndpointRequest(request, REQUESTS.HOTEL_ORDER_CREATE);
+};
+
 module.exports = {
   transformAmadeusFault,
   assertAmadeusFault,
   getAmadeusClient,
-  amadeusEndpointRequest: amadeusEndpointRequest,
-  REQUESTS,
+  amadeusEndpointRequest,
+  flightOffersSearch,
+  seatmapRequest,
+  flightOfferPrice,
+  flightOrderCreate,
+  hotelSearch,
+  hotelBook
 };

test/spec/error.js renamed to helpers/error.test.js

@@ -1,7 +1,7 @@
-const GliderError = require('../../helpers/error');
+const GliderError = require('./error');
 require('chai').should();
 
-describe('Helpers/error', () => {
+describe('GliderError', () => {
   const message = 'Error message';
   const status = 404;
   const code = 'KIND_OF_ERROR';

test/spec/jwt.js renamed to helpers/jwt.test.js

@@ -1,10 +1,10 @@
 const { JWK, JWT } = require('jose');
 require('dotenv').config();
 
-const { assertFailure } = require('../helpers/assertions');
-const { privPem, pubPem } = require('../helpers/constants');
-const { createToken } = require('../helpers/create');
-const { verifyJWT } = require('../../helpers/jwt');
+const { assertFailure } = require('../test/helpers/assertions');
+const { privPem, pubPem } = require('../test/helpers/constants');
+const { createToken } = require('../test/helpers/create');
+const { verifyJWT } = require('./jwt');
 
 require('chai').should();
 
@@ -14,55 +14,50 @@ describe('JWT', () => {
   const exp = '24 hours';
   let priv = privPem;
   let pub = pubPem;
+  describe('#createJWT', () => {
+
+    it('should create a valid JWT token signed with secp256k1', async () => {
+      const options = {
+        priv,
+        alg: 'ES256K',
+        aud,
+        iss,
+        fragment: 'test',
+        exp,
+      };
+
+      const jwt = await createToken(options);
+      const pubKey = JWK.asKey(
+        pub,
+        {
+          alg: options.alg,
+          use: 'sig',
+        },
+      );
+      const token = JWT.verify(
+        jwt,
+        pubKey,
+        {
+          typ: 'JWT',
+          audience: options.aud,
+          clockTolerance: '1 min',
+        },
+      );
 
-  describe('Test helpers', () => {
-
-    describe('#createJWT', () => {
-
-      it('should create a valid JWT token signed with secp256k1', async () => {
-        const options = {
-          priv,
-          alg: 'ES256K',
-          aud,
-          iss,
-          fragment: 'test',
-          exp
-        };
-
-        const jwt = await createToken(options);
-        const pubKey = JWK.asKey(
-          pub,
-          {
-            alg: options.alg,
-            use: 'sig'
-          }
-        );
-        const token = JWT.verify(
-          jwt,
-          pubKey,
-          {
-            typ: 'JWT',
-            audience: options.aud,
-            clockTolerance: '1 min'
-          }
-        );
-
-        (token).should.be.an('object');
-        (token).should.has.property('iss').to.equal(`${options.iss}#${options.fragment}`);
-        (token).should.has.property('aud').to.equal(options.aud);
-        (token).should.has.property('exp').to.be.a('number');
-      });
+      (token).should.be.an('object');
+      (token).should.has.property('iss').to.equal(`${options.iss}#${options.fragment}`);
+      (token).should.has.property('aud').to.equal(options.aud);
+      (token).should.has.property('exp').to.be.a('number');
     });
   });
-
   describe('#verifyJWT', () => {
     const secp256k1Options = {
       priv,
       alg: 'ES256K',
       aud,
       iss,
       fragment: 'test',
-      exp
+      exp,
     };
     let secp256k1Jwt;
 
@@ -74,56 +69,56 @@ describe('JWT', () => {
       await assertFailure(
         verifyJWT('Unknown', secp256k1Jwt),
         'Unknown authorization method',
-        403
+        403,
       );
     });
 
     it('should fail if wrong JWT token provided', async () => {
       await assertFailure(
         verifyJWT('Bearer', 'wrong' + secp256k1Jwt),
         'JWT is malformed',
-        403
+        403,
       );
     });
 
     it('should fail if expired token provided', async () => {
       const token = await createToken(
-        Object.assign({}, secp256k1Options, { exp: '0 s' })
+        Object.assign({}, secp256k1Options, { exp: '0 s' }),
       );
       await assertFailure(
         verifyJWT('Bearer', token),
         'JWT is expired',
-        403
+        403,
       );
     });
 
     it('should fail if token not meant for Glider', async () => {
       const token = await createToken(
-        Object.assign({}, secp256k1Options, { aud: 'not:glider' })
+        Object.assign({}, secp256k1Options, { aud: 'not:glider' }),
       );
       await assertFailure(
         verifyJWT('Bearer', token),
         'JWT recipient is not Glider',
-        403
+        403,
       );
     });
 
     it('should fail if issuer not provided', async () => {
       const token = await createToken(
-        Object.assign({}, secp256k1Options, { iss: '', fragment: '' })
+        Object.assign({}, secp256k1Options, { iss: '', fragment: '' }),
       );
       await assertFailure(
         verifyJWT('Bearer', token),
         'JWT is missing issuing ORG.ID',
-        403
+        403,
       );
     });
 
     it('should fail if signature not valid', async () => {
       await assertFailure(
         verifyJWT('Bearer', secp256k1Jwt + 'wrong=='),
         'JWT signature verification failed',
-        403
+        403,
       );
     });
 

test/spec/parsers.js renamed to helpers/parsers/parsers.test.js

@@ -1,6 +1,6 @@
 // const { assertFailure } = require('../../helpers/assertions');
 const { zonedTimeToUtc } = require('date-fns-tz');
-const { airports } = require('../../helpers/parsers/timeZoneByAirportCode');
+const { airports } = require('./timeZoneByAirportCode');
 const {
   reduceObjectToProperty,
   splitPropertyBySpace,
@@ -17,7 +17,7 @@ const {
 
 require('chai').should();
 
-describe('Helpers/parsers', () => {
+describe('Parsers', () => {
 
   describe('#reduceObjectToProperty', () => {
     const arr = [
@@ -413,7 +413,7 @@ describe('Helpers/parsers', () => {
         (typeof a[prop]).should.to.equal('undefined');
       });
     });
-    
+
     it('should fulfill', async () => {
       const result = reduceToProperty(data, 'prop');
       result.forEach(a => {

test/payload/validators/createWithOffer.json renamed to helpers/payload/validators/testdata/createWithOffer.json

@@ -3,7 +3,7 @@ const GliderError = require('../../../helpers/error');
 const assert = require('chai').assert;
 
 describe('/createWithOffer payload validator', () => {
-  let payloads = require('./createWithOffer.json');
+  let payloads = require('./testdata/createWithOffer.json');
 
   describe('valid payload', () => {
     payloads.valid.forEach(payload => {
@@ -26,7 +26,7 @@ describe('/createWithOffer payload validator', () => {
 
 
 describe('/searchOffers payload validator', () => {
-  let payloads = require('./searchOffers.json');
+  let payloads = require('./testdata/searchOffers.json');
   describe('valid payload', () => {
     payloads.valid.forEach(payload => {
       it('should pass validation on valid payload', () => {
@@ -47,7 +47,7 @@ describe('/searchOffers payload validator', () => {
 });
 
 describe('/offers payload validator', () => {
-  let payloads = require('./offersPrice.json');
+  let payloads = require('./testdata/offersPrice.json');
   describe('valid payload', () => {
     payloads.valid.forEach(payload => {
       it('should pass validation on valid payload', () => {

test/payload/validators/offersPrice.json renamed to helpers/payload/validators/testdata/offersPrice.json

@@ -35,7 +35,7 @@ const {
   FaultsTransformTemplate_AC: FulfillFaultsTransformTemplate_AC,
 } = require('./camaroTemplates/fulfillOrder');
 
-module.exports = class FlightProviderAC extends FlightProvider {
+class FlightProviderAC extends FlightProvider {
   constructor () {
     super();
   }
@@ -82,3 +82,5 @@ module.exports = class FlightProviderAC extends FlightProvider {
   }
 };
 
+
+module.exports = { FlightProviderAC };

test/payload/validators/searchOffers.json renamed to helpers/payload/validators/testdata/searchOffers.json

@@ -1,28 +1,28 @@
-const regex = require('../../../../helpers/matches');
+const regex = require('../../../../../test/helpers/matches');
 const {
   airCanadaConfig,
 } = require('../../../../../config');
 const { expandPassengers } = require('../../../../../helpers/providers/flights/ndc/transformInputData/expandPassengers');
-const { mapNdcRequestData_AC } = require('../../../../../helpers/providers/flights/ac/transformInputData/searchOffers');
+const { mapNdcRequestData_AC } = require('./searchOffers');
 const {
   mapNdcRequestData_AC: mapNdcRequestData_AC_offerPrice,
-} = require('../../../../../helpers/providers/flights/ac/transformInputData/offerPrice');
+} = require('./offerPrice');
 const {
   mapNdcRequestData_AC: mapNdcRequestData_AC_seatAvailability,
-} = require('../../../../../helpers/providers/flights/ac/transformInputData/seatAvailability');
+} = require('./seatAvailability');
 const {
   mapNdcRequestData_AC: mapNdcRequestData_AC_fulfillOrder,
-} = require('../../../../../helpers/providers/flights/ac/transformInputData/fulfillOrder');
+} = require('./fulfillOrder');
 const {
   getACSystemIdOrderCreateRQ,
   mapNdcRequestHeaderData_AC,
   mapNdcRequestData_AC: mapNdcRequestData_AC_createOrder,
-} = require('../../../../../helpers/providers/flights/ac/transformInputData/createOrder');
+} = require('./createOrder');
 
 require('chai').should();
 
 
-describe('flights/ac/transformInputData', () => {
+describe('providers/flights/ac/transformInputData', () => {
   const docIds = [
     'OneWay',
     'Return',

test/payload/validators/pyaloadValidatorsTest.test.js renamed to helpers/payload/validators/validators.test.js

@@ -16,7 +16,7 @@ const { ErrorsTransformTemplate_AF: OrderCreateErrorsTransformTemplate_AF } = re
 const { ErrorsTransformTemplate_AF: FulfillErrorsTransformTemplate_AF } = require('./camaroTemplates/fulfillOrder');
 
 
-module.exports = class FlightProviderAF extends FlightProvider {
+class FlightProviderAF extends FlightProvider {
   constructor () {
     super();
   }
@@ -62,3 +62,4 @@ module.exports = class FlightProviderAF extends FlightProvider {
   }
 };
 
+module.exports = { FlightProviderAF };