Fix issue with graphql-upload-client (#1838)

ardatan · Jul 28, 2020 · cb717e6 · cb717e6
1 parent 1997f71
commit cb717e6
Show file tree

Hide file tree

Showing 3 changed files with 20 additions and 8 deletions.
diff --git a/packages/links/src/linkToExecutor.ts b/packages/links/src/linkToExecutor.ts
@@ -19,6 +19,7 @@ export const linkToExecutor = (link: ApolloLink) => <TReturn, TArgs, TContext>({
       context: {
         graphqlContext: context,
         graphqlResolveInfo: info,
+        clientAwareness: {},
       },
     }) as Observable<FetchResult<TReturn>>
   );
diff --git a/packages/links/src/linkToSubscriber.ts b/packages/links/src/linkToSubscriber.ts
@@ -20,6 +20,7 @@ export const linkToSubscriber = (link: ApolloLink) => async <TReturn, TArgs, TCo
       context: {
         graphqlContext: context,
         graphqlResolveInfo: info,
+        clientAwareness: {},
       },
     }) as Observable<FetchResult<TReturn>>
   );
diff --git a/packages/links/tests/upload.test.ts b/packages/links/tests/upload.test.ts
@@ -57,7 +57,12 @@ function testGraphqlMultipartRequest(query: string, port: number) {
 }
 
 describe('graphql upload', () => {
-  test('should return a file after uploading one', async () => {
+  let remoteServer: Server
+  let remotePort: number
+  let gatewayServer: Server
+  let gatewayPort: number
+
+  beforeAll(async () => {
     const remoteSchema = makeExecutableSchema({
       typeDefs: `
         scalar Upload
@@ -86,8 +91,8 @@ describe('graphql upload', () => {
       graphqlHTTP({ schema: remoteSchema }),
     );
 
-    const remoteServer = await startServer(remoteApp);
-    const remotePort = (remoteServer.address() as AddressInfo).port;
+    remoteServer = await startServer(remoteApp);
+    remotePort = (remoteServer.address() as AddressInfo).port;
 
     const nonExecutableSchema = buildSchema(`
       scalar Upload
@@ -120,8 +125,16 @@ describe('graphql upload', () => {
       graphqlHTTP({ schema: gatewaySchema }),
     );
 
-    const gatewayServer = await startServer(gatewayApp);
-    const gatewayPort = (gatewayServer.address() as AddressInfo).port;
+    gatewayServer = await startServer(gatewayApp);
+    gatewayPort = (gatewayServer.address() as AddressInfo).port;
+  })
+
+  afterAll(async () => {
+    remoteServer.close();
+    gatewayServer.close();
+  })
+
+  test('should return a file after uploading one', async () => {
     const query = `
       mutation upload($file: Upload!) {
         upload(file: $file)
@@ -134,8 +147,5 @@ describe('graphql upload', () => {
         upload: 'abc',
       },
     });
-
-    remoteServer.close();
-    gatewayServer.close();
   });
 });