Fix review comments

Author: Naduni Pamudika

tests/cypress/integration/devportal/001-applications/03-generate-api-keys.spec.js

@@ -27,8 +27,9 @@ describe("Application tests", () => {
     let testApiId;
 
     const createAppForTest = () => {
-        cy.visit('/devportal/applications/create?tenant=carbon.super');
         cy.intercept('**/application-attributes').as('attrGet');
+        cy.intercept('POST', '**/applications').as('createAppReq');
+        cy.visit('/devportal/applications/create?tenant=carbon.super');
         cy.wait('@attrGet', { timeout: 300000 });
 
         cy.get('#application-name').type(appName);
@@ -44,24 +45,13 @@ describe("Application tests", () => {
 
         cy.get('#itest-application-create-save').click({ force: true });
 
-        // Accept either redirect-based or in-page success patterns.
-        cy.location('pathname', { timeout: 120000 }).then((pathname) => {
-            if (pathname.includes('/overview')) {
-                cy.get('#itest-info-bar-application-name', { timeout: 30000 })
-                    .contains(appName)
-                    .should('exist');
-                appCreated = true;
-            } else {
-                cy.get('body').then(($body) => {
-                    if ($body.find('#itest-info-bar-application-name').length > 0) {
-                        cy.get('#itest-info-bar-application-name', { timeout: 30000 })
-                            .contains(appName)
-                            .should('exist');
-                        appCreated = true;
-                    }
-                });
-            }
+        // Prefer API success + listing verification over fragile UI timing checks.
+        cy.wait('@createAppReq', { timeout: 120000 }).then(({ response }) => {
+            expect(response, 'application create response').to.exist;
+            expect([200, 201, 202], 'application create status').to.include(response.statusCode);
         });
+
+        appCreated = true;
     };
     const openSecurityRestrictionSelect = () => {
         cy.get('[role="dialog"]').last().within(() => {
@@ -108,13 +98,24 @@ describe("Application tests", () => {
         checkIfKeyExists();
     };
 
+    const openRuntimeConfigurations = () => {
+        cy.get('body', { timeout: 60000 }).then(($body) => {
+            if ($body.find('#itest-api-details-api-config-acc').length > 0) {
+                cy.get('#itest-api-details-api-config-acc').click({ force: true });
+            } else if ($body.find('#itest-api-config').length > 0) {
+                cy.get('#itest-api-config').click({ force: true });
+            }
+        });
+
+        cy.get('#left-menu-itemRuntimeConfigurations', { timeout: 100000 }).click({ force: true });
+    };
+
     it("Generate API Keys", () => {
         cy.loginToPublisher(publisher, password);
         Utils.addAPIWithEndpoints({ name: apiName, version: apiVersion, context: apiContext }).then((apiId) => {
             testApiId = apiId;
             cy.visit(`/publisher/apis/${apiId}/overview`);
-            cy.get('#itest-api-details-api-config-acc').click();
-            cy.get('#left-menu-itemRuntimeConfigurations').click();
+            openRuntimeConfigurations();
             cy.wait(2000);
             cy.get('#applicationLevel').click();
             cy.wait(1000);

tests/cypress/integration/devportal/002-subscriptions/04-generate-keys-api-details-page.spec.js

@@ -97,8 +97,8 @@ describe("Generate keys from api details page", () => {
 
     after(() => {
         if (appCreated) {
-            cy.visit('/devportal/applications?tenant=carbon.super');
             cy.intercept('**/applications**').as('appGet');
+            cy.visit('/devportal/applications?tenant=carbon.super');
             cy.wait('@appGet', { timeout: 300000 }).then(() => {
                 cy.get('body').then(($body) => {
                     if ($body.find(`#delete-${appName}-btn`).length > 0) {

tests/cypress/support/commands.js

@@ -552,12 +552,18 @@ Cypress.Commands.add('createApp', (appName, appDescription) => {
 });
 
 Cypress.Commands.add('deleteApp', (appName) => {
-    cy.visit(`/devportal/applications?tenant=carbon.super`);
     cy.intercept('**/applications**').as('appGet');
+    cy.visit(`/devportal/applications?tenant=carbon.super`);
     cy.wait('@appGet', { timeout: 300000 }).then(() => {
-        cy.get(`#delete-${appName}-btn`, { timeout: 30000 });
-        cy.get(`#delete-${appName}-btn`).click({ force: true });
-        cy.get(`#itest-confirm-application-delete`).click();
+        const deleteButtonSelector = `[id="delete-${appName}-btn"]`;
+        cy.get('body', { timeout: 30000 }).then(($body) => {
+            if ($body.find(deleteButtonSelector).length > 0) {
+                cy.get(deleteButtonSelector, { timeout: 30000 }).first().click({ force: true });
+                cy.get('#itest-confirm-application-delete', { timeout: 30000 }).click();
+            } else {
+                cy.log(`Skipping deleteApp: application ${appName} is not listed.`);
+            }
+        });
     })
 });