add Argocd version check and harden app health locators

Signed-off-by: Triona Doyle <tekton@example.com>

Author: Triona Doyle

test/ui-e2e/run-ui-tests.sh

@@ -66,6 +66,23 @@ rm -f .auth/storageState.json || true
 #run Playwright 
 echo " Starting Playwright tests..."
 
+echo " "
+#get the installed gitops  version 
+GITOPS_VERSION=$(oc get csv -n openshift-gitops -o jsonpath='{.items[?(@.spec.displayName=="Red Hat OpenShift GitOps")].spec.version}' 2>/dev/null)
+if [ -z "$GITOPS_VERSION" ]; then
+    GITOPS_VERSION="Unknown"
+fi
+
+#get Argo CD version 
+ARGO_API_VERSION=$(curl -s -k "$ARGOCD_URL/api/version" | grep -o '"Version":"[^"]*"' | cut -d'"' -f4)
+if [ -z "$ARGO_API_VERSION" ]; then
+    ARGO_API_VERSION="Unknown"
+fi
+
+echo " TARGETING GITOPS VERSION:  v$GITOPS_VERSION"
+echo " TARGETING ARGO CD VERSION: $ARGO_API_VERSION"
+echo " "
+
 # 2. Execute based on the environment
 if [ "$ENV" = "ci" ] || [ "$ENV" = "pipeline" ]; then
     echo "Running headlessly in automation ($ENV)..."

test/ui-e2e/src/fixtures.ts

@@ -5,6 +5,7 @@ import { ApplicationsPage } from './pages/ApplicationsPage';
 //define custom fixture types
 type MyFixtures = {
   managedApp: string;
+  argoVersion: string;
 };
 
 export const test = base.extend<MyFixtures>({
@@ -30,6 +31,33 @@ export const test = base.extend<MyFixtures>({
     await use(page);
   },
 
+  //get target argocd version
+  argoVersion: async ({ page }, use) => {
+      try {
+        //get version
+        const response = await page.request.get('/api/version');
+        
+        if (!response.ok()) {
+          throw new Error(`API returned status: ${response.status()}`);
+        }
+
+        const data = await response.json();
+        const fullVersion = data.Version || 'Unknown';
+        
+        //extract the major.minor version (e.g., "v2.10.1" -> "2.10")
+        const match = fullVersion.match(/v(\d+\.\d+)/);
+        const version = match ? match[1] : '3.0';
+        
+        //for debugging/CI logs
+        console.log(`TARGETING ARGO CD VERSION: ${fullVersion}`);
+
+        await use(version);
+      } catch (error) {
+        console.warn(`\n[warn] Failed to fetch Argo CD version from API. Defaulting to 3.0. Reason: ${error instanceof Error ? error.message : 'Unknown'}\n`);
+        await use('3.0'); // Default to 3.0
+      }
+    },
+
   managedApp: [ async ({ page }, use) => {
     const appName = `e2e-app-${Date.now()}`;
     const appsPage = new ApplicationsPage(page);

test/ui-e2e/src/pages/ApplicationDetailsPage.ts

@@ -22,9 +22,13 @@ export class ApplicationDetailsPage {
   async verifyResourceTreeLoaded() {
     //wait tree to be visible
     await expect(this.resourceTreeContainer).toBeVisible({ timeout: 20000 });
-    //wait for healthy status
-  await expect(this.resourceTreeContainer.getByText('Healthy', { exact: true }).first()).toBeVisible({ timeout: 30000 });  
-
+    
+    const appHealthBlock = this.page.locator('div')
+      .filter({ has: this.page.getByText('APP HEALTH', { exact: true }) })
+      .filter({ hasText: /Healthy/i })
+      .last();
+      
+    await expect(appHealthBlock).toBeVisible({ timeout: 30000 });
   }
 
   async clickResourceNode(kind: string, name: string) {

test/ui-e2e/src/pages/ApplicationsPage.ts

@@ -122,16 +122,14 @@ export class ApplicationsPage {
     const appContainer = this.page.locator('.white-box, .argo-table-list__row').filter({ hasText: appName });
     await appContainer.waitFor({ state: 'visible', timeout: TIMEOUTS.load });
 
-    //critical cross-version fix: wait for Argo CD to finish its initial Git clone
-    //if we open the Sync panel before this happens, the resources list will be empty!
     await expect(appContainer.getByText(/OutOfSync|Out of Sync/i).first()).toBeVisible({ timeout: TIMEOUTS.sync });
 
-    //now it is safe to open the panel
+    //safe to open the panel now
     await appContainer.getByText('Sync', { exact: true }).click();
 
     const slideOutPanel = this.page.locator('.sliding-panel').filter({ visible: true });
 
-    // 🚀 SWAPPED: this.page is now slideOutPanel
+    //slideOutPanel
     const allLink = slideOutPanel.getByRole('link', { name: 'all', exact: true });
     try {
       await allLink.waitFor({ state: 'visible', timeout: TIMEOUTS.modal });
@@ -144,11 +142,9 @@ export class ApplicationsPage {
         throw error;
       }
     }
-    
-    // 🚀 SWAPPED: this.page is now slideOutPanel
+
     await expect(slideOutPanel.getByText(expectedResource).first()).toBeVisible({ timeout: TIMEOUTS.render });
 
-    // 🚀 SWAPPED: this.page is now slideOutPanel
     await slideOutPanel.getByRole('button', { name: /^synchronize$/i }).first().click();
 
     //wait for the panel to close 

test/ui-e2e/tests/resource-tree.spec.ts

@@ -6,7 +6,7 @@ test.describe('Argo CD Resource Tree and Pod Logs', () => {
 
   test.use({ storageState: '.auth/storageState.json' });
 
-  test('Navigate to app details, open a Pod, and verify logs stream', async ({ page, managedApp }) => {
+  test('Navigate to app details, open a Pod, and verify logs stream', async ({ page, managedApp, argoVersion }) => {
     test.setTimeout(120000); 
 
     const appsPage = new ApplicationsPage(page);