Merge pull request apollographql#50 from apollostack/add-context

Add context support to Express
PhiloInc · Jul 19, 2016 · f2bc41c · f2bc41c
2 parents 8a49a8b + 6633e52
commit f2bc41c
Show file tree

Hide file tree

Showing 2 changed files with 23 additions and 1 deletion.
diff --git a/src/integrations/expressApollo.ts b/src/integrations/expressApollo.ts
@@ -81,6 +81,7 @@ export function apolloExpress(options: ApolloOptions | ExpressApolloOptionsFunct
           schema: optionsObject.schema,
           query: query,
           variables: variables,
+          context: optionsObject.context,
           rootValue: optionsObject.rootValue,
           operationName: operationName,
           logFunction: optionsObject.logFunction,

diff --git a/src/integrations/integrations.test.ts b/src/integrations/integrations.test.ts
@@ -21,7 +21,10 @@ const QueryType = new GraphQLObjectType({
     fields: {
         testString: {
             type: GraphQLString,
-            resolve() {
+            resolve(_, params, context) {
+                if (context) {
+                  context();
+                }
                 return 'it works';
             },
         },
@@ -274,6 +277,24 @@ export default (createApp: CreateAppFunc) => {
           });
       });
 
+      it('passes the context to the resolver', () => {
+          let results;
+          const expected = 'it works';
+          const app = createApp({apolloOptions: {
+              schema: Schema,
+              context: () => results = expected,
+          }});
+          const req = request(app)
+              .post('/graphql')
+              .send({
+                  query: 'query test{ testString }',
+              });
+          return req.then((res) => {
+              expect(res.status).to.equal(200);
+              return expect(results).to.equal(expected);
+          });
+      });
+
     });