fix tests

juliaElastic · juliaElastic · commit 473a113d4aca · 2026-04-01T14:05:13.000+02:00
diff --git a/x-pack/platform/plugins/shared/fleet/cypress/e2e/fleet_agent_flyout.cy.ts b/x-pack/platform/plugins/shared/fleet/cypress/e2e/fleet_agent_flyout.cy.ts
@@ -5,14 +5,15 @@
  * 2.0.
  */
 
-import { ADD_AGENT_BUTTON, AGENT_FLYOUT } from '../screens/fleet';
+import { API_VERSIONS } from '@kbn/fleet-plugin/common/constants';
+
+import { ADD_AGENT_BUTTON, ADD_AGENT_MENU_BUTTON, AGENT_FLYOUT } from '../screens/fleet';
 import { cleanupAgentPolicies, deleteAgentDocs } from '../tasks/cleanup';
 import { createAgentDoc } from '../tasks/agents';
 import { setFleetServerHost } from '../tasks/fleet_server';
 import { FLEET, navigateTo } from '../tasks/navigation';
 import { request } from '../tasks/common';
 
-import { API_VERSIONS } from '@kbn/fleet-plugin/common/constants';
 import { login } from '../tasks/login';
 
 const FLEET_SERVER_POLICY_ID = 'fleet-server-policy';
@@ -66,6 +67,12 @@ describe('Fleet add agent flyout', () => {
       const AGENT_ID = 'agent' + Date.now();
       navigateTo(FLEET);
 
+      // When enableOpAMP is on, addAgentButton lives inside a popover — open it first.
+      cy.get('body').then(($body) => {
+        if ($body.find(`[data-test-subj="${ADD_AGENT_MENU_BUTTON}"]`).length > 0) {
+          cy.getBySel(ADD_AGENT_MENU_BUTTON).click();
+        }
+      });
       cy.getBySel(ADD_AGENT_BUTTON).click();
       cy.intercept('POST', '/api/fleet/agent_policies?sys_monitoring=true').as('createAgentPolicy');
 
diff --git a/x-pack/platform/plugins/shared/fleet/cypress/screens/fleet.ts b/x-pack/platform/plugins/shared/fleet/cypress/screens/fleet.ts
@@ -6,6 +6,7 @@
  */
 
 export const ADD_AGENT_BUTTON = 'addAgentButton';
+export const ADD_AGENT_MENU_BUTTON = 'addAgentMenuButton';
 export const ADD_AGENT_BUTTON_TOP = 'addAgentBtnTop';
 export const LANDING_PAGE_ADD_FLEET_SERVER_BUTTON = 'fleetServerLanding.addFleetServerButton';
 
diff --git a/x-pack/platform/plugins/shared/fleet/test/scout/ui/fixtures/page_objects/fleet_home.ts b/x-pack/platform/plugins/shared/fleet/test/scout/ui/fixtures/page_objects/fleet_home.ts
@@ -33,10 +33,21 @@ export class FleetHomePage {
     return this.page.testSubj.locator('fleet-agents-tab');
   }
 
+  getAddAgentMenuButton() {
+    return this.page.testSubj.locator('addAgentMenuButton');
+  }
+
   getAddAgentButton() {
     return this.page.testSubj.locator('addAgentButton');
   }
 
+  async openAddAgentMenu() {
+    const menuButton = this.getAddAgentMenuButton();
+    if ((await menuButton.count()) > 0) {
+      await menuButton.click();
+    }
+  }
+
   getAddFleetServerHeader() {
     return this.page.testSubj.locator('addFleetServerHeader');
   }
diff --git a/x-pack/platform/plugins/shared/fleet/test/scout/ui/tests/privileges_editor_role.spec.ts b/x-pack/platform/plugins/shared/fleet/test/scout/ui/tests/privileges_editor_role.spec.ts
@@ -42,6 +42,9 @@ test.describe('When the user has Editor built-in role', { tag: tags.stateful.cla
     await fleetHome.navigateTo();
     await fleetHome.waitForPageToLoad();
 
+    // When enableOpAMP is on, addAgentButton lives inside a popover — open it first.
+    await fleetHome.openAddAgentMenu();
+
     // Verify Add Agent button exists
     await expect(fleetHome.getAddAgentButton()).toBeVisible();
   });
