Fixed some test issues

microsoft · Feb 25, 2020 · f1b6fc2 · f1b6fc2
1 parent 89f23cb
commit f1b6fc2
Show file tree

Hide file tree

Showing 8 changed files with 18 additions and 13 deletions.
diff --git a/libraries/adaptive-expressions/package.json b/libraries/adaptive-expressions/package.json
@@ -40,7 +40,7 @@
   },
   "scripts": {
     "build": "tsc",
-    "test": "tsc && nyc mocha tests/ --timeout 60000",
+    "test": "tsc && mocha tests/ --timeout 60000",
     "clean": "erase /q /s .\\lib",
     "build-docs": "typedoc --theme markdown --entryPoint adaptive-expressions --excludePrivate --includeDeclarations --ignoreCompilerErrors --module amd --out ..\\..\\doc\\adaptive-expressions .\\lib\\index.d.ts --hideGenerator --name \"Bot Builder SDK - Expression\" --readme none",
     "set-version": "npm version --allow-same-version ${Version}"

diff --git a/libraries/adaptive-expressions/tests/mocha.opts b/libraries/adaptive-expressions/tests/mocha.opts
@@ -0,0 +1,4 @@
+--require ts-node/register
+--require source-map-support/register
+--recursive
+**/*.js
diff --git a/libraries/adaptive-expressions/tsconfig.json b/libraries/adaptive-expressions/tsconfig.json
@@ -1,17 +1,16 @@
 {
     "compilerOptions": {
-      "plugins": [
-        { "name": "typescript-tslint-plugin" }
-      ],
-      "target": "ESNext",
+      "target": "es6",
+      "lib": ["es2015", "dom"],
       "module": "commonjs",
+      "strict": false,
       "declaration": true,
       "declarationMap": true,
       "sourceMap": true,
       "outDir": "./lib",
-      "rootDirs": ["./src"],
+      "rootDir": "./src",
       "types" : ["node"]
-    },
+      },
     "include": [
       "src/**/*"
     ]

diff --git a/libraries/botbuilder-core/package.json b/libraries/botbuilder-core/package.json
@@ -31,7 +31,7 @@
     "source-map-support": "^0.5.3",
     "ts-node": "^4.1.0",
     "typescript": "3.5.3",
-    "unzip": "^0.1.11"
+    "unzipper": "^0.10.9"
   },
   "scripts": {
     "test": "tsc && nyc mocha tests/",

diff --git a/libraries/botbuilder-core/tests/transcriptUtilities.js b/libraries/botbuilder-core/tests/transcriptUtilities.js
@@ -10,7 +10,7 @@ const url = require('url');
 const promisify = require('util').promisify;
 const readFileAsync = promisify(fs.readFile);
 const request = require("request");
-const unzip = require('unzip');
+const unzip = require('unzipper');
 const rimraf = require('rimraf');
 
 const chatdown = require('chatdown');

diff --git a/libraries/botbuilder-lg/package.json b/libraries/botbuilder-lg/package.json
@@ -33,7 +33,7 @@
     "typescript": "3.5.3"
   },
   "scripts": {
-    "test": "tsc && nyc mocha tests/ --timeout 60000",
+    "test": "tsc && mocha tests/ --timeout 60000",
     "build": "tsc",
     "build-docs": "typedoc --theme markdown --entryPoint botbuilder-lg --excludePrivate --includeDeclarations --ignoreCompilerErrors --module amd --out ..\\..\\doc\\botbuilder-lg .\\lib\\index.d.ts --hideGenerator --name \"Bot Builder SDK - LG\" --readme none",
     "clean": "erase /q /s .\\lib",

diff --git a/libraries/botbuilder-testing/package.json b/libraries/botbuilder-testing/package.json
@@ -35,7 +35,7 @@
     "source-map-support": "^0.5.3",
     "ts-node": "^4.1.0",
     "typescript": "3.5.3",
-    "unzip": "^0.1.11",
+    "unzipper": "^0.10.9",
     "uuid": "^3.3.2"
   },
   "scripts": {

diff --git a/libraries/botbuilder/tests/streaming/tokenResolver.test.js b/libraries/botbuilder/tests/streaming/tokenResolver.test.js
@@ -216,7 +216,8 @@ describe(`TokenResolver`, function () {
         });
         const returnTokenResponse = () => 
         { 
-            doneResolve('done');
+            // Give token code 100ms to run
+            setTimeout(() => doneResolve('done'), 100);
             return { properties: { tokenPollingSettings: { timeout: 0 } } };
         };
         const botLogic= (ctx) => {
@@ -246,7 +247,8 @@ describe(`TokenResolver`, function () {
             if (i < 2) {
                 return { properties: { tokenPollingSettings: { interval: 100 } } };
             } else {
-                doneResolve('done');
+                // Give token code 100ms to run
+                setTimeout(() => doneResolve('done'), 100);
                 return { properties: { tokenPollingSettings: { timeout: 0 } } };
             }
         };