Clean up, fix error

wp-media · Jan 9, 2025 · b884006 · b884006
1 parent 51576aa
commit b884006
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 6 deletions.
diff --git a/src/support/steps/lcp-beacon-script.ts b/src/support/steps/lcp-beacon-script.ts
@@ -248,13 +248,13 @@ Then('lcp and atf images are not written to LL format', async function (this: IC
             const expected = jsonData[key];
 
             const lcpResult = await checkLcpOrViewport(lcpLLImages, key, 'LCP', expected.lcp);
-            if (!lcpResult.isValid) {
+            if (lcpResult && !lcpResult.isValid) {
                 truthy = false;
                 failMsg += lcpResult.errorMessages.join('');
             }
 
             const viewportResult = await checkLcpOrViewport(lcpLLImages, key, 'Viewport', expected.viewport);
-            if (!viewportResult.isValid) {
+            if (viewportResult && !viewportResult.isValid) {
                 truthy = false;
                 failMsg += viewportResult.errorMessages.join('');
             }

diff --git a/utils/helpers.ts b/utils/helpers.ts
@@ -73,10 +73,10 @@ const getDir = async (file: string): Promise<string> => {
 /**
  * Check LCP/ATF images does not have lazyload attribute, either as image or background-image
  */
-export const checkLcpOrViewport: (images: LLImagesData, type: string, key: string, values: string[]) => Promise<{
+export const checkLcpOrViewport = async (images: LLImagesData, type: string, key: string, values: string[]): Promise<{
     isValid: boolean;
     errorMessages: string[]
-}> = async (images: LLImagesData, type: string, key: string, values: string[])  => {
+}>  => {
     let result = {
         lcpImage: '',
         lcpLLStatus: true,
@@ -108,9 +108,9 @@ export const checkLcpOrViewport: (images: LLImagesData, type: string, key: strin
                 `Expected ${type} for - ${value} for ${lcpUrl} is lazyloaded - ${result.lcpImage}\n\n\n`
             );
         }
-
-        return { isValid, errorMessages };
     }
+
+    return { isValid, errorMessages };
 }
 /**
  * Read the content of a file.