[Skill Template][TypeScript] Refactor test structure, run build after…

… installation (#1450) * Run build after installation * Refactor test structure * Update sample
microsoft · May 29, 2019 · 0f6d6d9 · 0f6d6d9
1 parent 2c73696
commit 0f6d6d9
Show file tree

Hide file tree

Showing 49 changed files with 104 additions and 170 deletions.
diff --git a/...al-Assistant-Template/typescript/generator-botbuilder-assistant/generators/skill/index.js b/...al-Assistant-Template/typescript/generator-botbuilder-assistant/generators/skill/index.js
@@ -310,6 +310,7 @@ module.exports = class extends Generator {
           )
         );
       } else {
+        this.spawnCommandSync('npm run build', []);
         this.log(chalk.green(`------------------------ `));
         this.log(chalk.green(` Your new skill is ready!  `));
         this.log(chalk.green(`------------------------ `));

diff --git a/...sistant-Template/typescript/generator-botbuilder-assistant/generators/skill/src/copier.js b/...sistant-Template/typescript/generator-botbuilder-assistant/generators/skill/src/copier.js
@@ -79,8 +79,8 @@ class Copier {
       path.join(`src`, `dialogs`, `skillDialogBase.ts`)
     );
     templateFiles.set(
-      path.join(`test`, `mockResources`, `_cognitiveModels.json`),
-      path.join(`test`, `mockResources`, `cognitiveModels.json`)
+      path.join(`test`, `mocks`, `resources`, `_cognitiveModels.json`),
+      path.join(`test`, `mocks`, `resources`, `cognitiveModels.json`)
     );
     selectedLanguages.forEach(language => {
       templateFiles.set(

diff --git a/...cript/generator-botbuilder-assistant/generators/skill/templates/customSkill/_package.json b/...cript/generator-botbuilder-assistant/generators/skill/templates/customSkill/_package.json
@@ -52,8 +52,6 @@
         "nyc": "^14.1.1",
         "replace": "^1.0.0",
         "rimraf": "^2.6.2",
-        "source-map-support": "^0.5.12",
-        "ts-node": "^8.1.0",
         "tslint": "^5.12.1",
         "tslint-microsoft-contrib": "6.0.0",
         "typescript": "^3.2.2"

diff --git a/...es/customSkill/test/flow/skillTestBase.js → ...customSkill/test/helpers/skillTestBase.js b/...es/customSkill/test/flow/skillTestBase.js → ...customSkill/test/helpers/skillTestBase.js
@@ -42,7 +42,7 @@ let telemetryClient;
 let userState;
 let conversationState;
 let cognitiveModelsRaw;
-const TEST_MODE = require("../testBase").testMode;
+const TEST_MODE = require("./testBase").testMode;
 
 const getCognitiveModels = function(cognitiveModelsRaw) {
   const cognitiveModelDictionary = cognitiveModelsRaw.cognitiveModels;
@@ -60,8 +60,8 @@ const setupEnvironment = function(testMode) {
       getCognitiveModels(cognitiveModelsRaw);
       break;
     case "lockdown":
-      appsettings = require("../mockResources/appsettings.json");
-      cognitiveModelsRaw = require("../mockResources/cognitiveModels.json");
+      appsettings = require("../mocks/resources/appsettings.json");
+      cognitiveModelsRaw = require("../mocks/resources/cognitiveModels.json");
       getCognitiveModels(cognitiveModelsRaw);
       break;
     default:

diff --git a/...ll/templates/customSkill/test/testBase.js → ...ates/customSkill/test/helpers/testBase.js b/...ll/templates/customSkill/test/testBase.js → ...ates/customSkill/test/helpers/testBase.js
@@ -8,7 +8,7 @@ const join = require("path").join;
 
 const nockBack = require("nock").back;
 nockBack.setMode(TEST_MODE);
-nockBack.fixtures = join(__dirname, "/nockFixtures");
+nockBack.fixtures = join(__dirname, '..', 'mocks', 'nockFixtures');
 
 const uuidRegex = /[a-f\d-]{8}-[a-f\d-]{4}-[a-f\d-]{4}-[a-f\d-]{4}-[a-f\d-]{12}/;
 const qnaRegex = /\/\/[^.]+\.azurewebsites/;

diff --git a/...customSkill/test/flow/interruptionTest.js → ...tes/customSkill/test/interruption.test.js b/...customSkill/test/flow/interruptionTest.js → ...tes/customSkill/test/interruption.test.js
@@ -3,8 +3,8 @@
  * Licensed under the MIT License.
  */
 
-const skillTestBase = require("./skillTestBase");
-const testNock = require("../testBase");
+const skillTestBase = require("./helpers/skillTestBase");
+const testNock = require("./helpers/testBase");
 
 describe("interruption", function() {
   beforeEach(async function() {

diff --git a/...customSkill/test/flow/localizationTest.js → ...tes/customSkill/test/localization.test.js b/...customSkill/test/flow/localizationTest.js → ...tes/customSkill/test/localization.test.js
@@ -3,8 +3,8 @@
  * Licensed under the MIT License.
  */
 
-const skillTestBase = require("./skillTestBase");
-const testNock = require("../testBase");
+const skillTestBase = require("./helpers/skillTestBase");
+const testNock = require("./helpers/testBase");
 
 describe("localization", function() {
   beforeEach(async function() {

diff --git a/...s/customSkill/test/flow/mainDialogTest.js → ...lates/customSkill/test/mainDialog.test.js b/...s/customSkill/test/flow/mainDialogTest.js → ...lates/customSkill/test/mainDialog.test.js
@@ -3,8 +3,8 @@
  * Licensed under the MIT License.
  */
 const assert = require("assert");
-const skillTestBase = require("./skillTestBase");
-const testNock = require("../testBase");
+const skillTestBase = require("./helpers/skillTestBase");
+const testNock = require("./helpers/testBase");
 const unhandledReplies = [
   "Can you try to ask me again? I didn't get what you mean.",
   "Can you say that in a different way?",

diff --git a/...ipt/generator-botbuilder-assistant/generators/skill/templates/customSkill/test/mocha.opts b/...ipt/generator-botbuilder-assistant/generators/skill/templates/customSkill/test/mocha.opts
@@ -1,7 +1,4 @@
---require ts-node/register
---require source-map-support/register
 --reporter mocha-junit-reporter
 --timeout 50000
 --recursive
---colors
-**/*Test.js
+--colors
diff --git a/...lder-assistant/generators/skill/templates/customSkill/test/mockResources/appsettings.json b/...lder-assistant/generators/skill/templates/customSkill/test/mockResources/appsettings.json
diff --git a/...ixtures/interruption_cancel_response.json → ...ixtures/interruption_cancel_response.json b/...ixtures/interruption_cancel_response.json → ...ixtures/interruption_cancel_response.json
diff --git a/...kFixtures/interruption_help_response.json → ...kFixtures/interruption_help_response.json b/...kFixtures/interruption_help_response.json → ...kFixtures/interruption_help_response.json
diff --git a/...ockFixtures/localization_de_response.json → ...ockFixtures/localization_de_response.json b/...ockFixtures/localization_de_response.json → ...ockFixtures/localization_de_response.json
diff --git a/...ockFixtures/localization_en_response.json → ...ockFixtures/localization_en_response.json b/...ockFixtures/localization_en_response.json → ...ockFixtures/localization_en_response.json
diff --git a/...ockFixtures/localization_es_response.json → ...ockFixtures/localization_es_response.json b/...ockFixtures/localization_es_response.json → ...ockFixtures/localization_es_response.json
diff --git a/...ockFixtures/localization_fr_response.json → ...ockFixtures/localization_fr_response.json b/...ockFixtures/localization_fr_response.json → ...ockFixtures/localization_fr_response.json
diff --git a/...ockFixtures/localization_it_response.json → ...ockFixtures/localization_it_response.json b/...ockFixtures/localization_it_response.json → ...ockFixtures/localization_it_response.json
diff --git a/...ockFixtures/localization_zh_response.json → ...ockFixtures/localization_zh_response.json b/...ockFixtures/localization_zh_response.json → ...ockFixtures/localization_zh_response.json
diff --git a/...ockFixtures/mainDialog_help_response.json → ...ockFixtures/mainDialog_help_response.json b/...ockFixtures/mainDialog_help_response.json → ...ockFixtures/mainDialog_help_response.json
diff --git a/...ckFixtures/mainDialog_intro_response.json → ...ckFixtures/mainDialog_intro_response.json b/...ckFixtures/mainDialog_intro_response.json → ...ckFixtures/mainDialog_intro_response.json
diff --git a/...xtures/mainDialog_unhandled_response.json → ...xtures/mainDialog_unhandled_response.json b/...xtures/mainDialog_unhandled_response.json → ...xtures/mainDialog_unhandled_response.json
diff --git a/...t/nockFixtures/sampleDialog_response.json → ...s/nockFixtures/sampleDialog_response.json b/...t/nockFixtures/sampleDialog_response.json → ...s/nockFixtures/sampleDialog_response.json
diff --git a/.../test/mockResources/_cognitiveModels.json → ...est/mocks/resources/_cognitiveModels.json b/.../test/mockResources/_cognitiveModels.json → ...est/mocks/resources/_cognitiveModels.json
diff --git a/...er-assistant/generators/skill/templates/customSkill/test/mocks/resources/appsettings.json b/...er-assistant/generators/skill/templates/customSkill/test/mocks/resources/appsettings.json
@@ -0,0 +1,25 @@
+{
+  "oauthConnections": [
+    {
+      "name": "",
+      "provider": ""
+    }
+  ],
+  "properties": {},
+  "microsoftAppId": "<--MOCK-VALUE-->",
+  "microsoftAppPassword": "<--MOCK-VALUE-->",
+  "appInsights": {
+    "appId": "<--MOCK-VALUE-->",
+    "instrumentationKey": "<--MOCK-VALUE-->"
+  },
+  "blobStorage": {
+    "connectionString": "<--MOCK-VALUE-->",
+    "container": "transcripts"
+  },
+  "cosmosDb": {
+    "authkey": "<--MOCK-VALUE-->",
+    "collectionId": "botstate-collection",
+    "cosmosDBEndpoint": "https://skill-endpoint.documents.azure.com:443/",
+    "databaseId": "botstate-db"
+  }
+}
diff --git a/...ample-skill/test/flow/sampleDialogTest.js → ...tes/customSkill/test/sampleDialog.test.js b/...ample-skill/test/flow/sampleDialogTest.js → ...tes/customSkill/test/sampleDialog.test.js
@@ -4,8 +4,8 @@
  */
 
 const assert = require("assert");
-const skillTestBase = require("./skillTestBase");
-const testNock = require("../testBase");
+const skillTestBase = require("./helpers/skillTestBase");
+const testNock = require("./helpers/testBase");
 const nameInput = "custom";
 const sampleDialogNameReplies = [
   `Hi, ${nameInput}!`,

diff --git a/templates/Virtual-Assistant-Template/typescript/samples/sample-skill/package-lock.json b/templates/Virtual-Assistant-Template/typescript/samples/sample-skill/package-lock.json
diff --git a/templates/Virtual-Assistant-Template/typescript/samples/sample-skill/package.json b/templates/Virtual-Assistant-Template/typescript/samples/sample-skill/package.json
@@ -52,8 +52,6 @@
         "nyc": "^14.1.1",
         "replace": "^1.0.0",
         "rimraf": "^2.6.2",
-        "source-map-support": "^0.5.12",
-        "ts-node": "^8.1.0",
         "tslint": "^5.12.1",
         "tslint-microsoft-contrib": "6.0.0",
         "typescript": "^3.2.2"