test: fix tests

test/channels/.mockServer/index.ts

@@ -2,8 +2,8 @@ import path from "path";
 import helmet from "helmet";
 import cors from "cors";
 
-import feathers from "@feathersjs/feathers";
-import express, { Application } from "@feathersjs/express";
+import { feathers } from "@feathersjs/feathers";
+import express, { Application, json, urlencoded, rest } from "@feathersjs/express";
 import socketio from "@feathersjs/socketio";
 import { Service } from "feathers-memory";
 
@@ -20,9 +20,6 @@ interface MockServerOptions {
 
 interface ExportMockServer {
   app: Application
-  articles: Service
-  comments: Service
-  users: Service
 }
 
 const mockServer = (options: MockServerOptions): ExportMockServer => {
@@ -37,11 +34,11 @@ const mockServer = (options: MockServerOptions): ExportMockServer => {
     contentSecurityPolicy: false
   }));
   app.use(cors());
-  app.use(express.json());
-  app.use(express.urlencoded({ extended: true }));
+  app.use(json());
+  app.use(urlencoded({ extended: true }));
 
   // Set up Plugins and providers
-  app.configure(express.rest());
+  app.configure(rest());
   app.configure(socketio());
 
   app.configure(services);
@@ -51,16 +48,9 @@ const mockServer = (options: MockServerOptions): ExportMockServer => {
 
   app.hooks({});
 
-  const articles = app.service("articles");
-  const comments = app.service("comments");
-  const users = app.service("users");
-
   app.configure(casl());
   return {
     app: app,
-    articles,
-    comments,
-    users
   };
 };
 

test/channels/custom-actions/channels.custom-actions.test.ts

@@ -1,5 +1,5 @@
 import assert from "assert";
-import feathers, { Application } from "@feathersjs/feathers";
+import { feathers, Application } from "@feathersjs/feathers";
 import socketio from "@feathersjs/socketio-client";
 import { Server } from "http";
 import io from "socket.io-client";
@@ -50,7 +50,7 @@ describe("channels.custom-actions.test.ts", function() {
     app = mock.app;
 
     const port = app.get("port");
-    server = app.listen(port);
+    server = await app.listen(port);
     await new Promise((resolve) => {
       server.on("listening", resolve);
     });
@@ -194,4 +194,4 @@ describe("channels.custom-actions.test.ts", function() {
       }
     }
   });
-});
+});

test/channels/custom-actions/mockServices.custom-actions.ts

@@ -60,8 +60,6 @@ export default function(app: Application): void {
   authService.hooks({
     after: {
       all: [],
-      find: [],
-      get: [],
       create: [
         (context: HookContext): HookContext => {
           const { user } = context.result;
@@ -73,8 +71,6 @@ export default function(app: Application): void {
           return context;
         }
       ],
-      update: [],
-      patch: [],
       remove: []
     }
   });

test/channels/defaultSettings/channels.default.test.ts

@@ -1,5 +1,5 @@
 import assert from "assert";
-import feathers, { Application } from "@feathersjs/feathers";
+import { feathers, Application } from "@feathersjs/feathers";
 import socketio from "@feathersjs/socketio-client";
 import { Server } from "http";
 import io from "socket.io-client";
@@ -50,7 +50,7 @@ describe("channels.default.test.ts", function() {
     app = mock.app;
 
     const port = app.get("port");
-    server = app.listen(port);
+    server = await app.listen(port);
     await new Promise((resolve) => {
       server.on("listening", resolve);
     });
@@ -350,4 +350,4 @@ describe("channels.default.test.ts", function() {
       }
     }
   });
-});
+});

test/channels/defaultSettings/mockServices.default.ts

@@ -43,8 +43,6 @@ export default function(app: Application): void {
   authService.hooks({
     after: {
       all: [],
-      find: [],
-      get: [],
       create: [
         (context: HookContext): HookContext => {
           const { user } = context.result;
@@ -56,8 +54,6 @@ export default function(app: Application): void {
           return context;
         }
       ],
-      update: [],
-      patch: [],
       remove: []
     }
   });

test/channels/receive/channels.receive.test.ts

@@ -1,5 +1,5 @@
 import assert from "assert";
-import feathers, { Application } from "@feathersjs/feathers";
+import { feathers, Application } from "@feathersjs/feathers";
 import socketio from "@feathersjs/socketio-client";
 import { Server } from "http";
 import io from "socket.io-client";
@@ -50,7 +50,7 @@ describe("channels.receive.test.ts", function() {
     app = mock.app;
 
     const port = app.get("port");
-    server = app.listen(port);
+    server = await app.listen(port);
     await new Promise((resolve) => {
       server.on("listening", resolve);
     });
@@ -192,4 +192,4 @@ describe("channels.receive.test.ts", function() {
       }
     }
   });
-});
+});

test/channels/receive/mockServices.receive.ts

@@ -54,8 +54,6 @@ export default function(app: Application): void {
   authService.hooks({
     after: {
       all: [],
-      find: [],
-      get: [],
       create: [
         (context: HookContext): HookContext => {
           const { user } = context.result;
@@ -67,8 +65,6 @@ export default function(app: Application): void {
           return context;
         }
       ],
-      update: [],
-      patch: [],
       remove: []
     }
   });

test/channels/withAvailableFields/channels.availableFields.test.ts

@@ -1,5 +1,5 @@
 import assert from "assert";
-import feathers, { Application } from "@feathersjs/feathers";
+import { feathers, Application } from "@feathersjs/feathers";
 import socketio from "@feathersjs/socketio-client";
 import { Server } from "http";
 import io from "socket.io-client";
@@ -50,7 +50,7 @@ describe("channels.availableFields.test.ts", function() {
     app = mock.app;
 
     const port = app.get("port");
-    server = app.listen(port);
+    server = await app.listen(port);
     await new Promise((resolve) => {
       server.on("listening", resolve);
     });
@@ -350,4 +350,4 @@ describe("channels.availableFields.test.ts", function() {
       }
     }
   });
-});
+});

test/channels/withAvailableFields/mockServices.availableFields.ts

@@ -50,8 +50,6 @@ export default function(app: Application): void {
   authService.hooks({
     after: {
       all: [],
-      find: [],
-      get: [],
       create: [
         (context: HookContext): HookContext => {
           const { user } = context.result;
@@ -63,8 +61,6 @@ export default function(app: Application): void {
           return context;
         }
       ],
-      update: [],
-      patch: [],
       remove: []
     }
   });

test/hooks/authorize/adapters/makeTests/create-multi.ts

@@ -1,5 +1,5 @@
 import assert from "assert";
-import feathers from "@feathersjs/feathers";
+import { feathers } from "@feathersjs/feathers";
 import { createAliasResolver, defineAbility } from "@casl/ability";
 import _sortBy from "lodash/sortBy";
 
@@ -160,4 +160,4 @@ export default (
       assert.deepStrictEqual(items, expected, "filtered properties");
     });    
   });
-};
+};

test/hooks/authorize/adapters/makeTests/create.ts

@@ -1,5 +1,5 @@
 import assert from "assert";
-import feathers from "@feathersjs/feathers";
+import { feathers } from "@feathersjs/feathers";
 import { createAliasResolver, defineAbility } from "@casl/ability";
 
 const resolveAction = createAliasResolver({
@@ -184,4 +184,4 @@ export default (
       assert.deepStrictEqual(itemInDb, item, "item in db is complete");
     });
   });
-};
+};

test/hooks/authorize/adapters/makeTests/find.ts

@@ -1,5 +1,5 @@
 import assert from "assert";
-import feathers, { Paginated } from "@feathersjs/feathers";
+import { feathers, Paginated } from "@feathersjs/feathers";
 import { createAliasResolver, defineAbility } from "@casl/ability";
 import _sortBy from "lodash/sortBy";
 
@@ -491,4 +491,4 @@ export default (
       });
     });
   });
-};
+};

test/hooks/authorize/adapters/makeTests/get.ts

@@ -1,5 +1,5 @@
 import assert from "assert";
-import feathers from "@feathersjs/feathers";
+import { feathers } from "@feathersjs/feathers";
 import { createAliasResolver, defineAbility } from "@casl/ability";
 
 const resolveAction = createAliasResolver({
@@ -183,4 +183,4 @@ export default (
       );
     });
   });
-};
+};

test/hooks/authorize/adapters/makeTests/patch-data.ts

@@ -1,5 +1,5 @@
 import assert from "assert";
-import feathers from "@feathersjs/feathers";
+import { feathers } from "@feathersjs/feathers";
 import { createAliasResolver, defineAbility } from "@casl/ability";
 
 const resolveAction = createAliasResolver({
@@ -161,4 +161,4 @@ export default (
       }
     });
   });
-};
+};

test/hooks/authorize/adapters/makeTests/patch-multi.ts

@@ -1,5 +1,5 @@
 import assert from "assert";
-import feathers from "@feathersjs/feathers";
+import { feathers } from "@feathersjs/feathers";
 import { createAliasResolver, defineAbility } from "@casl/ability";
 import _sortBy from "lodash/sortBy";
 import _isEqual from "lodash/isEqual";
@@ -296,4 +296,4 @@ export default (
       );
     });
   });
-};
+};

test/hooks/authorize/adapters/makeTests/patch.ts

@@ -1,5 +1,5 @@
 import assert from "assert";
-import feathers from "@feathersjs/feathers";
+import { feathers } from "@feathersjs/feathers";
 import { createAliasResolver, defineAbility } from "@casl/ability";
 
 const resolveAction = createAliasResolver({
@@ -180,4 +180,4 @@ export default (
       assert.deepStrictEqual(itemInDb, updatedItem, "item in db is complete");
     });
   });
-};
+};

test/hooks/authorize/adapters/makeTests/remove-multi.ts

@@ -1,5 +1,5 @@
 import assert from "assert";
-import feathers from "@feathersjs/feathers";
+import { feathers } from "@feathersjs/feathers";
 import { createAliasResolver, defineAbility } from "@casl/ability";
 import _sortBy from "lodash/sortBy";
 
@@ -253,4 +253,4 @@ export default (
       );
     });
   });
-};
+};

test/hooks/authorize/adapters/makeTests/remove.ts

@@ -1,5 +1,5 @@
 import assert from "assert";
-import feathers from "@feathersjs/feathers";
+import { feathers } from "@feathersjs/feathers";
 import { createAliasResolver, defineAbility } from "@casl/ability";
 
 const resolveAction = createAliasResolver({
@@ -136,4 +136,4 @@ export default (
       );
     });
   });
-};
+};

test/hooks/authorize/adapters/makeTests/update-data.ts

@@ -1,5 +1,5 @@
 import assert from "assert";
-import feathers from "@feathersjs/feathers";
+import { feathers } from "@feathersjs/feathers";
 import { createAliasResolver, defineAbility } from "@casl/ability";
 
 const resolveAction = createAliasResolver({
@@ -161,4 +161,4 @@ export default (
       }
     });
   });
-};
+};

test/hooks/authorize/adapters/makeTests/update.ts

@@ -1,5 +1,5 @@
 import assert from "assert";
-import feathers from "@feathersjs/feathers";
+import { feathers } from "@feathersjs/feathers";
 import { createAliasResolver, defineAbility } from "@casl/ability";
 
 const resolveAction = createAliasResolver({
@@ -211,4 +211,4 @@ export default (
       assert.deepStrictEqual(itemInDb, updatedItem, "item in db is complete");
     });
   });
-};
+};

test/hooks/authorize/authorize.general.test.ts

@@ -5,7 +5,7 @@ import {
   defineAbility
 } from "@casl/ability";
 import _cloneDeep from "lodash/cloneDeep";
-import { markHookForSkip } from "feathers-utils/dist";
+import { markHookForSkip } from "feathers-utils";
 import { HOOKNAME as HOOKNAME_CHECKBASICPERMISSION } from "../../../lib/hooks/checkBasicPermission.hook";
 import { HookContext } from "@feathersjs/feathers";