fix undefined resolver

NewSpring · Aug 6, 2016 · 0033c17 · 0033c17
1 parent cb6b727
commit 0033c17
Show file tree

Hide file tree

Showing 3 changed files with 37 additions and 39 deletions.
diff --git a/src/apollos/models/users/resolver.ts b/src/apollos/models/users/resolver.ts
@@ -11,7 +11,7 @@ import { createGlobalId } from "../../../util";
 export default {
   Query: {
     currentUser(_: any, args: any, { user }: any): any {
-      return user;
+      return user || null;
     },
   },
 

diff --git a/test/apollos/models/users/queries.integration.ts b/test/apollos/models/users/queries.integration.ts
@@ -25,36 +25,34 @@ test.before(async (t) => {
 
 });
 
-test("allows a test to be passed", t => {
-  t.pass();
+
+test("Valid queries should return success", async (t) => {
+  const response = await Heighliner(JSON.stringify({
+    query: `
+      query CurrentUser {
+        currentUser {
+          id
+          createdAt
+          emails {
+            address
+          }
+          services {
+            rock {
+              id
+              alias
+            }
+            resume {
+              tokens {
+                when
+                hashedToken
+              }
+            }
+          }
+        }
+      }
+    `,
+  }));
+  t.true(response.success);
+  t.is(response.status, 200);
+  t.truthy(response.data);
 });
-// test("Valid queries should return success", async (t) => {
-//   const response = await Heighliner(JSON.stringify({
-//     query:`
-//       query CurrentUser {
-//         currentUser {
-//           id
-//           createdAt
-//           emails {
-//             address
-//           }
-//           services {
-//             rock {
-//               id
-//               alias
-//             }
-//             resume {
-//               tokens {
-//                 when
-//                 hashedToken
-//               }
-//             }
-//           }
-//         }
-//       }
-//     `,
-//   }));
-//   t.true(response.success);
-//   t.is(response.status, 200);
-//   t.truthy(response.data);
-// });
diff --git a/test/server.integration.ts b/test/server.integration.ts
@@ -24,12 +24,12 @@ test.before(async (t) => {
 });
 
 
-// test("Valid queries should return success", async (t) => {
-//   const response = await Heighliner(JSON.stringify({ query: "{ currentUser { id } }" }));
-//   t.true(response.success);
-//   t.is(response.status, 200);
-//   t.truthy(response.data);
-// });
+test("Valid queries should return success", async (t) => {
+  const response = await Heighliner(JSON.stringify({ query: "{ currentUser { id } }" }));
+  t.true(response.success);
+  t.is(response.status, 200);
+  t.truthy(response.data);
+});
 
 test("Invalid queries should fail", async (t) => {
   const response = await Heighliner(JSON.stringify({ query: "{ foobar { id } }" }));