flaky issue - testing

it/http/src/test/java/com/adobe/cq/commerce/it/http/ContentFragmentComponentIT.java

@@ -40,13 +40,35 @@ public static void beforeClass() throws Exception {
 
     @Test
     public void testContentFragmenWithSampleData() throws ClientException {
-        SlingHttpResponse response = adminAuthor.doGet(COMMERCE_LIBRARY_PATH + "/product/sample-product.html/chaz-kangeroo-hoodie.html",
-            200);
+        long startTime = System.currentTimeMillis();
+        long maxWaitTime = 30000; // 30 seconds
+        boolean success = false;
+        SlingHttpResponse response = null;
+
+        while (!success && (System.currentTimeMillis() - startTime) < maxWaitTime) {
+            try {
+                response = adminAuthor.doGet(COMMERCE_LIBRARY_PATH + "/product/sample-product.html/chaz-kangeroo-hoodie.html", 200);
+                success = true;
+            } catch (ClientException e) {
+                // Wait for a short period before retrying
+                try {
+                    Thread.sleep(2000);
+                } catch (InterruptedException ie) {
+                    Thread.currentThread().interrupt();
+                    throw new RuntimeException(ie);
+                }
+            }
+        }
+
+        if (!success) {
+            throw new ClientException("Failed to load the page within the maximum wait time.");
+        }
+
         Document doc = Jsoup.parse(response.getContent());
 
         // Check the number of content fragment elements in the content fragment component
         Elements elements = doc.select(CONTENT_FRAGMENT_SELECTOR
             + ".cmp-contentfragment > .cmp-contentfragment__elements > .cmp-contentfragment__element");
         Assert.assertEquals(1, elements.size());
     }
-}
+}

ui.tests/test-module/specs/cif-components-library/product-bundle.js

@@ -18,7 +18,6 @@ const config = require('../../lib/config');
 const commons = require('../../lib/commons');
 
 describe('Product bundle in CIF components library', () => {
-
     const product_page = `${config.aem.author.base_url}/content/core-components-examples/library/commerce/product/sample-product.html/sprite-yoga-companion-kit.html`;
     const product_selector = '.cmp-examples-demo__top .product';
 
@@ -33,25 +32,71 @@ describe('Product bundle in CIF components library', () => {
     });
 
     beforeEach(() => {
-        // Set window size to desktop
         browser.setWindowSize(1280, 960);
     });
 
     it('can customize a bundle product', () => {
-        // Go to the product page
-        browser.url(product_page);
+        // Max number of retries
+        let retries = 3;
+        let pageLoadedSuccessfully = false;
 
-        // Check that the customize button is displayed
-        const customizeButton = $(`${product_selector} .productFullDetail__customizeBundle button`);
-        expect(customizeButton).toBeDisplayed();
+        while (retries > 0 && !pageLoadedSuccessfully) {
+            try {
+                // Go to the product page
+                browser.url(product_page);
 
-        customizeButton.click();
+                // Scroll to the "Sprite Yoga Companion Kit" title
+                const titleElement = $('h1=Sprite Yoga Companion Kit'); // Find the title by its exact text
+                titleElement.scrollIntoView(); // Scroll the page to the title
 
-        browser.pause(2000);
+                // Wait for the title to be in view (for debugging purposes)
+                browser.pause(1000);
 
-        // Verify that we get 5 "options" fields
-        const options = $$(`${product_selector} .productFullDetail__bundleProduct`);
-        expect(options.length).toBe(5);
-    });
+                // Try finding the "Customize" button using the normal selector
+                let customizeButton = $(`${product_selector} .productFullDetail__customizeBundle button`);
+
+                // If the button is not found, try finding it by the button text
+                if (!customizeButton.isExisting()) {
+                    customizeButton = $('button=Customize'); // Find the button by its text content
+                }
+
+                // Ensure the button is displayed and interactable
+                if (customizeButton.isDisplayedInViewport()) {
+                    // Scroll to the button if it's not in view
+                    customizeButton.scrollIntoView();
+
+                    // Wait for the button to be clickable and click it
+                    customizeButton.waitForClickable({ timeout: 20000 });
+                    customizeButton.click();
+
+                    // Pause to allow any post-click actions to complete
+                    browser.pause(2000);
 
-});
+                    // Check for bundle product options after clicking the button
+                    const options = $$(`${product_selector} .productFullDetail__bundleProduct`);
+
+                    // Ensure there are exactly 5 options available
+                    expect(options.length).toBe(5);
+
+                    // If everything works, mark page as successfully loaded
+                    pageLoadedSuccessfully = true;
+                } else {
+                    throw new Error('Customize button is not visible in the viewport!');
+                }
+            } catch (error) {
+                retries--; // Decrease retry count
+
+                // If retries left, refresh the page and try again
+                if (retries > 0) {
+                    browser.refresh();
+                    browser.pause(3000); // Wait for 3 seconds before retrying
+                }
+            }
+        }
+
+        // Fail the test if the page is not loaded successfully after retries
+        if (!pageLoadedSuccessfully) {
+            throw new Error('Page could not be loaded successfully after 3 retries.');
+        }
+    });
+});