test: fix e2e test setup

jonathonadams · Sep 9, 2020 · 2218c6e · 2218c6e
1 parent c5da0dc
commit 2218c6e
Show file tree

Hide file tree

Showing 7 changed files with 226 additions and 296 deletions.
diff --git a/apps/server/api/src/environments/test.ts b/apps/server/api/src/environments/test.ts
@@ -3,7 +3,7 @@
 import { TestServerConfig } from '@ztp/data';
 import { AuthEnv } from '@ztp/server/auth';
 
-const audience = 'http://localhost:3000';
+const audience = `http://localhost:${process.env.PORT}`;
 const authServerHost = audience;
 
 const privateKey = `-----BEGIN PRIVATE KEY-----

diff --git a/apps/server/api/src/server/api/todos/todo.e2e.spec.ts b/apps/server/api/src/server/api/todos/todo.e2e.spec.ts
@@ -1,3 +1,6 @@
+process.env.PORT = '9999';
+
+import { createHash } from 'crypto';
 import Koa from 'koa';
 import { ITodo } from '@ztp/data';
 import { authConfig } from '../../../environments/index';
@@ -7,6 +10,10 @@ import { createGraphQLSpec } from '@ztp/tests/server';
 import { Todo } from './todo.model';
 import { User } from '../users';
 
+const keyId = createHash('md5')
+  .update(authConfig.accessToken.publicKey as string)
+  .digest('hex');
+
 // Need to import and run the server because
 // the server is also our "auth server"
 // and the Auth guard needs to be able to retrieve the JWKS
@@ -23,7 +30,7 @@ const updatedTodo = {
 
 createGraphQLSpec(
   schema,
-  { ...authConfig.accessToken, keyId: 'keyId' },
+  { ...authConfig.accessToken, keyId },
   server,
   /*userResource */ true
 )(Todo, 'Todo', todo, updatedTodo, User);
diff --git a/apps/server/api/src/server/api/users/user.e2e.spec.ts b/apps/server/api/src/server/api/users/user.e2e.spec.ts
@@ -1,3 +1,5 @@
+process.env.PORT = '9999';
+
 import Koa from 'koa';
 import { MongoMemoryServer } from 'mongodb-memory-server';
 import { runQuery, setupTestDB, signTestAccessToken } from '@ztp/tests/server';
@@ -8,6 +10,11 @@ import { IUser } from '@ztp/data';
 import ApiServer from '../../server';
 import { Server } from 'http';
 import { User } from './user.model';
+import { createHash } from 'crypto';
+
+const keyId = createHash('md5')
+  .update(authConfig.accessToken.publicKey as string)
+  .digest('hex');
 
 // Need to import and run the server because
 // the server is also our "auth server"
@@ -41,10 +48,11 @@ describe(`GraphQL / User`, () => {
     testServer = await server.initializeServer(dbUri);
 
     createdUser = await User.create(user);
+
     [createdUser.id, createdUser._id] = [createdUser._id, createdUser.id];
-    jwt = signTestAccessToken({ ...authConfig.accessToken, keyId: 'id' })(
-      createdUser
-    );
+
+    const config = { ...authConfig.accessToken, keyId };
+    jwt = signTestAccessToken(config)(createdUser);
   });
 
   afterAll(async () => {

diff --git a/libs/tests/src/lib/server/graphQLSpec.ts b/libs/tests/src/lib/server/graphQLSpec.ts
@@ -1,5 +1,4 @@
 /* istanbul ignore file */
-
 import 'jest-extended';
 import { GraphQLSchema } from 'graphql';
 import { MongoMemoryServer } from 'mongodb-memory-server';

diff --git a/libs/tests/src/lib/server/helpers.ts b/libs/tests/src/lib/server/helpers.ts
@@ -2,29 +2,6 @@ import mongoose from 'mongoose';
 import { MongoMemoryServer } from 'mongodb-memory-server';
 import { graphql, GraphQLSchema } from 'graphql';
 
-// export interface RESTTestResource<T> {
-//   model: any;
-//   resourceName: string;
-//   urlString: string;
-//   resourceToCreate: any;
-//   resourceToUpdate: any;
-//   testDependents?: TestDependents[];
-// }
-
-// export interface GraphQLTestResource<T> {
-//   model: any;
-//   resourceName: string;
-//   queryName: string;
-//   resourceToCreate: any;
-//   resourceToUpdate: any;
-//   testDependents?: TestDependents[];
-// }
-
-// export interface TestDependents {
-//   model: any;
-//   resource: any;
-// }
-
 /**
  * Helper function to generate ObjectID, note it returns the hex string of the ObjectId
  */