@quintype/framework 7.9.0-custom-inifinite-scroller.2 → 7.9.0

package/CHANGELOG.md

@@ -2,6 +2,13 @@
 
 All notable changes to this project will be documented in this file. See [standard-version](https://github.com/conventional-changelog/standard-version) for commit guidelines.
 
+## [7.9.0](https://github.com/quintype/quintype-node-framework/compare/v7.8.0...v7.9.0) (2022-10-03)
+
+
+### Features
+
+* **SW:** Disable sw shell  ([#321](https://github.com/quintype/quintype-node-framework/issues/321)) ([6d04bc8](https://github.com/quintype/quintype-node-framework/commit/6d04bc87dd42c647ec9763eca430ada2f4a4d8ea))
+
 ## [7.8.0](https://github.com/quintype/quintype-node-framework/compare/v7.7.7...v7.8.0) (2022-09-19)
 
 

package/client/impl/load-service-worker.js

@@ -1,17 +1,17 @@
 import { SERVICE_WORKER_UPDATED } from "@quintype/components";
 
 export function registerServiceWorker({
-  enableServiceWorker = false,
-  serviceWorkerLocation = "/service-worker.js",
-  navigator = global.navigator,
-  mountAt = global.qtMountAt || "",
-  version = 0,
-}) {
+                                        enableServiceWorker = false,
+                                        serviceWorkerLocation = "/service-worker.js",
+                                        navigator = global.navigator,
+                                        mountAt = global.qtMountAt || "",
+                                        version = 0,
+                                      }) {
   if (enableServiceWorker && navigator.serviceWorker) {
     const location =
-      serviceWorkerLocation === "/OneSignalSDKWorker.js"
-        ? `${serviceWorkerLocation}?version=${version}`
-        : serviceWorkerLocation;
+        serviceWorkerLocation === "/OneSignalSDKWorker.js"
+            ? `${serviceWorkerLocation}?version=${version}`
+            : serviceWorkerLocation;
     return navigator.serviceWorker.register(`${mountAt}${location}`);
   }
   return Promise.resolve(null);
@@ -22,7 +22,7 @@ function updateOneSignalWorker(appVersion, page, opts) {
   const version = pageThemeAttributes["cache-burst"] || appVersion;
 
   registerServiceWorker({ ...opts, serviceWorkerLocation: "/OneSignalSDKWorker.js", version }).then(() =>
-    console.log("Updated OneSignal Worker")
+      console.log("Updated OneSignal Worker")
   );
 }
 
@@ -34,7 +34,7 @@ export function setupServiceWorkerUpdates(serviceWorkerPromise, app, store, page
 
     if (registration.update) {
       app.updateServiceWorker = () =>
-        registration.update().then(() => store.dispatch({ type: SERVICE_WORKER_UPDATED }));
+          registration.update().then(() => store.dispatch({ type: SERVICE_WORKER_UPDATED }));
 
       if (global.OneSignal) {
         const appVersion = app.getAppVersion();
@@ -56,9 +56,20 @@ function updateServiceWorker(app) {
   }
 }
 
+function clearServiceWorkerCache() {
+  if ('serviceWorker' in navigator) {
+    caches.keys().then(function(cacheNames) {
+      cacheNames.forEach(function(cacheName) {
+        caches.delete(cacheName);
+      });
+    });
+  }
+}
+
 export function checkForServiceWorkerUpdates(app, page = {}) {
   if (page.appVersion && app.getAppVersion && app.getAppVersion() < page.appVersion) {
     console && console.log("Updating the Service Worker");
+    clearServiceWorkerCache();
     updateServiceWorker(app);
   } else if (global && global.qtVersion) {
     /* Check if the config is updated and update the service worker if true */
@@ -66,6 +77,7 @@ export function checkForServiceWorkerUpdates(app, page = {}) {
     const { config: { "theme-attributes": pageThemeAttributes = {} } = {} } = page;
     if ((pageThemeAttributes["cache-burst"] || 0) > parseInt(configVersion)) {
       console.log(`Updating service worker due to config change`);
+      clearServiceWorkerCache();
       updateServiceWorker(app);
     }
   }

package/client/start.js

@@ -55,20 +55,20 @@ function getRouteData(path, { location = global.location, existingFetch, mountAt
   const [routeDataPath, relativePath] = getRouteDataAndPath(path, mountAt);
   const url = new URL(relativePath, location.origin);
   return (
-    existingFetch ||
-    fetch(`${routeDataPath}?path=${encodeURIComponent(url.pathname)}${url.search ? `&${url.search.slice(1)}` : ""}`, {
-      credentials: "same-origin",
-    })
+      existingFetch ||
+      fetch(`${routeDataPath}?path=${encodeURIComponent(url.pathname)}${url.search ? `&${url.search.slice(1)}` : ""}`, {
+        credentials: "same-origin",
+      })
   )
-    .then((response) => {
-      if (response.status == 404) {
-        // There is a chance this might abort
-        maybeBypassServiceWorker();
-      }
+      .then((response) => {
+        if (response.status == 404) {
+          // There is a chance this might abort
+          maybeBypassServiceWorker();
+        }
 
-      return response.json();
-    })
-    .then(maybeRedirect);
+        return response.json();
+      })
+      .then(maybeRedirect);
 
   function maybeRedirect(page) {
     // This next line aborts the entire load
@@ -123,7 +123,7 @@ export function navigateToPage(dispatch, path, doNotPushPath) {
     }
 
     Promise.resolve(
-      pickComponentWrapper && pickComponentWrapper.preloadComponent(page.pageType, page.subPageType)
+        pickComponentWrapper && pickComponentWrapper.preloadComponent(page.pageType, page.subPageType)
     ).then(() => {
       dispatch({
         type: NAVIGATE_TO_PAGE,
@@ -181,10 +181,17 @@ export function maybeSetUrl(path, title) {
 export function renderComponent(clazz, container, store, props = {}, callback) {
   const component = React.createElement(Provider, { store }, React.createElement(clazz, props || {}));
 
+  const containerEle = document.getElementById(container);
+
+  if(!containerEle){
+    console && console.log(`Rendering component on DOM id ${container} FAILED, node not available`);
+    return null;
+  }
+
   if (props.hydrate) {
-    return ReactDOM.hydrate(component, document.getElementById(container), callback);
+    return ReactDOM.hydrate(component, containerEle, callback);
   }
-  return ReactDOM.render(component, document.getElementById(container), callback);
+  return ReactDOM.render(component, containerEle, callback);
 }
 
 /**
@@ -199,16 +206,16 @@ export function renderIsomorphicComponent(container, store, pickComponent, props
   if (!store.getState().qt.disableIsomorphicComponent) {
     pickComponentWrapper = makePickComponentSync(pickComponent);
     return pickComponentWrapper
-      .preloadComponent(store.getState().qt.pageType, store.getState().qt.subPageType)
-      .then(() =>
-        renderComponent(
-          IsomorphicComponent,
-          container,
-          store,
-          Object.assign({ pickComponent: pickComponentWrapper }, props),
-          () => store.dispatch({ type: CLIENT_SIDE_RENDERED })
-        )
-      );
+        .preloadComponent(store.getState().qt.pageType, store.getState().qt.subPageType)
+        .then(() =>
+            renderComponent(
+                IsomorphicComponent,
+                container,
+                store,
+                Object.assign({ pickComponent: pickComponentWrapper }, props),
+                () => store.dispatch({ type: CLIENT_SIDE_RENDERED })
+            )
+        );
   }
   console && console.log("IsomorphicComponent is disabled");
 }
@@ -257,15 +264,15 @@ export function startApp(renderApplication, reducers, opts) {
   const path = `${location.pathname}${location.search || ""}`;
   const staticData = global.staticPageStoreContent || getJsonContent("static-page");
   const dataPromise = staticData
-    ? Promise.resolve(staticData.qt)
-    : getRouteData(path, { existingFetch: global.initialFetch });
+      ? Promise.resolve(staticData.qt)
+      : getRouteData(path, { existingFetch: global.initialFetch });
 
   startAnalytics();
 
   const store = createQtStore(
-    reducers,
-    (staticData && staticData.qt) || global.initialPage || getJsonContent("initial-page") || {},
-    {}
+      reducers,
+      (staticData && staticData.qt) || global.initialPage || getJsonContent("initial-page") || {},
+      {}
   );
 
   if (opts.preRenderApplication) {
@@ -307,9 +314,9 @@ export function startApp(renderApplication, reducers, opts) {
 
     if (page.title) {
       global.document.title = get(
-        page,
-        ["data", "customSeo", "title"],
-        get(page, ["data", "story", "seo", "meta-title"], page.title)
+          page,
+          ["data", "customSeo", "title"],
+          get(page, ["data", "story", "seo", "meta-title"], page.title)
       );
     }
     return store;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@quintype/framework",
-  "version": "7.9.0-custom-inifinite-scroller.2",
+  "version": "7.9.0",
   "description": "Libraries to help build Quintype Node.js apps",
   "main": "index.js",
   "engines": {
@@ -31,8 +31,8 @@
   "homepage": "https://github.com/quintype/quintype-node-framework#readme",
   "dependencies": {
     "@ampproject/toolbox-optimizer": "2.8.3",
-    "@quintype/amp": "2.6.0-custom-infinite-scroll.1",
-    "@quintype/backend": "2.3.2-related-stories-inf-scroll.3",
+    "@quintype/amp": "^2.5.0",
+    "@quintype/backend": "^2.3.1",
     "@quintype/components": "^3.0.0",
     "@quintype/prerender-node": "^3.2.26",
     "@quintype/seo": "^1.39.0",

package/server/amp/handlers/infinite-scroll.js

@@ -1,23 +1,18 @@
 const { AmpConfig } = require("../../impl/api-client-impl");
 const InfiniteScrollAmp = require("../helpers/infinite-scroll");
 const { setCorsHeaders } = require("../helpers");
-const get = require("lodash/get");
-const cloneDeep = require("lodash/cloneDeep");
 
 // eslint-disable-next-line consistent-return
-async function storyPageInfiniteScrollHandler(req, res, next, { client, config, ...rest }) {
+async function storyPageInfiniteScrollHandler(req, res, next, { client, config }) {
   const ampConfig = await config.memoizeAsync("amp-config", async () => await AmpConfig.getAmpConfig(client));
-  const opts = cloneDeep(rest);
-  const infiniteScrollSource = get(opts, ["featureConfig", "infiniteScroll", "source"], "collection");
 
   const infiniteScrollAmp = new InfiniteScrollAmp({
     ampConfig,
     publisherConfig: config,
     client,
     queryParams: req.query,
-    infiniteScrollSource,
   });
-  const jsonResponse = await infiniteScrollAmp.getResponse();
+  const jsonResponse = await infiniteScrollAmp.getResponse({ itemsTaken: 5 }); // itemsTaken has to match with itemsToTake in ampStoryPageHandler
   if (jsonResponse instanceof Error) return next(jsonResponse);
   res.set("Content-Type", "application/json; charset=utf-8");
   setCorsHeaders({ req, res, next, publisherConfig: config });

package/server/amp/handlers/story-page.js

@@ -86,28 +86,15 @@ async function ampStoryPageHandler(
     const seoTags =
       seoInstance && seoInstance.getMetaTags(config, "story-page-amp", { data: { story, timezone }, config }, { url });
 
-    const infiniteScrollConfig = get(opts, ["featureConfig", "infiniteScroll"], "");
-    const infiniteScrollSource = get(infiniteScrollConfig, ["source"], "collection");
-    const inlineConfig = get(infiniteScrollConfig, ["inlineConfig"], "");
-    const remoteConfigEndpoint = get(infiniteScrollConfig, ["remoteConfigEndpoint"], "");
-
-    let infiniteScrollInlineConfig = [];
-
-    if (infiniteScrollSource === "custom") {
-      if (!inlineConfig || !remoteConfigEndpoint)
-        throw new Error("Required params of 'custom' source (inlineConfig /remoteConfigEndpoint) is missing!!");
-      infiniteScrollInlineConfig = await inlineConfig();
-    } else {
-      const infiniteScrollAmp = new InfiniteScrollAmp({
-        ampConfig,
-        publisherConfig: config,
-        client,
-        infiniteScrollSource,
-      });
-      infiniteScrollInlineConfig = await infiniteScrollAmp.getInitialInlineConfig({
-        storyId: story["story-content-id"],
-      });
-    }
+    const infiniteScrollAmp = new InfiniteScrollAmp({
+      ampConfig,
+      publisherConfig: config,
+      client,
+    });
+    const infiniteScrollInlineConfig = await infiniteScrollAmp.getInitialInlineConfig({
+      itemsToTake: 5,
+      storyId: story["story-content-id"],
+    });
     if (infiniteScrollInlineConfig instanceof Error) return next(infiniteScrollInlineConfig);
     if (infiniteScrollInlineConfig) {
       set(

package/server/amp/helpers/infinite-scroll.js

@@ -1,9 +1,9 @@
 class InfiniteScrollAmp {
-  constructor({ ampConfig, client, publisherConfig, queryParams, infiniteScrollSource }) {
+  constructor({ ampConfig, client, publisherConfig, queryParams }) {
     this.client = client;
     this.publisherConfig = publisherConfig;
     this.queryParams = queryParams;
-    this.infiniteScrollSource = infiniteScrollSource;
+    this.collSlug = "amp-infinite-scroll"; // this is hardcoded to "amp-infinite-scroll" temporarily. Ideally it should come from ampConfig from platform
   }
 
   // eslint-disable-next-line class-methods-use-this
@@ -17,20 +17,12 @@ class InfiniteScrollAmp {
     );
   }
 
-  getFilteredApiItems(relatedStories) {
-    return relatedStories.filter(
-      (story) =>
-        story.access !== "subscription" &&
-        story["story-template"] !== "visual-story"
-    );
-  }
-
   formatData({ itemsArr, type }) {
     // formats configuration as per need of amp infinite scroll
     const arr = itemsArr.map((item) => ({
       image: this.getImagePath(item),
-      title: item.headline,
-      url: `/amp/story/${item.slug}`,
+      title: item.story.headline,
+      url: `/amp/story/${item.story.slug}`,
     }));
     switch (type) {
       case "inline":
@@ -44,51 +36,39 @@ class InfiniteScrollAmp {
 
   getImagePath(item) {
     const cdnImage = this.publisherConfig["cdn-image"];
-    const s3Key = item["hero-image-s3-key"];
+    const s3Key = item.story["hero-image-s3-key"];
     const hostWithProtocol = /^https:\/\//.test(cdnImage) ? cdnImage : `https://${cdnImage}`;
     return `${hostWithProtocol}/${s3Key}?format=webp&w=250`;
   }
 
-  async getInfiniteScrollList({ storyId, type, offset = 0, limit = null }) {
-    let filteredItems = [];
-    const params = { offset, limit };
-    if (this.infiniteScrollSource === "relatedStoriesApi") {
-      const relatedStoriesList = await this.client.getRelatedStories(storyId, null, params);
-      if (!relatedStoriesList)
-        return new Error();
-      return filteredItems = this.getFilteredApiItems(relatedStoriesList["related-stories"]);
-    } else {
-      const collection = await this.client.getCollectionBySlug("amp-infinite-scroll");
-      if (!collection || (collection.items && !collection.items.length) || collection.error || collection === null)
-        return new Error();
-      const collectionItems = this.getFilteredCollItems(collection, storyId).map(items => items.story);
-      return filteredItems = type === "inlineConfig"
-        ? collectionItems.slice(0, 5)
-        : collectionItems.slice(5);
-    }
-  }
-
-  async getResponse() {
+  async getResponse({ itemsTaken }) {
     const { "story-id": storyId } = this.queryParams;
     if (!storyId) return new Error(`Query param "story-id" missing`);
-    const filteredItems =
-      await this.getInfiniteScrollList({ storyId, type: "remoteConfig", offset: 5 });
-    if (filteredItems instanceof Error) return new Error(`Infinite scroll collection amp-infinite-scroll returned falsy value`);
-    const formattedData = this.formatData({ itemsArr: filteredItems });
+
+    const collection = await this.client.getCollectionBySlug(this.collSlug);
+    if (!collection || collection.error)
+      return new Error(`Infinite scroll collection ${this.collSlug} returned falsy value`);
+    const filteredItems = this.getFilteredCollItems(collection, storyId);
+    const slicedItems = filteredItems.slice(itemsTaken);
+    const formattedData = this.formatData({ itemsArr: slicedItems });
+
     return JSON.stringify(formattedData);
   }
 
-  async getInitialInlineConfig(storyId) {
-    if (!storyId) return new Error("Required params for getInitialInlineConfig missing");
-    const filteredItems =
-      await this.getInfiniteScrollList({ storyId, type: "inlineConfig", offset: 0, limit: 5 });
+  async getInitialInlineConfig({ itemsToTake, storyId }) {
+    if (!itemsToTake || !storyId) return new Error("Required params for getInitialInlineConfig missing");
 
-    if (filteredItems instanceof Error) return null;
-    const formattedData = filteredItems.length > 0 && this.formatData({
-      itemsArr: filteredItems,
+    const collection = await this.client.getCollectionBySlug(this.collSlug);
+    if (!collection || (collection.items && !collection.items.length) || collection.error) return null;
+    const filteredItems = this.getFilteredCollItems(collection, storyId);
+    const slicedItems = filteredItems.slice(0, itemsToTake);
+    const formattedData = this.formatData({
+      itemsArr: slicedItems,
       type: "inline",
     });
+
     return JSON.stringify(formattedData);
   }
 }
+
 module.exports = InfiniteScrollAmp;

package/test/unit/amp/infinite-scroll-helper.js

@@ -3,17 +3,8 @@
 
 const assert = require("assert");
 const InfiniteScrollAmp = require("../../../server/amp/helpers/infinite-scroll");
-const { getTextStory } = require("../../data/amp-test-data");
 
 function getClientStub({
-  getStoryById = (id) =>
-    new Promise((resolve) => {
-      if (id === "4444")
-        resolve({
-          story: getTextStory({ "story-content-id": "7f3d5bdb-ec52-4047-ac0d-df4036ec974b" }),
-        });
-      resolve(null);
-    }),
   getCollectionBySlug = (slug) =>
     new Promise((resolve) => {
       if (slug === "amp-infinite-scroll")
@@ -28,7 +19,6 @@ function getClientStub({
                 "story-content-id": 1111,
                 slug: "sports/aa",
                 "hero-image-s3-key": "aa/a.jpg",
-                access: "public",
               },
             },
             {
@@ -40,7 +30,6 @@ function getClientStub({
                 "story-content-id": 2222,
                 slug: "sports/bb",
                 "hero-image-s3-key": "bb/b.jpg",
-                access: "public",
               },
             },
             {
@@ -52,7 +41,6 @@ function getClientStub({
                 "story-content-id": 3333,
                 slug: "sports/cc",
                 "hero-image-s3-key": "cc/c.jpg",
-                access: "public",
               },
             },
             {
@@ -64,7 +52,6 @@ function getClientStub({
                 "story-content-id": 4444,
                 slug: "sports/dd",
                 "hero-image-s3-key": "dd/d.jpg",
-                access: "public",
               },
             },
             {
@@ -76,7 +63,6 @@ function getClientStub({
                 "story-content-id": 5555,
                 slug: "sports/ee",
                 "hero-image-s3-key": "ee/e.jpg",
-                access: "public",
               },
             },
             {
@@ -88,31 +74,6 @@ function getClientStub({
                 "story-content-id": 6666,
                 slug: "sports/ff",
                 "hero-image-s3-key": "ff/f.jpg",
-                access: "public",
-              },
-            },
-            {
-              type: "story",
-              id: 7777,
-              story: {
-                "story-template": "text",
-                headline: "ggg",
-                "story-content-id": 7777,
-                slug: "sports/gg",
-                "hero-image-s3-key": "gg/g.jpg",
-                access: "public",
-              },
-            },
-            {
-              type: "story",
-              id: 8888,
-              story: {
-                "story-template": "text",
-                headline: "hhh",
-                "story-content-id": 8888,
-                slug: "sports/hh",
-                "hero-image-s3-key": "hh/h.jpg",
-                access: "public",
               },
             },
           ],
@@ -122,7 +83,6 @@ function getClientStub({
 } = {}) {
   return {
     getCollectionBySlug,
-    getStoryById
   };
 }
 const dummyPublisherConfig = {
@@ -136,7 +96,9 @@ describe("getInitialInlineConfig method of InfiniteScrollAmp helper function", f
       client: getClientStub(),
       publisherConfig: dummyPublisherConfig,
     });
-    const inlineConfig = await infiniteScrollAmp.getInitialInlineConfig();
+    const inlineConfig = await infiniteScrollAmp.getInitialInlineConfig({
+      itemsToTake: 5,
+    });
     assert.strictEqual(inlineConfig instanceof Error, true);
     assert.throws(() => {
       throw new Error("Required params for getInitialInlineConfig missing");
@@ -155,7 +117,8 @@ describe("getInitialInlineConfig method of InfiniteScrollAmp helper function", f
       publisherConfig: dummyPublisherConfig,
     });
     const inlineConfig = await infiniteScrollAmp.getInitialInlineConfig({
-      storyId: 1111,
+      itemsToTake: 5,
+      storyId: 2222,
     });
     assert.strictEqual(inlineConfig, null);
   });
@@ -174,7 +137,8 @@ describe("getInitialInlineConfig method of InfiniteScrollAmp helper function", f
       publisherConfig: dummyPublisherConfig,
     });
     const inlineConfig = await infiniteScrollAmp.getInitialInlineConfig({
-      storyId: 1111,
+      itemsToTake: 5,
+      storyId: 2222,
     });
     assert.strictEqual(inlineConfig, null);
   });
@@ -186,7 +150,8 @@ describe("getInitialInlineConfig method of InfiniteScrollAmp helper function", f
       publisherConfig: dummyPublisherConfig,
     });
     const inlineConfig = await infiniteScrollAmp.getInitialInlineConfig({
-      storyId: 1111,
+      itemsToTake: 5,
+      storyId: 2222,
     });
     assert.strictEqual(false, /sports\/bb/.test(inlineConfig));
     assert.strictEqual(false, /bb\/b.jpg/.test(inlineConfig));
@@ -199,7 +164,8 @@ describe("getInitialInlineConfig method of InfiniteScrollAmp helper function", f
       publisherConfig: dummyPublisherConfig,
     });
     const inlineConfig = await infiniteScrollAmp.getInitialInlineConfig({
-      storyId: 1111,
+      itemsToTake: 5,
+      storyId: 3333,
     });
     assert.strictEqual(false, /sports\/bb/.test(inlineConfig));
     assert.strictEqual(false, /bb\/b.jpg/.test(inlineConfig));
@@ -213,7 +179,8 @@ describe("getInitialInlineConfig method of InfiniteScrollAmp helper function", f
       publisherConfig: dummyPublisherConfig,
     });
     const inlineConfig = await infiniteScrollAmp.getInitialInlineConfig({
-      storyId: 1111,
+      itemsToTake: 5,
+      storyId: 2222,
     });
     function isInlineConfigStructureValid(jsonStr) {
       const stories = JSON.parse(jsonStr);
@@ -240,7 +207,7 @@ describe("getResponse method of InfiniteScrollAmp helper function", function ()
       publisherConfig: dummyPublisherConfig,
       queryParams: { foo: "bar" },
     });
-    const jsonResponse = await infiniteScrollAmp.getResponse();
+    const jsonResponse = await infiniteScrollAmp.getResponse({ itemsTaken: 2 });
     assert.strictEqual(jsonResponse instanceof Error, true);
     assert.throws(() => {
       throw new Error(`Query param "story-id" missing`);
@@ -259,7 +226,7 @@ describe("getResponse method of InfiniteScrollAmp helper function", function ()
       publisherConfig: dummyPublisherConfig,
       queryParams: { "story-id": 2222 },
     });
-    const jsonResponse = await infiniteScrollAmp.getResponse();
+    const jsonResponse = await infiniteScrollAmp.getResponse({ itemsTaken: 2 });
     assert.strictEqual(jsonResponse instanceof Error, true);
   });
   it("should remove current story from response", async function () {
@@ -270,7 +237,7 @@ describe("getResponse method of InfiniteScrollAmp helper function", function ()
       publisherConfig: dummyPublisherConfig,
       queryParams: { "story-id": 4444 },
     });
-    const jsonResponse = await infiniteScrollAmp.getResponse();
+    const jsonResponse = await infiniteScrollAmp.getResponse({ itemsTaken: 2 });
     assert.strictEqual(false, /sports\/dd/.test(jsonResponse));
     assert.strictEqual(false, /dd\/d.jpg/.test(jsonResponse));
   });
@@ -282,7 +249,7 @@ describe("getResponse method of InfiniteScrollAmp helper function", function ()
       publisherConfig: dummyPublisherConfig,
       queryParams: { "story-id": 4444 },
     });
-    const jsonResponse = await infiniteScrollAmp.getResponse();
+    const jsonResponse = await infiniteScrollAmp.getResponse({ itemsTaken: 2 });
     assert.strictEqual(false, /sports\/bb/.test(jsonResponse));
     assert.strictEqual(false, /bb\/b.jpg/.test(jsonResponse));
   });
@@ -295,8 +262,7 @@ describe("getResponse method of InfiniteScrollAmp helper function", function ()
       publisherConfig: dummyPublisherConfig,
       queryParams: { "story-id": 4444 },
     });
-    const jsonResponse = await infiniteScrollAmp.getResponse();
-
+    const jsonResponse = await infiniteScrollAmp.getResponse({ itemsTaken: 2 });
     function isJsonConfigStructureValid(jsonStr) {
       const parsed = JSON.parse(jsonStr);
       const stories = parsed.pages;