fix: Use proven pattern from detection-translation for ServiceNow configuration

Author: mraible

e2e/src/pages/AppCatalogPage.ts

@@ -70,10 +70,21 @@ export class AppCatalogPage extends BasePage {
 
     if (await this.elementExists(installButton, 3000)) {
       await this.smartClick(installButton, 'Install button');
-      await this.waiter.delay(2000);
+      this.logger.info('Clicked Install button, waiting for install page to load');
+
+      // Wait for URL to change to install page and page to stabilize
+      await this.page.waitForURL(/\/foundry\/app-catalog\/[^\/]+\/install$/, { timeout: 10000 });
+      await this.page.waitForLoadState('domcontentloaded');
+      await this.page.waitForLoadState('networkidle');
+
+      // Handle permissions dialog
+      await this.handlePermissionsDialog();
 
       // Check for ServiceNow configuration screen
-      await this.handleServiceNowConfiguration();
+      await this.configureServiceNowIfNeeded();
+
+      // Click final Install app button
+      await this.clickInstallAppButton();
 
       // Wait for installation to complete
       await this.waitForInstallation(appName);
@@ -87,50 +98,94 @@ export class AppCatalogPage extends BasePage {
   }
 
   /**
-   * Handle ServiceNow configuration screen if present
+   * Handle permissions dialog if present
    */
-  private async handleServiceNowConfiguration(): Promise<void> {
-    // Check if ServiceNow configuration modal appears
-    const configHeading = this.page.getByRole('heading', { name: /servicenow|configuration/i });
-
-    if (await this.elementExists(configHeading, 3000)) {
-      this.logger.info('ServiceNow configuration screen detected, filling dummy values');
-
-      // Fill Instance URL
-      const instanceUrlField = this.page.getByLabel(/instance.*url/i)
-        .or(this.page.getByPlaceholder(/instance.*url/i))
-        .first();
-      if (await this.elementExists(instanceUrlField, 2000)) {
-        await instanceUrlField.fill('https://dummy.service-now.com');
-        this.logger.info('Filled Instance URL');
-      }
+  private async handlePermissionsDialog(): Promise<void> {
+    const acceptButton = this.page.getByRole('button', { name: /accept.*continue/i });
 
-      // Fill Username
-      const usernameField = this.page.getByLabel(/username/i)
-        .or(this.page.getByPlaceholder(/username/i))
-        .first();
-      if (await this.elementExists(usernameField, 2000)) {
-        await usernameField.fill('dummy_user');
-        this.logger.info('Filled Username');
-      }
+    if (await this.elementExists(acceptButton, 3000)) {
+      this.logger.info('Permissions dialog detected, accepting');
+      await this.smartClick(acceptButton, 'Accept and continue button');
+      await this.waiter.delay(2000);
+    }
+  }
 
-      // Fill Password (must be >8 characters)
-      const passwordField = this.page.getByLabel(/password/i)
-        .or(this.page.getByPlaceholder(/password/i))
-        .first();
-      if (await this.elementExists(passwordField, 2000)) {
-        await passwordField.fill('DummyPassword123');
-        this.logger.info('Filled Password');
-      }
+  /**
+   * Configure ServiceNow API integration if configuration form is present
+   */
+  private async configureServiceNowIfNeeded(): Promise<void> {
+    this.logger.info('Checking if ServiceNow API configuration is required...');
+
+    // Check if there are text input fields (configuration form)
+    const textInputs = this.page.locator('input[type="text"]');
+
+    try {
+      await textInputs.first().waitFor({ state: 'visible', timeout: 15000 });
+      const count = await textInputs.count();
+      this.logger.info(`ServiceNow configuration form detected with ${count} input fields`);
+    } catch (error) {
+      this.logger.info('No ServiceNow configuration required - no input fields found');
+      return;
+    }
+
+    this.logger.info('ServiceNow configuration required, filling dummy values');
+
+    // Fill configuration fields using index-based selection
+    // Field 1: Name
+    const nameField = this.page.locator('input[type="text"]').first();
+    await nameField.fill('ServiceNow Test Instance');
+    this.logger.debug('Filled Name field');
+
+    // Field 2: Instance (the {instance} part of {instance}.service-now.com)
+    const instanceField = this.page.locator('input[type="text"]').nth(1);
+    await instanceField.fill('dev12345');
+    this.logger.debug('Filled Instance field');
+
+    // Field 3: Username
+    const usernameField = this.page.locator('input[type="text"]').nth(2);
+    await usernameField.fill('dummy_user');
+    this.logger.debug('Filled Username field');
+
+    // Field 4: Password (must be >8 characters)
+    const passwordField = this.page.locator('input[type="password"]').first();
+    if (await this.elementExists(passwordField, 2000)) {
+      await passwordField.fill('DummyPassword123');
+      this.logger.debug('Filled Password field');
+    } else {
+      // Try as text input if password field not found
+      const passwordTextInput = this.page.locator('input[type="text"]').nth(3);
+      await passwordTextInput.fill('DummyPassword123');
+      this.logger.debug('Filled Password field (text input)');
+    }
+
+    // Wait for network to settle after filling form
+    await this.page.waitForLoadState('networkidle');
 
-      // Click Next or Install button to proceed
-      const proceedButton = this.page.getByRole('button', { name: /next|install|continue/i });
-      if (await this.elementExists(proceedButton, 2000)) {
-        await this.smartClick(proceedButton, 'Proceed button');
-        this.logger.info('Clicked proceed button after configuration');
-        await this.waiter.delay(2000);
+    this.logger.success('ServiceNow API configuration completed');
+  }
+
+  /**
+   * Click the final "Install app" button
+   */
+  private async clickInstallAppButton(): Promise<void> {
+    const installButton = this.page.getByRole('button', { name: 'Install app' });
+
+    // Wait for button to be enabled after form completion
+    await this.waiter.waitForVisible(installButton, { description: 'Install app button' });
+
+    // Ensure button is enabled before clicking
+    let attempts = 0;
+    while (attempts < 10) {
+      const isEnabled = await installButton.isEnabled();
+      if (isEnabled) {
+        break;
       }
+      await this.waiter.delay(1000);
+      attempts++;
     }
+
+    await this.smartClick(installButton, 'Install app button');
+    this.logger.info('Clicked Install app button');
   }
 
   /**