[Botskills] Fix line endings for test temporal files (#1945)

* Main logic to normalize line endings

* Add util to normalize the line ending

* Implement the normalization of line endings

* Update test dispatch file

* Add a comment for the normalize util

Author: Batta32

tools/botskills/test/authentication.test.js

@@ -8,13 +8,14 @@ const { writeFileSync } = require("fs");
 const { join, resolve } = require("path");
 const sandbox = require("sinon").createSandbox();
 const { TestLogger } = require("./helpers/testLogger");
+const { normalizeContent } = require("./helpers/normalizeUtils");
 const { AuthenticationUtils } = require("../lib/utils");
 const authenticationUtils = new AuthenticationUtils();
 const emptyAzureAuthSettings = JSON.stringify(require(resolve(__dirname, join("mocks", "azureAuthSettings", "emptyAuthSettings.json"))));
 const filledAzureAuthSettings = JSON.stringify(require(resolve(__dirname, join("mocks", "azureAuthSettings", "filledAuthSettings.json"))));
 const appShowReplyUrl = JSON.stringify(require(resolve(__dirname, join("mocks", "appShowReplyUrl", "emptyAppShowReplyUrl.json"))));
 
-const noAuthConnectionAppsettings = JSON.stringify(
+const noAuthConnectionAppsettings = normalizeContent(JSON.stringify(
     {
         "microsoftAppId": "",
         "microsoftAppPassword": "",
@@ -36,10 +37,41 @@ const noAuthConnectionAppsettings = JSON.stringify(
             "key": ""
         }
     },
-    null, 4);
+    null, 4));
+
+const authConnectionAppsettings = normalizeContent(JSON.stringify(
+    {
+        "microsoftAppId": "",
+        "microsoftAppPassword": "",
+        "appInsights": {
+            "appId": "",
+            "instrumentationKey": ""
+        },
+        "blobStorage": {
+            "connectionString": "",
+            "container": ""
+        },
+        "cosmosDb": {
+            "authkey": "",
+            "collectionId": "",
+            "cosmosDBEndpoint": "",
+            "databaseId": ""
+        },
+        "contentModerator": {
+            "key": ""
+        },
+        "oauthConnections": [
+            {
+                "name": "Outlook",
+                "provider": "Azure Active Directory v2"
+            }
+        ]
+    },
+    null,4));
 
 function undoChangesInTemporalFiles() {
     writeFileSync(resolve(__dirname, join("mocks", "appsettings", "noAuthConnectionAppsettings.json")), noAuthConnectionAppsettings);
+    writeFileSync(resolve(__dirname, join("mocks", "appsettings", "authConnectionAppsettings.json")), authConnectionAppsettings);
 }
 
 describe("The authentication util", function() {

tools/botskills/test/connect.test.js

@@ -8,8 +8,9 @@ const { writeFileSync } = require("fs");
 const { join, resolve } = require("path");
 const sandbox = require("sinon").createSandbox();
 const testLogger = require("./helpers/testLogger");
+const { normalizeContent } = require("./helpers/normalizeUtils");
 const botskills = require("../lib/index");
-const filledSkills = JSON.stringify(
+const filledSkills = normalizeContent(JSON.stringify(
     {
         "skills": [
             {
@@ -20,7 +21,7 @@ const filledSkills = JSON.stringify(
             }
         ]
     },
-    null, 4);
+    null, 4));
 
 function undoChangesInTemporalFiles() {
     writeFileSync(resolve(__dirname, join("mocks", "virtualAssistant", "filledSkills.json")), filledSkills);

tools/botskills/test/disconnect.test.js

@@ -8,8 +8,9 @@ const { writeFileSync } = require("fs");
 const { join, resolve } = require("path");
 const sandbox = require("sinon").createSandbox();
 const testLogger = require("./helpers/testLogger");
+const { normalizeContent } = require("./helpers/normalizeUtils");
 const botskills = require("../lib/index");
-const filledDispatch = JSON.stringify(
+const filledDispatch = normalizeContent(JSON.stringify(
     {
         "services": [
             {
@@ -21,9 +22,9 @@ const filledDispatch = JSON.stringify(
             "1"
         ]
     },
-    null, 4);
+    null, 4));
 
-const filledSkills = JSON.stringify(
+const filledSkills = normalizeContent(JSON.stringify(
     {
         "skills": [
             {
@@ -34,19 +35,18 @@ const filledSkills = JSON.stringify(
             }
         ]
     },
-    null, 4)
+    null, 4));
 
 function undoChangesInTemporalFiles() {
     writeFileSync(resolve(__dirname, join("mocks", "success", "dispatch", "filledDispatchNoJson.dispatch")), filledDispatch);
+    writeFileSync(resolve(__dirname, join("mocks", "success", "dispatch", "filledDispatch.dispatch")), filledDispatch);
     writeFileSync(resolve(__dirname, join("mocks", "virtualAssistant", "filledSkills.json")), filledSkills);
 }
 
 describe("The disconnect command", function () {
 
     beforeEach(function() {
-        writeFileSync(resolve(__dirname, join("mocks", "success", "dispatch", "filledDispatch.dispatch")),filledDispatch);
         undoChangesInTemporalFiles();
-        
         this.logger = new testLogger.TestLogger();
         this.disconnector = new botskills.DisconnectSkill(this.logger);
         this.refreshSkillStub = sandbox.stub(this.disconnector.refreshSkill, "refreshSkill");

tools/botskills/test/helpers/normalizeUtils.js

@@ -0,0 +1,14 @@
+/**
+ * Copyright(c) Microsoft Corporation.All rights reserved.
+ * Licensed under the MIT License.
+ */
+
+/**
+ * Normalize the line endings of the content received
+ */
+function normalizeContent(content) {
+    return content.replace(/\r\n/gm, "\n") //normalize
+                  .replace(/\n/gm, "\r\n"); //CR+LF - Windows EOL;
+}
+
+exports.normalizeContent = normalizeContent;

tools/botskills/test/list.test.js

@@ -7,8 +7,9 @@ const { strictEqual } = require("assert");
 const { writeFileSync } = require("fs");
 const { join, resolve } = require("path");
 const testLogger = require("./helpers/testLogger");
+const { normalizeContent } = require("./helpers/normalizeUtils");
 const botskills = require("../lib/index");
-const filledSkills = JSON.stringify(
+const filledSkills = normalizeContent(JSON.stringify(
     {
         "skills": [
             {
@@ -19,7 +20,7 @@ const filledSkills = JSON.stringify(
             }
         ]
     },
-    null, 4)
+    null, 4));
 
 function undoChangesInTemporalFiles() {
     writeFileSync(resolve(__dirname, join("mocks", "virtualAssistant", "filledSkills.json")), filledSkills);

tools/botskills/test/mocks/success/dispatch/filledDispatch.dispatch

@@ -1,4 +1,11 @@
 {
-    "services": [],
-    "serviceIds": []
+    "services": [
+        {
+            "name": "testDispatch",
+            "id": "1"
+        }
+    ],
+    "serviceIds": [
+        "1"
+    ]
 }

tools/botskills/test/update.test.js

@@ -8,8 +8,9 @@ const { writeFileSync } = require("fs");
 const { join, resolve } = require("path");
 const sandbox = require("sinon").createSandbox();
 const testLogger = require("./helpers/testLogger");
+const { normalizeContent } = require("./helpers/normalizeUtils");
 const botskills = require("../lib/index");
-const filledSkills =  JSON.stringify(
+const filledSkills = normalizeContent(JSON.stringify(
     {
         "skills": [
             {
@@ -20,7 +21,7 @@ const filledSkills =  JSON.stringify(
             }
         ]
     },
-    null, 4);
+    null, 4));
 
 function undoChangesInTemporalFiles() {
     writeFileSync(resolve(__dirname, join("mocks", "virtualAssistant", "filledSkills.json")), filledSkills);