From 9479802d65016917b74ea67fd60792c1102fb016 Mon Sep 17 00:00:00 2001 From: Nathan Bierema Date: Mon, 25 Oct 2021 12:59:39 -0400 Subject: [PATCH] Change --- packages/redux-devtools-cli/src/routes.ts | 16 ++++++++++------ .../redux-devtools-cli/test/integration.spec.ts | 4 +++- 2 files changed, 13 insertions(+), 7 deletions(-) diff --git a/packages/redux-devtools-cli/src/routes.ts b/packages/redux-devtools-cli/src/routes.ts index 0ddbdb04..25b8203d 100644 --- a/packages/redux-devtools-cli/src/routes.ts +++ b/packages/redux-devtools-cli/src/routes.ts @@ -6,7 +6,6 @@ import bodyParser from 'body-parser'; import cors from 'cors'; import { SCServer } from 'socketcluster-server'; import { ApolloServer } from 'apollo-server-express'; -import graphqlMiddleware from './middleware/graphql'; import { AddData, ReportBaseFields, Store } from './store'; import { resolvers, schema } from './api/schema'; @@ -49,11 +48,16 @@ function routes( store: store, }, }); - await server.start(); - server.applyMiddleware({ app }); - graphqlMiddleware(store).applyMiddleware({ app } as { - app: express.Application; - }); + server + .start() + .then(() => { + server.applyMiddleware({ app } as { + app: express.Application; + }); + }) + .catch((error) => { + console.error(error); // eslint-disable-line no-console + }); serveUmdModule('react'); serveUmdModule('react-dom'); diff --git a/packages/redux-devtools-cli/test/integration.spec.ts b/packages/redux-devtools-cli/test/integration.spec.ts index b5dac04a..ec1482f7 100644 --- a/packages/redux-devtools-cli/test/integration.spec.ts +++ b/packages/redux-devtools-cli/test/integration.spec.ts @@ -2,11 +2,13 @@ import childProcess from 'child_process'; import request from 'supertest'; import scClient from 'socketcluster-client'; +jest.setTimeout(10000); + describe('Server', function () { let scServer: childProcess.ChildProcess; beforeAll(async function () { scServer = childProcess.fork(__dirname + '/../bin/redux-devtools.js'); - await new Promise((resolve) => setTimeout(resolve, 4000)); + await new Promise((resolve) => setTimeout(resolve, 5000)); }); afterAll(function () {