batching fix final, update to mocha hooks, fix tests, update tests to…

… shared context
smolattack · Feb 1, 2022 · 29bebab · 29bebab
1 parent 682d802
commit 29bebab
Show file tree

Hide file tree

Showing 4 changed files with 14 additions and 9 deletions.
diff --git a/.mocharc.cjs b/.mocharc.cjs
@@ -14,7 +14,7 @@ function getAllPackageFolderNames() {
 }
 
 const basePath = "./build/testing/test/";
-let paths = [`${basePath}main.js`];
+let paths = [];
 
 // handle package specific config
 if (yargs.packages || yargs.p) {

diff --git a/test/graph/calendars.ts b/test/graph/calendars.ts
@@ -198,7 +198,7 @@ describe("Calendar", function () {
     });
 
     // Remove the test data we created
-    this.afterAll(async function () {
+    after(async function () {
 
         if (!stringIsNullOrEmpty(testUserName) && !stringIsNullOrEmpty(testEventID)) {
             await this.pnp.graph.users.getById(testUserName).calendar.events.getById(testEventID).delete();

diff --git a/test/graph/outlook.ts b/test/graph/outlook.ts
@@ -11,7 +11,7 @@ describe("Outlook", function () {
     const testCategoryList: string[] = [];
 
     // Ensure we have the data to test against
-    this.beforeAll(async function () {
+    before(async function () {
 
         if (!this.pnp.settings.enableWebTests || stringIsNullOrEmpty(this.pnp.settings.testUser)) {
             this.skip();
@@ -22,7 +22,7 @@ describe("Outlook", function () {
     });
 
     // Clean up testing categories
-    this.afterAll(async function () {
+    after(async function () {
         if (!stringIsNullOrEmpty(testUserName) && testCategoryList.length > 0) {
             for (let i = 0; i < testCategoryList.length; i++) {
                 await this.pnp.graph.users.getById(testUserName).outlook.masterCategories.getById(testCategoryList[i]).delete();

diff --git a/test/mocha-root-hooks.ts b/test/mocha-root-hooks.ts
@@ -3,9 +3,12 @@ import { getSettings, ISettings } from "./load-settings.js";
 import { Context } from "mocha";
 import { extractWebUrl, SPFI, spfi } from "@pnp/sp";
 import { graphfi, GraphFI } from "@pnp/graph";
-import { GraphDefault, SPDefault } from "@pnp/nodejs";
+import { GraphDefault, SPDefault, NodeFetch } from "@pnp/nodejs";
 import { getGUID, delay } from "@pnp/core";
 import { cleanUpAllSubsites } from "./clean-subsite.js";
+import * as chai from "chai";
+import chaiAsPromised from "chai-as-promised";
+import "mocha";
 
 declare module "mocha" {
     interface Context {
@@ -33,6 +36,8 @@ export const mochaHooks = {
     beforeAll: [
         async function setup(this: Context) {
 
+            chai.use(chaiAsPromised);
+
             // start a timer
             testStart = Date.now();
 
@@ -66,7 +71,7 @@ export const mochaHooks = {
                         config: this.pnp.settings.sp.msal.init,
                         scopes: this.pnp.settings.sp.msal.scopes,
                     },
-                }));
+                }), NodeFetch({ replace: true }));
 
                 if (siteUsed) {
                     // we were given a site, so we don't need to create one
@@ -88,7 +93,7 @@ export const mochaHooks = {
                         config: this.pnp.settings.sp.msal.init,
                         scopes: this.pnp.settings.sp.msal.scopes,
                     },
-                }));
+                }), NodeFetch({ replace: true }));
             } finally {
                 const setupEnd = Date.now();
                 console.log(`SP Setup completed in ${((setupEnd - setupStart) / 1000).toFixed(4)} seconds.`);
@@ -108,7 +113,7 @@ export const mochaHooks = {
                         config: this.pnp.settings.graph.msal.init,
                         scopes: this.pnp.settings.graph.msal.scopes,
                     },
-                }));
+                }), NodeFetch({ replace: true }));
 
             } finally {
                 const setupEnd = Date.now();
@@ -160,7 +165,7 @@ export const mochaHooks = {
                 console.log(`SP Teardown completed in ${((teardownEnd - teardownStart) / 1000).toFixed(4)} seconds.`);
             }
 
-            return null;
+            return Promise.resolve();
         },
         function graphTeardown(this: Context) {
             const teardownStart = Date.now();