Bugfixes and persist integration test

Author: phortx

src/queryBuilder.ts

@@ -158,7 +158,8 @@ export default class QueryBuilder {
   public buildQuery (type: string, name?: string, args?: Arguments, model?: (Model | null | string), fields?: string, addModelToArgs: boolean = false, multiple?: boolean) {
     model = model ? this.getModel(model) : null;
 
-    if (!args) args = {};
+    args = args ? JSON.parse(JSON.stringify(args)) : {};
+    if (!args) throw new Error("args is undefined");
     if (addModelToArgs && model) args[model.singularName] = { __type: upcaseFirstLetter(model.singularName) };
 
     multiple = multiple === undefined ? !args['id'] : multiple;

src/vuex-orm-apollo.ts

@@ -212,13 +212,14 @@ export default class VuexORMApollo {
   private async mutate (action: string, data: Data | undefined, dispatch: DispatchFunction, model: Model, addModelToArgs: boolean = false, multiple?: boolean): Promise<any> {
     if (data) {
       const id = data.id ? data.id : undefined;
-      // TODO what about the quers fields?
-      const query = this.queryBuilder.buildQuery('mutation', action, data, model, undefined, addModelToArgs, multiple);
-
       const variables: Data = {
         [model.singularName]: this.queryBuilder.transformOutgoingData(data)
       };
 
+      // TODO what about the query fields?
+      const query = this.queryBuilder.buildQuery('mutation', action, variables, model, undefined, addModelToArgs, multiple);
+
+      // TODO don't add id for persist
       if (id) variables['id'] = id;
 
       // Send GraphQL Mutation

test/integration/VuexORMApollo.spec.js

@@ -139,36 +139,36 @@ query User($id: ID!) {
 
         expect(request.variables).toEqual({});
         expect(request.query).toEqual(`
-  query Users {
-    users {
-      nodes {
-        id
-        name
-        posts {
-          nodes {
-            id
-            title
-            content
-            __typename
-          }
+query Users {
+  users {
+    nodes {
+      id
+      name
+      posts {
+        nodes {
+          id
+          title
+          content
           __typename
         }
         __typename
       }
       __typename
     }
+    __typename
   }
+}
           `.trim() + "\n");
       });
     });
   });
 
 
-  describe('create', () => {
+  describe('persist', () => {
     it('sends the correct query to the API', async () => {
       const response = {
         data: {
-          user: {
+          createUser: {
             __typename: 'user',
             id: 1,
             name: 'Johnny Imba',
@@ -181,26 +181,26 @@ query User($id: ID!) {
       };
 
       const request = await sendWithMockFetch(response, async () => {
-        await store.dispatch('entities/users/create', { user: { name: 'Charlie Brown' } });
+        await store.dispatch('entities/users/persist', { id: 1 });
       });
 
-      expect(request.variables).toEqual({ user: { name: 'Charlie Brown' } });
+      expect(request.variables).toEqual({ id: 1, user: { name: 'Johnny Imba' } });
       expect(request.query).toEqual(`
-mutation createUser($user: UserInput!) {
-createUser(user: $user) {
-  id
-  name
-  posts {
-    nodes {
-      id
-      title
-      content
+mutation CreateUser($user: UserInput!) {
+  createUser(user: $user) {
+    id
+    name
+    posts {
+      nodes {
+        id
+        title
+        content
+        __typename
+      }
       __typename
     }
     __typename
   }
-  __typename
-}
 }
       `.trim() + "\n");
     });

test/support/Helpers.js

@@ -38,13 +38,17 @@ export async function sendWithMockFetch(response, callback) {
 
   try {
     await callback();
+
   } catch (error) {
     console.error("An error occured:");
     console.error(error);
     throw new Error("Request failed!");
   }
 
   const request = fetchMock.lastCall();
+
+  if (!request) throw new Error("No request was made!");
+
   fetchMock.restore();
 
   /*

test/unit/QueryBuilder.spec.js

@@ -298,8 +298,8 @@ query users {
       query = QueryBuilder.prettify(query.loc.source.body);
 
       expect(query).toEqual(`
-query Users($_c: String!) {
-  users(_c: $_c) {
+query Users {
+  users {
     nodes {
       id
       name