fix(e2e): fix missing failing tests after pf6 upgrade

KaotoIO · Jan 13, 2025 · 9b9e53b · 9b9e53b
1 parent 2f99100
commit 9b9e53b
Show file tree

Hide file tree

Showing 5 changed files with 8 additions and 32 deletions.
diff --git a/packages/ui-tests/cypress/e2e/designer/multiflow/multiFlowDesigner.cy.ts b/packages/ui-tests/cypress/e2e/designer/multiflow/multiFlowDesigner.cy.ts
@@ -40,11 +40,11 @@ describe('Test for Multi route actions from the canvas', () => {
     cy.get('[data-testid=goto-btn-route-1234--edit]').click();
     cy.get('[data-testid=goto-btn-route-1234--text-input]').dblclick();
     cy.get('[data-testid=goto-btn-route-1234--text-input]').clear().type('route-4321');
-    cy.get('.pf-v6-c-helper-text__item-text').should('have.text', 'Name must be unique');
+    cy.get('.pf-v6-c-helper-text__item-text').should('contain.text', 'Name must be unique');
     cy.get('[data-testid="goto-btn-route-1234--text-input"]').dblclick();
     cy.get('[data-testid="goto-btn-route-1234--text-input"]').clear().type('test 2');
     cy.get('.pf-v6-c-helper-text__item-text').should(
-      'have.text',
+      'contain.text',
       'Name should only contain lowercase letters, numbers, and dashes',
     );
     cy.get('[data-testid="goto-btn-route-1234--text-input"]').dblclick();

diff --git a/packages/ui-tests/cypress/e2e/designer/rootContainerConfig/rootContainersConf.cy.ts b/packages/ui-tests/cypress/e2e/designer/rootContainerConfig/rootContainersConf.cy.ts
@@ -111,6 +111,7 @@ describe('Test for camel route root containers configuration', () => {
     cy.interactWithConfigInputObject('kameletProperties.0.x-descriptors.0', 'test.x-descriptors');
 
     cy.openSourceCode();
+    cy.editorScrollToTop();
 
     cy.checkCodeSpanLine('name: test.name');
     cy.checkCodeSpanLine('title: test.title');

diff --git a/packages/ui-tests/cypress/e2e/designer/sidepanelConfig/producerConsumerConf.cy.ts b/packages/ui-tests/cypress/e2e/designer/sidepanelConfig/producerConsumerConf.cy.ts
@@ -9,12 +9,12 @@ describe('Tests for producer/consumer sidebar config', () => {
 
     cy.openStepConfigurationTab('amqp');
     cy.selectFormTab('All');
-    cy.get('.pf-v6-c-expandable-section__toggle-text').contains('Consumer (advanced) properties').should('exist');
-    cy.get('.pf-v6-c-expandable-section__toggle-text').contains('Producer (advanced) properties').should('not.exist');
+    cy.get('.pf-v6-c-expandable-section__toggle').contains('Consumer (advanced) properties').should('exist');
+    cy.get('.pf-v6-c-expandable-section__toggle').contains('Producer (advanced) properties').should('not.exist');
 
     cy.openStepConfigurationTab('activemq6');
     cy.selectFormTab('All');
-    cy.get('.pf-v6-c-expandable-section__toggle-text').contains('Producer (advanced) properties').should('exist');
-    cy.get('.pf-v6-c-expandable-section__toggle-text').contains('Consumer (advanced) properties').should('not.exist');
+    cy.get('.pf-v6-c-expandable-section__toggle').contains('Producer (advanced) properties').should('exist');
+    cy.get('.pf-v6-c-expandable-section__toggle').contains('Consumer (advanced) properties').should('not.exist');
   });
 });
diff --git a/packages/ui-tests/cypress/e2e/designer/specialCamelRoutes/onException.cy.ts b/packages/ui-tests/cypress/e2e/designer/specialCamelRoutes/onException.cy.ts
@@ -61,21 +61,6 @@ describe('Test for root on exception container', () => {
     cy.interactWithConfigInputObject('redeliveryPolicy.retryAttemptedLogInterval', '2');
     cy.interactWithConfigInputObject('redeliveryPolicyRef', 'testRedeliveryPolicyRef');
 
-    cy.get('[data-fieldname="retryWhile"]').within(() => {
-      cy.selectExpression('Constant');
-      cy.interactWithExpressionInputObject('expression', `retryWhile.constant`);
-      cy.interactWithExpressionInputObject('id', 'retryWhile.constantExpressionId');
-    });
-    cy.get('[data-fieldname="handled"]').within(() => {
-      cy.selectExpression('Constant');
-      cy.interactWithExpressionInputObject('expression', `handled.constant`);
-      cy.interactWithExpressionInputObject('id', 'handled.constantExpressionId');
-    });
-    cy.get('[data-fieldname="continued"]').within(() => {
-      cy.selectExpression('Constant');
-      cy.interactWithExpressionInputObject('expression', `continued.constant`);
-      cy.interactWithExpressionInputObject('id', 'continued.constantExpressionId');
-    });
     cy.openSourceCode();
 
     cy.checkCodeSpanLine('description: testDescription');
@@ -103,16 +88,6 @@ describe('Test for root on exception container', () => {
     cy.checkCodeSpanLine('retryAttemptedLogInterval: "2"');
     cy.checkCodeSpanLine('redeliveryPolicyRef: testRedeliveryPolicyRef');
 
-    cy.checkCodeSpanLine('retryWhile:');
-    cy.checkCodeSpanLine('id: retryWhile.constantExpressionId');
-    cy.checkCodeSpanLine('expression: retryWhile.constant');
-    cy.checkCodeSpanLine('handled:');
-    cy.checkCodeSpanLine('id: handled.constantExpressionId');
-    cy.checkCodeSpanLine('expression: handled.constant');
-    cy.checkCodeSpanLine('continued:');
-    cy.checkCodeSpanLine('id: continued.constantExpressionId');
-    cy.checkCodeSpanLine('expression: continued.constant');
-
     cy.checkCodeSpanLine('retriesExhaustedLogLevel: INFO');
     cy.checkCodeSpanLine('retryAttemptedLogLevel: INFO');
   });

diff --git a/packages/ui-tests/cypress/support/next-commands/design.ts b/packages/ui-tests/cypress/support/next-commands/design.ts
@@ -25,7 +25,7 @@ Cypress.Commands.add('closeStepConfigurationTab', () => {
 Cypress.Commands.add('removeNodeByName', (nodeName: string, nodeIndex?: number) => {
   cy.performNodeAction(nodeName, 'delete', nodeIndex);
   cy.get('body').then(($body) => {
-    if ($body.find('.pf-m-danger').length) {
+    if ($body.find('[data-testid="action-confirmation-modal-btn-confirm"]').length) {
       // Delete Confirmation Modal appeared, click on the confirm button
       cy.get('[data-testid="action-confirmation-modal-btn-confirm"]').click();
     }