Selaa lähdekoodia

PROD-1221: Fixed prettier/eslint npm config

 *  Wasn't globbing all JavaScript files, now uses `find`
Blake Schneider 5 vuotta sitten
vanhempi
commit
e54d568e66
27 muutettua tiedostoa jossa 750 lisäystä ja 693 poistoa
  1. 45 18
      __tests__/integration/end-to-end.spec.js
  2. 4 4
      __tests__/unit/db/ven.spec.js
  3. 14 5
      __tests__/unit/modules/certificate.spec.js
  4. 11 9
      __tests__/unit/modules/nantum-responses.js
  5. 38 18
      __tests__/unit/processes/event.spec.js
  6. 69 28
      __tests__/unit/processes/registration.spec.js
  7. 6 6
      __tests__/unit/xml/event/created-event.spec.js
  8. 12 7
      __tests__/unit/xml/event/distribute-event.spec.js
  9. 15 17
      __tests__/unit/xml/event/js-requests.js
  10. 433 499
      __tests__/unit/xml/event/js-responses.js
  11. 6 6
      __tests__/unit/xml/event/request-event.spec.js
  12. 1 1
      __tests__/unit/xml/event/xml-requests.js
  13. 1 1
      __tests__/unit/xml/event/xml-responses.js
  14. 5 5
      __tests__/unit/xml/poll/js-requests.js
  15. 6 6
      __tests__/unit/xml/poll/js-responses.js
  16. 6 6
      __tests__/unit/xml/poll/oadr-poll.spec.js
  17. 6 6
      __tests__/unit/xml/poll/oadr-response.spec.js
  18. 10 7
      __tests__/unit/xml/register-party/cancel-party-registration.spec.js
  19. 10 6
      __tests__/unit/xml/register-party/canceled-party-registration.spec.js
  20. 19 11
      __tests__/unit/xml/register-party/create-party-registration.spec.js
  21. 10 6
      __tests__/unit/xml/register-party/created-party-registration.spec.js
  22. 4 6
      __tests__/unit/xml/register-party/js-requests.js
  23. 2 2
      __tests__/unit/xml/register-party/js-responses.js
  24. 10 6
      __tests__/unit/xml/register-party/query-registration.spec.js
  25. 1 1
      __tests__/unit/xml/register-party/xml-requests.js
  26. 3 3
      modules/nantum.js
  27. 3 3
      package.json

+ 45 - 18
__tests__/integration/end-to-end.spec.js

@@ -11,9 +11,7 @@ const { sequelize, Ven: VenDb } = require('../../db');
 const { port } = require('../../config');
 
 describe('VEN to VTN interactions', function() {
-
   describe('registration and event retrieval', async function() {
-
     let clock;
 
     after(async () => {
@@ -23,12 +21,23 @@ describe('VEN to VTN interactions', function() {
     let ven;
 
     before(async () => {
-      clock = sinon.useFakeTimers(new Date('2020-04-26T01:00:00.000Z').getTime());
+      clock = sinon.useFakeTimers(
+        new Date('2020-04-26T01:00:00.000Z').getTime(),
+      );
       await sequelize.sync();
-      await VenDb.destroy({ truncate : true});
+      await VenDb.destroy({ truncate: true });
       await app.start();
-      const clientCrtPem = readFileSync(path.join(__dirname, 'integration-client.crt'), 'utf-8');
-      ven = new Ven(`http://127.0.0.1:${port}`, clientCrtPem, 'aabbccddeeff', '17:32:59:FD:0E:B5:99:31:27:9C', 'ven.js1');
+      const clientCrtPem = readFileSync(
+        path.join(__dirname, 'integration-client.crt'),
+        'utf-8',
+      );
+      ven = new Ven(
+        `http://127.0.0.1:${port}`,
+        clientCrtPem,
+        'aabbccddeeff',
+        '17:32:59:FD:0E:B5:99:31:27:9C',
+        'ven.js1',
+      );
     });
 
     it('should successfully return a vtnId from queryRegistration', async () => {
@@ -64,7 +73,6 @@ describe('VEN to VTN interactions', function() {
     after(async () => {
       await app.stop();
     });
-
   });
 
   describe('poll', async function() {
@@ -77,12 +85,23 @@ describe('VEN to VTN interactions', function() {
     });
 
     before(async () => {
-      clock = sinon.useFakeTimers(new Date('2020-04-26T01:00:00.000Z').getTime());
+      clock = sinon.useFakeTimers(
+        new Date('2020-04-26T01:00:00.000Z').getTime(),
+      );
       await sequelize.sync();
-      await VenDb.destroy({ truncate : true});
+      await VenDb.destroy({ truncate: true });
       await app.start();
-      const clientCrtPem = readFileSync(path.join(__dirname, 'integration-client.crt'), 'utf-8');
-      ven = new Ven(`http://127.0.0.1:${port}`, clientCrtPem, 'aabbccddeeff', '17:32:59:FD:0E:B5:99:31:27:9C', 'ven.js1');
+      const clientCrtPem = readFileSync(
+        path.join(__dirname, 'integration-client.crt'),
+        'utf-8',
+      );
+      ven = new Ven(
+        `http://127.0.0.1:${port}`,
+        clientCrtPem,
+        'aabbccddeeff',
+        '17:32:59:FD:0E:B5:99:31:27:9C',
+        'ven.js1',
+      );
       await ven.register();
     });
 
@@ -95,11 +114,9 @@ describe('VEN to VTN interactions', function() {
     after(async () => {
       await app.stop();
     });
-
   });
 
   describe('optIn', async function() {
-
     let clock;
 
     after(async () => {
@@ -109,12 +126,23 @@ describe('VEN to VTN interactions', function() {
     let ven, events, pollResponse;
 
     before(async () => {
-      clock = sinon.useFakeTimers(new Date('2020-04-26T01:00:00.000Z').getTime());
+      clock = sinon.useFakeTimers(
+        new Date('2020-04-26T01:00:00.000Z').getTime(),
+      );
       await sequelize.sync();
-      await VenDb.destroy({ truncate : true});
+      await VenDb.destroy({ truncate: true });
       await app.start();
-      const clientCrtPem = readFileSync(path.join(__dirname, 'integration-client.crt'), 'utf-8');
-      ven = new Ven(`http://127.0.0.1:${port}`, clientCrtPem, 'aabbccddeeff', '17:32:59:FD:0E:B5:99:31:27:9C', 'ven.js1');
+      const clientCrtPem = readFileSync(
+        path.join(__dirname, 'integration-client.crt'),
+        'utf-8',
+      );
+      ven = new Ven(
+        `http://127.0.0.1:${port}`,
+        clientCrtPem,
+        'aabbccddeeff',
+        '17:32:59:FD:0E:B5:99:31:27:9C',
+        'ven.js1',
+      );
       await ven.register();
       pollResponse = await ven.poll();
       events = pollResponse.events;
@@ -143,6 +171,5 @@ describe('VEN to VTN interactions', function() {
     after(async () => {
       await app.stop();
     });
-
   });
 });

+ 4 - 4
__tests__/unit/db/ven.spec.js

@@ -5,13 +5,11 @@ const { sequelize, Ven } = require('../../../db');
 const { v4 } = require('uuid');
 
 describe('VEN Model', function() {
-
   before(async () => {
     await sequelize.sync();
   });
-  
-  describe('Retrieval', function() {
 
+  describe('Retrieval', function() {
     it('returns no results for unknown ven_id', async () => {
       const randomVenId = v4();
       const existing = await Ven.findOne({ where: { ven_id: randomVenId } });
@@ -37,7 +35,9 @@ describe('VEN Model', function() {
       ven.ven_id = randomVenId;
       ven.common_name = randomCommonName;
       await ven.save();
-      const existing = await Ven.findOne({ where: { common_name: randomCommonName } });
+      const existing = await Ven.findOne({
+        where: { common_name: randomCommonName },
+      });
       expect(existing).to.not.be.undefined;
       expect(existing.common_name).to.eql(randomCommonName);
     });

+ 14 - 5
__tests__/unit/modules/certificate.spec.js

@@ -10,13 +10,22 @@ const {
 } = require('../../../modules/certificate');
 
 describe('Certificate management', function() {
-
   describe('calculatePartialFingerprintOfEscapedPemCertificate', function() {
-
-    it ('generates correct fingerprint for integration certificate', async () => {
-      const clientCrtPem = readFileSync(path.join(__dirname, '..', '..', 'integration', 'integration-client.crt'), 'utf-8');
+    it('generates correct fingerprint for integration certificate', async () => {
+      const clientCrtPem = readFileSync(
+        path.join(
+          __dirname,
+          '..',
+          '..',
+          'integration',
+          'integration-client.crt',
+        ),
+        'utf-8',
+      );
       const escaped = escape(clientCrtPem);
-      const fingerprint = calculatePartialFingerprintOfEscapedPemCertificate(escaped);
+      const fingerprint = calculatePartialFingerprintOfEscapedPemCertificate(
+        escaped,
+      );
       expect(fingerprint).to.eql('17:32:59:FD:0E:B5:99:31:27:9C');
     });
   });

+ 11 - 9
__tests__/unit/modules/nantum-responses.js

@@ -15,16 +15,18 @@ const sampleEvent1 = {
     notification_time: '2020-04-25T22:50:00.000Z',
     start_time: '2020-04-26T23:00:00.000Z',
     end_time: '2020-04-26T23:55:00.000Z',
-    event_instance: [{
-      event_type_id: 'LOAD_AMOUNT',
-      event_info_values: [
-        {value: 41, timeOffset: 0},
-        {value: 42, timeOffset: 10}
-      ]
-    }]
-  }
+    event_instance: [
+      {
+        event_type_id: 'LOAD_AMOUNT',
+        event_info_values: [
+          { value: 41, timeOffset: 0 },
+          { value: 42, timeOffset: 10 },
+        ],
+      },
+    ],
+  },
 };
 
 module.exports = {
-  sampleEvent1
+  sampleEvent1,
 };

+ 38 - 18
__tests__/unit/processes/event.spec.js

@@ -5,17 +5,12 @@ const { v4 } = require('uuid');
 const sinon = require('sinon');
 const rewire = require('rewire');
 
-const {
-  requestEvent1,
-  createdEvent1
-} = require('../xml/event/js-requests');
+const { requestEvent1, createdEvent1 } = require('../xml/event/js-requests');
 
-const {
-  oadrPoll1,
-} = require('../xml/poll/js-requests');
+const { oadrPoll1 } = require('../xml/poll/js-requests');
 
 const { generatedFromNantumEvent1 } = require('../xml/event/js-responses');
-const {sampleEvent1 } = require('../modules/nantum-responses');
+const { sampleEvent1 } = require('../modules/nantum-responses');
 
 describe('Event', function() {
   let clock;
@@ -40,18 +35,23 @@ describe('Event', function() {
         fetchEvent: fetchEventStub,
         updateRegistration: async newRegistration => {
           registration = newRegistration;
-        }
+        },
       },
     });
   });
 
   describe('retrieveEvents', function() {
-
     it('translates nantum event to oadr event', async () => {
       const venId = requestEvent1.venId;
-      const commonName = v4().replace(/-/g, '').substring(0, 12);
+      const commonName = v4()
+        .replace(/-/g, '')
+        .substring(0, 12);
 
-      const events = await rewired.retrieveEvents(requestEvent1, commonName, venId);
+      const events = await rewired.retrieveEvents(
+        requestEvent1,
+        commonName,
+        venId,
+      );
       expect(events).to.eql(generatedFromNantumEvent1);
     });
   });
@@ -59,21 +59,41 @@ describe('Event', function() {
   describe('poll and updateOptType', function() {
     it('should return the same event on subsequent polls if it has not been opted', async () => {
       const venId = oadrPoll1.venId;
-      const commonName = v4().replace(/-/g, '').substring(0, 12);
-      const pollResponse1 = await rewired.pollForEvents(oadrPoll1, commonName, venId);
+      const commonName = v4()
+        .replace(/-/g, '')
+        .substring(0, 12);
+      const pollResponse1 = await rewired.pollForEvents(
+        oadrPoll1,
+        commonName,
+        venId,
+      );
       expect(pollResponse1.events.length).to.eql(1);
-      const pollResponse2 = await rewired.pollForEvents(oadrPoll1, commonName, venId);
+      const pollResponse2 = await rewired.pollForEvents(
+        oadrPoll1,
+        commonName,
+        venId,
+      );
       expect(pollResponse2.events.length).to.eql(1);
     });
 
     it('should not return an opted event in subsequent poll response', async () => {
       const venId = oadrPoll1.venId;
-      const commonName = v4().replace(/-/g, '').substring(0, 12);
-      const pollResponse1 = await rewired.pollForEvents(oadrPoll1, commonName, venId);
+      const commonName = v4()
+        .replace(/-/g, '')
+        .substring(0, 12);
+      const pollResponse1 = await rewired.pollForEvents(
+        oadrPoll1,
+        commonName,
+        venId,
+      );
       expect(pollResponse1.events.length).to.eql(1);
 
       await rewired.updateOptType(createdEvent1, commonName, venId);
-      const pollResponse2 = await rewired.pollForEvents(oadrPoll1, commonName, venId);
+      const pollResponse2 = await rewired.pollForEvents(
+        oadrPoll1,
+        commonName,
+        venId,
+      );
       expect(pollResponse2).to.be.undefined;
     });
   });

+ 69 - 28
__tests__/unit/processes/registration.spec.js

@@ -11,19 +11,24 @@ const {
 } = require('../../../processes/registration');
 
 describe('VEN registration', function() {
-
   before(async () => {
     await sequelize.sync();
   });
 
   describe('registerParty', function() {
-
     let venId, commonName, registrationResponse;
 
     beforeEach(async () => {
-      venId = v4().replace(/-/g, '').substring(0, 20).toUpperCase().match(/.{2}/g).join(':');
+      venId = v4()
+        .replace(/-/g, '')
+        .substring(0, 20)
+        .toUpperCase()
+        .match(/.{2}/g)
+        .join(':');
       const requestId = v4().replace(/-/g, '');
-      commonName = v4().replace(/-/g, '').substring(0, 12);
+      commonName = v4()
+        .replace(/-/g, '')
+        .substring(0, 12);
       const request = {
         requestId: requestId,
         venId: venId,
@@ -32,7 +37,7 @@ describe('VEN registration', function() {
         oadrReportOnly: false,
         oadrXmlSignature: false,
         oadrVenName: `VEN ${commonName}`,
-        oadrHttpPullModel: true
+        oadrHttpPullModel: true,
       };
       registrationResponse = await registerParty(request, commonName, venId);
     });
@@ -42,9 +47,16 @@ describe('VEN registration', function() {
     });
 
     it('rejects VEN with non-matching venId', async () => {
-      const venId = v4().replace(/-/g, '').substring(0, 20).toUpperCase().match(/.{2}/g).join(':');
+      const venId = v4()
+        .replace(/-/g, '')
+        .substring(0, 20)
+        .toUpperCase()
+        .match(/.{2}/g)
+        .join(':');
       const requestId = v4().replace(/-/g, '');
-      const commonName = v4().replace(/-/g, '').substring(0, 12);
+      const commonName = v4()
+        .replace(/-/g, '')
+        .substring(0, 12);
       const request = {
         requestId: requestId,
         venId: venId,
@@ -53,7 +65,7 @@ describe('VEN registration', function() {
         oadrReportOnly: false,
         oadrXmlSignature: false,
         oadrVenName: `VEN ${commonName}`,
-        oadrHttpPullModel: true
+        oadrHttpPullModel: true,
       };
 
       let exception;
@@ -69,7 +81,9 @@ describe('VEN registration', function() {
 
     it('rejects registration when common name changes', async () => {
       const requestId = v4().replace(/-/g, '');
-      const commonName2 = v4().replace(/-/g, '').substring(0, 12);
+      const commonName2 = v4()
+        .replace(/-/g, '')
+        .substring(0, 12);
       const request = {
         requestId: requestId,
         venId: venId,
@@ -78,7 +92,7 @@ describe('VEN registration', function() {
         oadrReportOnly: false,
         oadrXmlSignature: false,
         oadrVenName: `VEN ${commonName}`,
-        oadrHttpPullModel: true
+        oadrHttpPullModel: true,
       };
 
       let exception;
@@ -94,15 +108,21 @@ describe('VEN registration', function() {
   });
 
   describe('query', function() {
-
     let venId, commonName, queryResponse;
 
     beforeEach(async () => {
-      venId = v4().replace(/-/g, '').substring(0, 20).toUpperCase().match(/.{2}/g).join(':');
+      venId = v4()
+        .replace(/-/g, '')
+        .substring(0, 20)
+        .toUpperCase()
+        .match(/.{2}/g)
+        .join(':');
       const requestId = v4().replace(/-/g, '');
-      commonName = v4().replace(/-/g, '').substring(0, 12);
+      commonName = v4()
+        .replace(/-/g, '')
+        .substring(0, 12);
       const request = {
-        requestId: requestId
+        requestId: requestId,
       };
       queryResponse = await query(request, commonName, venId);
     });
@@ -113,9 +133,16 @@ describe('VEN registration', function() {
     });
 
     it('returns registrationId if already registered', async () => {
-      venId = v4().replace(/-/g, '').substring(0,20).toUpperCase().match(/.{2}/g).join(':');
+      venId = v4()
+        .replace(/-/g, '')
+        .substring(0, 20)
+        .toUpperCase()
+        .match(/.{2}/g)
+        .join(':');
       const requestId = v4().replace(/-/g, '');
-      commonName = v4().replace(/-/g, '').substring(0, 12);
+      commonName = v4()
+        .replace(/-/g, '')
+        .substring(0, 12);
       const registerRequest = {
         requestId: requestId,
         venId: venId,
@@ -124,13 +151,17 @@ describe('VEN registration', function() {
         oadrReportOnly: false,
         oadrXmlSignature: false,
         oadrVenName: `VEN ${commonName}`,
-        oadrHttpPullModel: true
+        oadrHttpPullModel: true,
       };
-      const registrationResponse = await registerParty(registerRequest, commonName, venId);
+      const registrationResponse = await registerParty(
+        registerRequest,
+        commonName,
+        venId,
+      );
       const initialRegistrationId = registrationResponse.registrationId;
 
       const queryRequest = {
-        requestId: requestId
+        requestId: requestId,
       };
       queryResponse = await query(queryRequest, commonName, venId);
       expect(queryResponse.registrationId).to.eql(initialRegistrationId);
@@ -139,13 +170,19 @@ describe('VEN registration', function() {
   });
 
   describe('cancelParty', function() {
-
     let venId, commonName, registrationResponse;
 
     beforeEach(async () => {
-      venId = v4().replace(/-/g, '').substring(0, 20).toUpperCase().match(/.{2}/g).join(':');
+      venId = v4()
+        .replace(/-/g, '')
+        .substring(0, 20)
+        .toUpperCase()
+        .match(/.{2}/g)
+        .join(':');
       const requestId = v4().replace(/-/g, '');
-      commonName = v4().replace(/-/g, '').substring(0, 12);
+      commonName = v4()
+        .replace(/-/g, '')
+        .substring(0, 12);
       const request = {
         requestId: requestId,
         venId: venId,
@@ -154,7 +191,7 @@ describe('VEN registration', function() {
         oadrReportOnly: false,
         oadrXmlSignature: false,
         oadrVenName: `VEN ${commonName}`,
-        oadrHttpPullModel: true
+        oadrHttpPullModel: true,
       };
       registrationResponse = await registerParty(request, commonName, venId);
     });
@@ -164,10 +201,14 @@ describe('VEN registration', function() {
       const cancelRequest = {
         requestId: cancelRequestId,
         registrationId: registrationResponse.registrationId,
-        venId: venId
+        venId: venId,
       };
 
-      const cancelResponse = await cancelParty(cancelRequest, commonName, venId);
+      const cancelResponse = await cancelParty(
+        cancelRequest,
+        commonName,
+        venId,
+      );
       expect(cancelResponse.responseCode).to.eql('200');
       expect(cancelResponse.responseDescription).to.eql('OK');
       expect(cancelResponse.responseRequestId).to.eql(cancelRequestId);
@@ -178,7 +219,7 @@ describe('VEN registration', function() {
       const cancelRequestId = v4().replace(/-/g, '');
       const cancelRequest = {
         requestId: cancelRequestId,
-        venId: venId
+        venId: venId,
       };
 
       let error;
@@ -197,7 +238,7 @@ describe('VEN registration', function() {
       const cancelRequest = {
         requestId: cancelRequestId,
         registrationId: registrationResponse.registrationId,
-        venId: venId
+        venId: venId,
       };
 
       let error;
@@ -215,7 +256,7 @@ describe('VEN registration', function() {
       const cancelRequest = {
         requestId: cancelRequestId,
         registrationId: registrationResponse.registrationId,
-        venId: venId
+        venId: venId,
       };
 
       // first cancellation

Tiedoston diff-näkymää rajattu, sillä se on liian suuri
+ 6 - 6
__tests__/unit/xml/event/created-event.spec.js


Tiedoston diff-näkymää rajattu, sillä se on liian suuri
+ 12 - 7
__tests__/unit/xml/event/distribute-event.spec.js


+ 15 - 17
__tests__/unit/xml/event/js-requests.js

@@ -4,30 +4,28 @@ const requestEvent1 = {
   _type: 'oadrRequestEvent',
   requestId: '2233',
   venId: 'D8:1D:4B:20:5A:65:4C:50:32:FA',
-  replyLimit: '2'
+  replyLimit: '2',
 };
 
 const createdEvent1 = {
-  '_type': 'oadrCreatedEvent',
-  'responseCode': '200',
-  'responseDescription': 'OK',
-  'responseRequestId': '336f7e47b92eefe985ec',
-  'venId': 'D8:1D:4B:20:5A:65:4C:50:32:FA',
-  'eventResponses': [
+  _type: 'oadrCreatedEvent',
+  responseCode: '200',
+  responseDescription: 'OK',
+  responseRequestId: '336f7e47b92eefe985ec',
+  venId: 'D8:1D:4B:20:5A:65:4C:50:32:FA',
+  eventResponses: [
     {
-      'responseCode': '200',
-      'responseDescription': 'OK',
-      'responseRequestId': '336f7e47b92eefe985ec',
-      'optType': 'optIn',
-      'eventId': 'a2fa542eca8d4e829ff5c0f0c8e68710',
-      'modificationNumber': 0
-    }
-  ]
+      responseCode: '200',
+      responseDescription: 'OK',
+      responseRequestId: '336f7e47b92eefe985ec',
+      optType: 'optIn',
+      eventId: 'a2fa542eca8d4e829ff5c0f0c8e68710',
+      modificationNumber: 0,
+    },
+  ],
 };
 
 module.exports = {
   createdEvent1,
   requestEvent1,
 };
-
-

Tiedoston diff-näkymää rajattu, sillä se on liian suuri
+ 433 - 499
__tests__/unit/xml/event/js-responses.js


Tiedoston diff-näkymää rajattu, sillä se on liian suuri
+ 6 - 6
__tests__/unit/xml/event/request-event.spec.js


+ 1 - 1
__tests__/unit/xml/event/xml-requests.js

@@ -41,5 +41,5 @@ const createdEvent1Xml = `<oadr2b:oadrPayload xmlns:oadr2b="http://openadr.org/o
 
 module.exports = {
   requestEvent1Xml,
-  createdEvent1Xml
+  createdEvent1Xml,
 };

+ 1 - 1
__tests__/unit/xml/event/xml-responses.js

@@ -368,5 +368,5 @@ const epriXml = `<ns2:oadrPayload xmlns="http://www.w3.org/2000/09/xmldsig#" xml
 </ns2:oadrPayload>`;
 
 module.exports = {
-  epriXml
+  epriXml,
 };

+ 5 - 5
__tests__/unit/xml/poll/js-requests.js

@@ -1,16 +1,16 @@
 'use strict';
 
 const oadrPoll1 = {
-  '_type': 'oadrPoll',
-  'venId': 'D8:1D:4B:20:5A:65:4C:50:32:FA'
+  _type: 'oadrPoll',
+  venId: 'D8:1D:4B:20:5A:65:4C:50:32:FA',
 };
 
 const oadrResponse1 = {
-  '_type': 'oadrResponse',
-  'venId': 'D8:1D:4B:20:5A:65:4C:50:32:FA'
+  _type: 'oadrResponse',
+  venId: 'D8:1D:4B:20:5A:65:4C:50:32:FA',
 };
 
 module.exports = {
   oadrPoll1,
-  oadrResponse1
+  oadrResponse1,
 };

+ 6 - 6
__tests__/unit/xml/poll/js-responses.js

@@ -1,13 +1,13 @@
 'use strict';
 
 const oadrResponse1 = {
-  '_type': 'oadrResponse',
-  'responseCode': '200',
-  'responseDescription': 'OK',
-  'responseRequestId': '',
-  'venId': 'aa'
+  _type: 'oadrResponse',
+  responseCode: '200',
+  responseDescription: 'OK',
+  responseRequestId: '',
+  venId: 'aa',
 };
 
 module.exports = {
-  oadrResponse1
+  oadrResponse1,
 };

+ 6 - 6
__tests__/unit/xml/poll/oadr-poll.spec.js

@@ -8,18 +8,17 @@ const { oadrPoll1 } = require('./js-requests');
 
 describe('Poll', function() {
   describe('parse', function() {
-
     let parsedResponse;
 
     before(async () => {
       parsedResponse = await parse(oadrPoll1Xml);
     });
 
-    it ('successfully parses valid message', function() {
+    it('successfully parses valid message', function() {
       expect(parsedResponse.venId).to.eql('D8:1D:4B:20:5A:65:4C:50:32:FA');
     });
 
-    it ('successfully parses serialized value', async function() {
+    it('successfully parses serialized value', async function() {
       const serialized = serialize(oadrPoll1);
       const parsedResponse = await parse(serialized);
       expect(parsedResponse).to.eql(oadrPoll1);
@@ -27,15 +26,16 @@ describe('Poll', function() {
   });
 
   describe('serialize', function() {
-
     let serializedResponse;
 
     before(async () => {
       serializedResponse = await serialize(oadrPoll1);
     });
 
-    it ('successfully serializes valid message', function() {
-      expect(serializedResponse).to.eql('<oadr2b:oadrPayload xmlns:oadr2b="http://openadr.org/oadr-2.0b/2012/07"><oadr2b:oadrSignedObject><oadr2b:oadrPoll xmlns:ei="http://docs.oasis-open.org/ns/energyinterop/201110" ei:schemaVersion="2.0b"><ei:venID xmlns:ei="http://docs.oasis-open.org/ns/energyinterop/201110">D8:1D:4B:20:5A:65:4C:50:32:FA</ei:venID></oadr2b:oadrPoll></oadr2b:oadrSignedObject></oadr2b:oadrPayload>');
+    it('successfully serializes valid message', function() {
+      expect(serializedResponse).to.eql(
+        '<oadr2b:oadrPayload xmlns:oadr2b="http://openadr.org/oadr-2.0b/2012/07"><oadr2b:oadrSignedObject><oadr2b:oadrPoll xmlns:ei="http://docs.oasis-open.org/ns/energyinterop/201110" ei:schemaVersion="2.0b"><ei:venID xmlns:ei="http://docs.oasis-open.org/ns/energyinterop/201110">D8:1D:4B:20:5A:65:4C:50:32:FA</ei:venID></oadr2b:oadrPoll></oadr2b:oadrSignedObject></oadr2b:oadrPayload>',
+      );
     });
   });
 });

Tiedoston diff-näkymää rajattu, sillä se on liian suuri
+ 6 - 6
__tests__/unit/xml/poll/oadr-response.spec.js


Tiedoston diff-näkymää rajattu, sillä se on liian suuri
+ 10 - 7
__tests__/unit/xml/register-party/cancel-party-registration.spec.js


Tiedoston diff-näkymää rajattu, sillä se on liian suuri
+ 10 - 6
__tests__/unit/xml/register-party/canceled-party-registration.spec.js


Tiedoston diff-näkymää rajattu, sillä se on liian suuri
+ 19 - 11
__tests__/unit/xml/register-party/create-party-registration.spec.js


Tiedoston diff-näkymää rajattu, sillä se on liian suuri
+ 10 - 6
__tests__/unit/xml/register-party/created-party-registration.spec.js


+ 4 - 6
__tests__/unit/xml/register-party/js-requests.js

@@ -10,25 +10,23 @@ const createPartyRegistration1 = {
   oadrReportOnly: false,
   oadrXmlSignature: false,
   oadrVenName: 'venName',
-  oadrHttpPullModel: true
+  oadrHttpPullModel: true,
 };
 
 const cancelPartyRegistration1 = {
   _type: 'oadrCancelPartyRegistration',
   requestId: '223344',
   registrationId: '3bd3c02dc6965c8b9240',
-  venId: '3f59d85fbdf3997dbeb1'
+  venId: '3f59d85fbdf3997dbeb1',
 };
 
 const queryRegistration1 = {
   _type: 'oadrQueryRegistration',
-  requestId: '12345'
+  requestId: '12345',
 };
 
 module.exports = {
   cancelPartyRegistration1,
   createPartyRegistration1,
-  queryRegistration1
+  queryRegistration1,
 };
-
-

+ 2 - 2
__tests__/unit/xml/register-party/js-responses.js

@@ -7,7 +7,7 @@ const createdPartyRegistration1 = {
   registrationId: '3bd3c02dc6965c8b9240',
   venId: '3f59d85fbdf3997dbeb1',
   vtnId: 'VTN_ID1',
-  pollFreqDuration: 'PT10S'
+  pollFreqDuration: 'PT10S',
 };
 
 const canceledPartyRegistration1 = {
@@ -15,7 +15,7 @@ const canceledPartyRegistration1 = {
   responseDescription: 'OK',
   responseRequestId: '334455',
   registrationId: '3bd3c02dc6965c8b9240',
-  venId: '3f59d85fbdf3997dbeb1'
+  venId: '3f59d85fbdf3997dbeb1',
 };
 
 module.exports = {

+ 10 - 6
__tests__/unit/xml/register-party/query-registration.spec.js

@@ -2,21 +2,25 @@
 
 const { expect } = require('chai');
 
-const { parse, serialize } = require('../../../../xml/register-party/query-registration');
+const {
+  parse,
+  serialize,
+} = require('../../../../xml/register-party/query-registration');
 const { queryRegistration1Xml } = require('./xml-requests');
 const { queryRegistration1 } = require('./js-requests');
 
 describe('Query Registration', function() {
   describe('serialize', function() {
-
     let serializedRequest;
 
     before(async () => {
       serializedRequest = await serialize(queryRegistration1);
     });
 
-    it ('successfully parses valid message', function() {
-      expect(serializedRequest).to.eql('<oadr2b:oadrPayload xmlns:oadr2b="http://openadr.org/oadr-2.0b/2012/07"><oadr2b:oadrSignedObject><oadr2b:oadrQueryRegistration xmlns:ei="http://docs.oasis-open.org/ns/energyinterop/201110" ei:schemaVersion="2.0b"><pyld:requestID xmlns:pyld="http://docs.oasis-open.org/ns/energyinterop/201110/payloads">12345</pyld:requestID></oadr2b:oadrQueryRegistration></oadr2b:oadrSignedObject></oadr2b:oadrPayload>');
+    it('successfully parses valid message', function() {
+      expect(serializedRequest).to.eql(
+        '<oadr2b:oadrPayload xmlns:oadr2b="http://openadr.org/oadr-2.0b/2012/07"><oadr2b:oadrSignedObject><oadr2b:oadrQueryRegistration xmlns:ei="http://docs.oasis-open.org/ns/energyinterop/201110" ei:schemaVersion="2.0b"><pyld:requestID xmlns:pyld="http://docs.oasis-open.org/ns/energyinterop/201110/payloads">12345</pyld:requestID></oadr2b:oadrQueryRegistration></oadr2b:oadrSignedObject></oadr2b:oadrPayload>',
+      );
     });
   });
 
@@ -27,11 +31,11 @@ describe('Query Registration', function() {
       parsedRequest = await parse(queryRegistration1Xml);
     });
 
-    it ('successfully parses valid message', function() {
+    it('successfully parses valid message', function() {
       expect(parsedRequest.requestId).to.eql('4323');
     });
 
-    it ('successfully parses serialized value', async function() {
+    it('successfully parses serialized value', async function() {
       const serialized = serialize(queryRegistration1);
       const parsedResponse = await parse(serialized);
       expect(parsedResponse).to.eql(queryRegistration1);

+ 1 - 1
__tests__/unit/xml/register-party/xml-requests.js

@@ -72,5 +72,5 @@ module.exports = {
   malformedXml,
   missingOadrXmlSignatureXml,
   illegalBooleanValueXml,
-  queryRegistration1Xml
+  queryRegistration1Xml,
 };

+ 3 - 3
modules/nantum.js

@@ -21,9 +21,9 @@ async function fetchEvent(venId) {
         {
           event_type_id: 'LOAD_DISPATCH',
           event_info_values: [
-            { value: 41, timeOffset: 0},
-            { value: 42, timeOffset: 5 * 60},
-            { value: 43, timeOffset: 10 * 60},
+            { value: 41, timeOffset: 0 },
+            { value: 42, timeOffset: 5 * 60 },
+            { value: 43, timeOffset: 10 * 60 },
           ],
         },
       ],

+ 3 - 3
package.json

@@ -7,9 +7,9 @@
     "start": "node index.js",
     "test": "npm run unit",
     "unit": "NODE_ENV=test _mocha --exit $(find __tests__ -name \"*.spec.js\")",
-    "lint": "eslint client/**/*.js config/**/*.js db/**/*.js modules/**/*.js processes/**/*.js server/**/*.js xml/**/*.js __tests__/**/*.js && prettier --check client/**/*.js config/**/*.js db/**/*.js modules/**/*.js processes/**/*.js server/**/*.js xml/**/*.js __tests__/**/*.js",
-    "fixlint": "eslint --fix client/**/*.js config/**/*.js db/**/*.js modules/**/*.js processes/**/*.js server/**/*.js xml/**/*.js __tests__/**/*.js",
-    "fixprettier": "prettier --write client/**/*.js config/**/*.js db/**/*.js modules/**/*.js processes/**/*.js server/**/*.js xml/**/*.js __tests__/***.js"
+    "lint": "eslint $(find __tests__ client config db modules processes server xml -name \"*.js\")",
+    "fixlint": "eslint --fix $(find __tests__ client config db modules processes server xml -name \"*.js\")",
+    "fixprettier": "prettier --write $(find __tests__ client config db modules processes server xml -name \"*.js\")"
   },
   "repository": {
     "type": "git",