Add query checking to tests

Author: Jessica Jiang

fixtures/query-collection-fixture.js

@@ -0,0 +1,22 @@
+export default {
+  "data": {
+    "shop": {
+      "collections": {
+        "pageInfo": {
+          "hasNextPage": false,
+          "hasPreviousPage": false
+        },
+        "edges": [
+          {
+            "cursor": "eyJsYXN0X2lkIjozNjkzMTI1ODQsImxhc3RfdmFsdWUiOiIzNjkzMTI1ODQifQ==",
+            "node": {
+              "id": "gid://shopify/Collection/369312584",
+              "title": "Cat Collection",
+              "updatedAt": "2017-02-09T19:06:44Z"
+            }
+          }
+        ]
+      }
+    }
+  }
+};

fixtures/query-product-fixture.js

@@ -0,0 +1,24 @@
+export default {
+  "data": {
+    "shop": {
+      "products": {
+        "pageInfo": {
+          "hasNextPage": false,
+          "hasPreviousPage": false
+        },
+        "edges": [
+          {
+            "cursor": "eyJsYXN0X2lkIjo3ODU3OTg5Mzg0LCJsYXN0X3ZhbHVlIjoiNzg1Nzk4OTM4NCJ9",
+            "node": {
+              "id": "gid://shopify/Product/7857989384",
+              "updatedAt": "2017-02-17T19:56:02Z",
+              "createdAt": "2016-09-25T21:31:33Z",
+              "productType": "dog",
+              "title": "Cat"
+            }
+          }
+        ]
+      }
+    }
+  }
+};

test/.eslintrc.json

@@ -0,0 +1,5 @@
+{
+  "rules": {
+    "no-unused-vars": ["error", { "varsIgnorePattern": "^_" }]
+  }
+}

test/client-test.js

@@ -14,6 +14,8 @@ import productWithPaginatedImagesFixture from '../fixtures/product-with-paginate
 import {secondPageImagesFixture, thirdPageImagesFixture} from '../fixtures/paginated-images-fixtures';
 import productWithPaginatedVariantsFixture from '../fixtures/product-with-paginated-variants-fixture';
 import {secondPageVariantsFixture, thirdPageVariantsFixture} from '../fixtures/paginated-variants-fixtures';
+import queryProductFixture from '../fixtures/query-product-fixture';
+import queryCollectionFixture from '../fixtures/query-collection-fixture';
 import fetchMock from './isomorphic-fetch-mock'; // eslint-disable-line import/no-unresolved
 import productQuery from '../src/product-query';
 import imageQuery from '../src/image-query';
@@ -31,6 +33,12 @@ import shopInfoFixture from '../fixtures/shop-info-fixture';
 import shopPoliciesFixture from '../fixtures/shop-policies-fixture';
 
 suite('client-test', () => {
+  const querySplitter = /[\s,]+/;
+
+  function tokens(query) {
+    return query.split(querySplitter).filter((token) => Boolean(token));
+  }
+
   teardown(() => {
     fetchMock.restore();
   });
@@ -283,11 +291,39 @@ suite('client-test', () => {
 
     const client = new Client(config);
 
-    fetchMock.postOnce('https://query-products.myshopify.com/api/graphql', {data: {shop: {products: {edges: [{node: {title: 'Cat'}}], pageInfo: {hasNextPage: false, hasPreviousPage: false}}}}});
+    fetchMock.postOnce('https://query-products.myshopify.com/api/graphql', queryProductFixture);
+
+    const query = {title: 'Cat', updatedAtMin: '2016-09-25T21:31:33', createdAtMin: '2016-09-25T21:31:33', productType: 'dog', limit: 10};
+
+    return client.fetchQueryProducts(query, productConnectionQuery(['updatedAt', 'createdAt', 'productType', 'title'])).then((products) => {
+      const [_arg, {body}] = fetchMock.lastCall('https://query-products.myshopify.com/api/graphql');
+      const queryString = `query {
+        shop {
+          products (first: 10 query: "title:'Cat' updated_at:>='2016-09-25T21:31:33' created_at:>='2016-09-25T21:31:33' product_type:'dog'") {
+            pageInfo {
+              hasNextPage,
+              hasPreviousPage
+            },
+            edges {
+              cursor,
+              node {
+                id,
+                updatedAt,
+                createdAt,
+                productType,
+                title
+              }
+            }
+          }
+        }
+      }`;
 
-    return client.fetchQueryProducts({title: 'Cat', limit: 10}, productConnectionQuery(['title'])).then((products) => {
+      assert.deepEqual(tokens(JSON.parse(body).query), tokens(queryString));
       assert.equal(products.length, 1);
-      assert.equal(products[0].title, 'Cat');
+      assert.equal(products[0].title, queryProductFixture.data.shop.products.edges[0].node.title);
+      assert.equal(products[0].createdAt, queryProductFixture.data.shop.products.edges[0].node.createdAt);
+      assert.equal(products[0].updatedAt, queryProductFixture.data.shop.products.edges[0].node.updatedAt);
+      assert.equal(products[0].productType, queryProductFixture.data.shop.products.edges[0].node.productType);
       assert.ok(fetchMock.done());
     });
   });
@@ -300,11 +336,35 @@ suite('client-test', () => {
 
     const client = new Client(config);
 
-    fetchMock.postOnce('https://query-collections.myshopify.com/api/graphql', {data: {shop: {collections: {edges: [{node: {title: 'Cat Collection'}}], pageInfo: {hasNextPage: false, hasPreviousPage: false}}}}});
+    fetchMock.postOnce('https://query-collections.myshopify.com/api/graphql', queryCollectionFixture);
+
+    const query = {title: 'Cat Collection', updatedAtMin: '2016-09-25T21:31:33', limit: 10};
+
+    return client.fetchQueryCollections(query, collectionConnectionQuery(['title', 'updatedAt'])).then((collections) => {
+      const [_arg, {body}] = fetchMock.lastCall('https://query-collections.myshopify.com/api/graphql');
+      const queryString = `query {
+        shop {
+          collections (first: 10 query: "title:'Cat Collection' updated_at:>='2016-09-25T21:31:33'") {
+            pageInfo {
+              hasNextPage,
+              hasPreviousPage
+            },
+            edges {
+              cursor,
+              node {
+                id,
+                title,
+                updatedAt
+              }
+            }
+          }
+        }
+      }`;
 
-    return client.fetchQueryCollections({title: 'Cat Collection', limit: 10}, collectionConnectionQuery(['title'])).then((collections) => {
+      assert.deepEqual(tokens(JSON.parse(body).query), tokens(queryString));
       assert.equal(collections.length, 1);
-      assert.equal(collections[0].title, 'Cat Collection');
+      assert.equal(collections[0].title, queryCollectionFixture.data.shop.collections.edges[0].node.title);
+      assert.equal(collections[0].updatedAt, queryCollectionFixture.data.shop.collections.edges[0].node.updatedAt);
       assert.ok(fetchMock.done());
     });
   });