- Fixes issue with secrets from secrets files by changing order of lo…

…ading dependencies (moved into main). #25

- Fix to issue with webhooks causing failing test
- Updated NotificationsParams test to remove unneeded time zone dependent string causing failing test

.gitignore

@@ -116,4 +116,6 @@ dist
 .tern-port
 
 # MacOS junk
-.DS_Store
+.DS_Store
+
+.idea

index.js

@@ -5,11 +5,6 @@ const { program } = require('commander');
 setupProgram();
 
 const {checkLicense} = require("./util/licence");
-
-const {toneDetector} = require('./bin/toneDetector');
-const {csvToConfig} = require('./bin/csvToConfig');
-const {fdToneNotify} = require('./bin/fdToneNotify');
-const {testNotifications} = require('./bin/testNotifications');
 const log = require('./util/logger');
 const {populateSecretsEnvVar} = require("./util/config.secrets");
 
@@ -46,6 +41,11 @@ async function main(){
     const options = program.opts();
     populateSecretsEnvVar({secretsPath: options.secretsFile, forceSecretsFile: options.forceSecretsFile});
 
+    const {fdToneNotify} = require('./bin/fdToneNotify');
+    const {toneDetector} = require('./bin/toneDetector');
+    const {csvToConfig} = require('./bin/csvToConfig');
+    const {testNotifications} = require('./bin/testNotifications');
+
     if(options.csvToConfig)
         csvToConfig();
     else if(options.allToneDetector)

notifiers/webhook.js

@@ -31,7 +31,7 @@ async function postJson({address, headers={}, timestamp, tones, matchAverages, f
 }
 
 async function postMultiPartFormDataWithFile({address, headers={}, timestamp, tones=[], matchAverages=[], filename,
-                                                 recordingRelPath, detectorName, custom={}, isTest}){
+                                                 recordingRelPath, detectorName, custom={}, isTest=false}){
 
     _fillEnvVarsHeaders(headers);
     const form = new FormData();
@@ -40,7 +40,7 @@ async function postMultiPartFormDataWithFile({address, headers={}, timestamp, to
     form.append('matchAverages', matchAverages.toString());
     form.append('detectorName', detectorName);
     form.append('custom', JSON.stringify(custom));
-    form.append(isTest, isTest);
+    form.append("isTest", isTest);
 
     const buffer = fs.readFileSync(recordingRelPath);
         form.append('file', buffer, {

test/obj/NotificationParams.test.js

@@ -89,13 +89,13 @@ describe("NotificationParams", function() {
 
             var emails = notificationParams.getEmails('PRE');
             expect(emails).to.have.lengthOf(1);
-            expect(emails[0].text).to.have.string("August 1st 2022, 0:00:00");
-            expect(emails[0].subject).to.have.string("August 1st 2022, 0:00:00");
+            expect(emails[0].text).to.have.string("August 1st 2022,");
+            expect(emails[0].subject).to.have.string("August 1st 2022,");
 
             var emails = notificationParams.getEmails('POST');
             expect(emails).to.have.lengthOf(1);
-            expect(emails[0].text).to.have.string("August 1st 2022, 0:00:00");
-            expect(emails[0].subject).to.have.string("August 1st 2022, 0:00:00");
+            expect(emails[0].text).to.have.string("August 1st 2022,");
+            expect(emails[0].subject).to.have.string("August 1st 2022,");
         });
 
         it("should not modify the original email objects", function() {