Bug 1988133: Cypress - re-enable OLM globall install test, handle mul…

…tiple csv's crd versions
openshift · Oct 26, 2021 · eb3c5cd · eb3c5cd
1 parent cc1397e
commit eb3c5cd
Show file tree

Hide file tree

Showing 3 changed files with 15 additions and 7 deletions.
diff --git a/.../packages/operator-lifecycle-manager/integration-tests-cypress/tests/operator-hub.spec.ts b/.../packages/operator-lifecycle-manager/integration-tests-cypress/tests/operator-hub.spec.ts
@@ -61,7 +61,7 @@ describe('Interacting with OperatorHub', () => {
   });
 
   it('filters Operators by name', () => {
-    const operatorName = 'Alcide kAudit Operator';
+    const operatorName = 'Couchbase Operator';
     cy.byTestID('search-operatorhub').type(operatorName);
     cy.get('.catalog-tile-pf')
       .its('length')

diff --git a/...fecycle-manager/integration-tests-cypress/tests/operator-install-single-namespace.spec.ts b/...fecycle-manager/integration-tests-cypress/tests/operator-install-single-namespace.spec.ts
@@ -11,9 +11,9 @@ const testOperator = {
 };
 
 const testOperand: TestOperandProps = {
-  name: 'CodeReady Workspaces Cluster',
+  name: 'CodeReady Workspaces instance Specification',
   kind: 'CheCluster',
-  tabName: 'CodeReady Workspaces Cluster',
+  tabName: 'CodeReady Workspaces instance Specification',
   exampleName: `codeready-workspaces`,
 };
 

diff --git a/...tend/packages/operator-lifecycle-manager/integration-tests-cypress/views/operator.view.ts b/...tend/packages/operator-lifecycle-manager/integration-tests-cypress/views/operator.view.ts
@@ -109,7 +109,9 @@ export const operator = {
     cy.log(`create operand "${exampleName}" for "${operatorName}" in ${installedNamespace}`);
     operator.navToDetailsPage(operatorName, installedNamespace);
     cy.log(`navigate to the "${tabName}" tab`);
-    cy.byLegacyTestID(`horizontal-link-${tabName}`).click();
+    cy.byLegacyTestID(`horizontal-link-${tabName}`)
+      .last()
+      .click();
     cy.byTestID('msg-box-title').should('contain', 'No operands found');
     cy.byTestID('msg-box-detail').should(
       'contain',
@@ -136,7 +138,9 @@ export const operator = {
     cy.log(`operand "${exampleName}" should exist for "${operatorName}" in ${installedNamespace}`);
     operator.navToDetailsPage(operatorName, installedNamespace);
     cy.log(`navigate to the "${tabName}" tab`);
-    cy.byLegacyTestID(`horizontal-link-${tabName}`).click();
+    cy.byLegacyTestID(`horizontal-link-${tabName}`)
+      .last()
+      .click();
     cy.byTestOperandLink(exampleName).should('contain', exampleName);
     cy.log(`navigate to the operand "Details" tab`);
     cy.byTestOperandLink(exampleName).click();
@@ -152,7 +156,9 @@ export const operator = {
     cy.log(`delete operand: ${exampleName}`);
     operator.navToDetailsPage(operatorName, installedNamespace);
     cy.log(`navigate to the "${tabName}" tab`);
-    cy.byLegacyTestID(`horizontal-link-${tabName}`).click();
+    cy.byLegacyTestID(`horizontal-link-${tabName}`)
+      .last()
+      .click();
     // drilldown to Operand details page
     cy.byTestOperandLink(exampleName).click();
     detailsPage.clickPageActionFromDropdown(`Delete ${operandKind}`);
@@ -169,7 +175,9 @@ export const operator = {
     cy.log(`operand "${exampleName}" should not exist`);
     operator.navToDetailsPage(operatorName, installedNamespace);
     cy.log(`navigate to the "${tabName}" tab`);
-    cy.byLegacyTestID(`horizontal-link-${tabName}`).click();
+    cy.byLegacyTestID(`horizontal-link-${tabName}`)
+      .last()
+      .click();
     cy.byTestOperandLink(exampleName).should('not.exist');
   },
   uninstall: (operatorName: string, installedNamespace: string = GlobalInstalledNamespace) => {