@ordergroove/offers 2.45.3 → 2.45.4-alpha-PR-1235-7.274

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ordergroove/offers",
-  "version": "2.45.3",
+  "version": "2.45.4-alpha-PR-1235-7.274+a9bcab55",
   "description": "offer state component",
   "author": "Eugenio Lattanzio <eugenio63@gmail.com>",
   "homepage": "https://github.com/ordergroove/plush-toys#readme",
@@ -35,8 +35,8 @@
     }
   ],
   "dependencies": {
-    "@ordergroove/auth": "^2.3.3",
-    "@ordergroove/offers-live-editor": "^0.6.8",
+    "@ordergroove/auth": "^2.3.4-alpha-PR-1235-7.2006+a9bcab55",
+    "@ordergroove/offers-live-editor": "^0.6.9-alpha-PR-1235-7.274+a9bcab55",
     "lit-element": "^2.1.0",
     "lodash.memoize": "^4.1.2",
     "logical-expression-parser": "1.0.0",
@@ -46,8 +46,8 @@
     "throttle-debounce": "^2.1.0"
   },
   "devDependencies": {
-    "@ordergroove/offers-templates": "^0.9.7",
+    "@ordergroove/offers-templates": "^0.9.8-alpha-PR-1235-7.539+a9bcab55",
     "@types/lodash.memoize": "^4.1.9"
   },
-  "gitHead": "e57df53943199756cb0dafc4919af9b62536c35f"
+  "gitHead": "a9bcab55608940a294cde12e9d678b8daa6ce355"
 }

package/src/core/__tests__/api.spec.js

@@ -2,12 +2,16 @@ import fetchMock from 'fetch-mock';
 
 import { api, toQuery, withFetchJson, withAuth, withHost, parseFrequency } from '../api';
 
-const MATCHED = fetchMock.MATCHED;
 describe('api.fetchOffer', () => {
   describe('test request', () => {
-    beforeEach(() => fetchMock.get('*', {}));
+    beforeEach(() => {
+      fetchMock.route('*', {}).mockGlobal();
+    });
 
-    afterEach(() => fetchMock.restore());
+    afterEach(() => {
+      fetchMock.removeRoutes();
+      fetchMock.unmockGlobal();
+    });
 
     it('should export fetchOffer method', () => {
       expect(typeof api.fetchOffer).toEqual('function');
@@ -30,7 +34,7 @@ describe('api.fetchOffer', () => {
 
     it('should call correct merchant endpoint with params', async () => {
       await api.fetchOffer('https://staging.offers.ordergroove.com', 'some-merchant', 'some-session', 'some-product');
-      const lastUrl = fetchMock.lastUrl(MATCHED);
+      const lastUrl = fetchMock.callHistory.lastCall().url;
       expect(lastUrl).toContain('https://staging.offers.ordergroove.com/offer/some-merchant/pdp');
       expect(lastUrl).toContain('session_id=some-session');
       expect(lastUrl).toContain('page_type=1');
@@ -47,7 +51,7 @@ describe('api.fetchOffer', () => {
       ];
       const expected = encodeURIComponent('["yum product"]');
       await api.fetchOffer('some-host', 'some-merchant', 'some-session', mockProducts);
-      const lastUrl = fetchMock.lastUrl(MATCHED);
+      const lastUrl = fetchMock.callHistory.lastCall().url;
       expect(lastUrl).toContain(expected);
     });
 
@@ -65,22 +69,25 @@ describe('api.fetchOffer', () => {
       ];
       const expected = encodeURIComponent('["yum product 1","product-as-string","yum product 2"]');
       await api.fetchOffer('some-host', 'some-merchant', 'some-session', mockProducts);
-      const lastUrl = fetchMock.lastUrl(MATCHED);
+      const lastUrl = fetchMock.callHistory.lastCall().url;
       expect(lastUrl).toContain(expected);
     });
   });
 
   describe('test response', () => {
-    afterEach(() => fetchMock.restore());
+    afterEach(() => {
+      fetchMock.removeRoutes();
+      fetchMock.unmockGlobal();
+    });
 
     it('should handle json response', async () => {
-      fetchMock.get('*', { status: 200, body: { some: 'object' } });
+      fetchMock.route('*', { status: 200, body: { some: 'object' } }).mockGlobal();
       const response = await api.fetchOffer('some-host', 'yum', 'yum', 'product');
       expect(response).toEqual({ some: 'object' });
     });
 
     it('should reject promise if bad response', async () => {
-      fetchMock.get('*', { status: 200, body: 'invalid json' });
+      fetchMock.route('*', { status: 200, body: 'invalid json' }).mockGlobal();
       await api.fetchOffer('some-host', 'yum', 'yum', 'another').then(fail, err => {
         expect(err).toBeTruthy();
       });
@@ -88,14 +95,18 @@ describe('api.fetchOffer', () => {
   });
 
   describe('memoization', () => {
-    afterEach(() => fetchMock.restore());
+    afterEach(() => {
+      fetchMock.removeRoutes();
+      fetchMock.unmockGlobal();
+    });
 
     it('should fetch once', async () => {
-      fetchMock.get('*', { status: 200, body: { some: 'object' } });
+      fetchMock.route('*', { status: 200, body: { some: 'object' } }).mockGlobal();
+      fetchMock.callHistory.clear();
       const one = await api.fetchOffer('some-host', 'yum1', 'yum', 'product');
       const two = await api.fetchOffer('some-host', 'yum1', 'yum', 'product');
       expect(one).toEqual(two);
-      expect(fetchMock.calls().length).toEqual(1);
+      expect(fetchMock.callHistory.calls().length).toEqual(1);
     });
   });
 });
@@ -106,12 +117,13 @@ describe('helpers', () => {
     });
 
     it('should fetch and return json', async () => {
-      fetchMock.get('*', { status: 200, body: { some: 'object' } });
+      fetchMock.route('*', { status: 200, body: { some: 'object' } }).mockGlobal();
       const fn = jasmine.createSpy('fn').and.returnValue(['/foo']);
       const rs = await withFetchJson(fn)();
-      expect(fetchMock.lastUrl(MATCHED)).toEqual('/foo');
+      expect(fetchMock.callHistory.lastCall().url).toContain('/foo');
       expect(rs).toEqual({ some: 'object' });
-      fetchMock.restore();
+      fetchMock.removeRoutes();
+      fetchMock.unmockGlobal();
     });
   });
 
@@ -188,9 +200,14 @@ describe('helpers', () => {
 });
 describe('api.fetchOrders', () => {
   describe('test request', () => {
-    beforeEach(() => fetchMock.get('*', {}));
+    beforeEach(() => {
+      fetchMock.route('*', {}).mockGlobal();
+    });
 
-    afterEach(() => fetchMock.restore());
+    afterEach(() => {
+      fetchMock.removeRoutes();
+      fetchMock.unmockGlobal();
+    });
 
     const underTest = api.fetchOrders;
 
@@ -210,18 +227,18 @@ describe('api.fetchOrders', () => {
 
     it('should pass authorization as JSON stringify header', async () => {
       await underTest('https://host.com', { some: 'auth' });
-      expect(fetchMock.lastOptions(MATCHED)).toEqual(
+      expect(fetchMock.callHistory.lastCall().options).toEqual(
         jasmine.objectContaining({
-          headers: {
-            Authorization: '{"some":"auth"}'
-          }
+          headers: jasmine.objectContaining({
+            authorization: '{"some":"auth"}'
+          })
         })
       );
     });
 
     it('should call endpoint default params', async () => {
       await underTest('https://host.com', { some: 'auth' }, 2, 'foo');
-      expect(fetchMock.lastUrl(MATCHED)).toEqual(
+      expect(fetchMock.callHistory.lastCall().url).toEqual(
         'https://host.com/orders/?status=2&ordering=foo&exclude_prepaid_orders=true'
       );
     });
@@ -250,20 +267,23 @@ describe('api.fetchOrders', () => {
     });
 
     it('should call iu endpoint', async () => {
-      fetchMock.post('*', { status: 200, body: { some: 'object' } });
+      fetchMock.route('*', { status: 200, body: { some: 'object' } }).mockGlobal();
       await api.createOneTime('https://some-host', { some: 'auth' }, 'yum-product', 'some-order', 1, 'yum-offer');
-      expect(fetchMock.lastUrl(MATCHED)).toEqual('https://some-host/items/iu/');
-      expect(fetchMock.lastOptions(MATCHED)).toEqual({
-        method: 'POST',
-        body: JSON.stringify({
-          product: 'yum-product',
-          order: 'some-order',
-          quantity: 1,
-          offer: 'yum-offer'
-        }),
-        headers: jasmine.any(Object)
-      });
-      fetchMock.restore();
+      expect(fetchMock.callHistory.lastCall().url).toEqual('https://some-host/items/iu/');
+      expect(fetchMock.callHistory.lastCall().options).toEqual(
+        jasmine.objectContaining({
+          method: 'post',
+          body: JSON.stringify({
+            product: 'yum-product',
+            order: 'some-order',
+            quantity: 1,
+            offer: 'yum-offer'
+          }),
+          headers: jasmine.any(Object)
+        })
+      );
+      fetchMock.removeRoutes();
+      fetchMock.unmockGlobal();
     });
   });
 
@@ -303,22 +323,25 @@ describe('api.fetchOrders', () => {
     });
 
     it('should convertOneTimeToSubscription call iu endpoint', async () => {
-      fetchMock.post('*', { status: 200, body: { some: 'object' } });
+      fetchMock.route('*', { status: 200, body: { some: 'object' } }).mockGlobal();
       const offer = 'some-offer-id';
       const expected = ['https://some-host', { some: 'auth' }, { public_id: 'yum-item' }, '1_2', offer];
       await api.convertOneTimeToSubscription(...expected);
-      expect(fetchMock.lastUrl(MATCHED)).toEqual('https://some-host/subscriptions/create_from_item/');
-      expect(fetchMock.lastOptions(MATCHED)).toEqual({
-        method: 'POST',
-        body: JSON.stringify({
-          item: 'yum-item',
-          offer,
-          every: 1,
-          every_period: 2
-        }),
-        headers: jasmine.any(Object)
-      });
-      fetchMock.restore();
+      expect(fetchMock.callHistory.lastCall().url).toEqual('https://some-host/subscriptions/create_from_item/');
+      expect(fetchMock.callHistory.lastCall().options).toEqual(
+        jasmine.objectContaining({
+          method: 'post',
+          body: JSON.stringify({
+            item: 'yum-item',
+            offer,
+            every: 1,
+            every_period: 2
+          }),
+          headers: jasmine.any(Object)
+        })
+      );
+      fetchMock.removeRoutes();
+      fetchMock.unmockGlobal();
     });
   });
 });

package/src/index.js

@@ -8,6 +8,7 @@ import { autoInitializeOffers, onReady } from './core/utils';
 import { authorizeShopifyCustomer } from './shopify/shopifyBootstrap';
 import shopifyTrackingMiddleware from './shopify/shopifyTrackingMiddleware';
 
+console.log('Offers store initializing');
 export const store = makeStore(
   ...(platform?.shopify_selling_plans ? [shopifyReducer, shopifyMiddleware] : [defaultReducer]),
   platform.shopify && shopifyTrackingMiddleware

package/src/shopify/__tests__/shopifyMiddleware.spec.js

@@ -106,8 +106,8 @@ describe('synchronizeCartOptin', () => {
     frequency = '1234';
     product = { id: '38995975209111:original-hash' };
 
-    fetchMock.once(
-      'cart.js',
+    fetchMock.route(
+      '/cart.js',
       {
         attributes: {},
         items: [
@@ -117,11 +117,11 @@ describe('synchronizeCartOptin', () => {
           }
         ]
       },
-      { method: 'GET' }
+      { method: 'GET', repeat: 1 }
     );
 
-    fetchMock.once(
-      'cart/change.js',
+    fetchMock.route(
+      '/cart/change.js',
       {
         attributes: {},
         items: [
@@ -131,12 +131,14 @@ describe('synchronizeCartOptin', () => {
           }
         ]
       },
-      { method: 'POST' }
+      { method: 'POST', repeat: 1 }
     );
+
+    fetchMock.mockGlobal();
   });
 
   afterEach(() => {
-    fetchMock.restore();
+    fetchMock.removeRoutes().unmockGlobal();
     offer.remove();
   });
 
@@ -171,7 +173,7 @@ describe('synchronizeCartOptin', () => {
     document.body.appendChild(sectionDiv);
 
     await synchronizeCartOptin({ type: OPTIN_PRODUCT, payload: { offer, frequency, product } }, store);
-    expect(fetchMock.lastOptions().body).toContain('"sections":["123456789__cart-items"]');
+    expect(fetchMock.callHistory.lastCall().options.body).toContain('"sections":["123456789__cart-items"]');
     sectionDiv.remove();
   });
 
@@ -183,7 +185,7 @@ describe('synchronizeCartOptin', () => {
     document.body.appendChild(sectionDiv);
 
     await synchronizeCartOptin({ type: OPTIN_PRODUCT, payload: { offer, frequency, product } }, store);
-    expect(fetchMock.lastOptions().body).toContain('"sections":["123456789__cart-footer"]');
+    expect(fetchMock.callHistory.lastCall().options.body).toContain('"sections":["123456789__cart-footer"]');
     sectionDiv.remove();
   });
 
@@ -221,7 +223,7 @@ describe('synchronizeCartOptin', () => {
       }
     });
 
-    expect(fetchMock.lastOptions().body).toContain('"selling_plan":"688815178030"');
+    expect(fetchMock.callHistory.lastCall().options.body).toContain('"selling_plan":"688815178030"');
   });
 
   it('should have no selling plan when product is opted out', async () => {
@@ -252,7 +254,7 @@ describe('synchronizeCartOptin', () => {
       }
     });
 
-    expect(fetchMock.lastOptions().body).toContain('"selling_plan":null');
+    expect(fetchMock.callHistory.lastCall().options.body).toContain('"selling_plan":null');
   });
 });