ISPN-15077 Ickle query page

infinispan · Aug 4, 2023 · 764cd71 · 764cd71
1 parent f19e102
commit 764cd71
Show file tree

Hide file tree

Showing 4 changed files with 167 additions and 125 deletions.
diff --git a/cypress/e2e/cache-detail.cy.js b/cypress/e2e/cache-detail.cy.js
@@ -332,7 +332,7 @@ describe('Cache Detail Overview', () => {
     cy.get('[data-cy=cacheEntriesTab]').click();
     cy.get('[data-cy=queriesTab]').click();
     cy.get('#textSearchByQuery').click().type('from org.infinispan.Person where age>2');
-    cy.get('[data-cy=searchButton]').click();
+    cy.get('button[aria-label=searchButton]').click();
     cy.contains('1 - 1 of 1');
     cy.contains('Elaia');
 
@@ -344,7 +344,7 @@ describe('Cache Detail Overview', () => {
     cy.get('[data-cy=queriesTab]').click();
 
     cy.get('#textSearchByQuery').click().clear().type("from org.infinispan.Person where name = 'Elaia'");
-    cy.get('[data-cy=searchButton]').click();
+    cy.get('button[aria-label=searchButton]').click();
     cy.contains('1 - 1 of 1');
     cy.contains('Elaia');
 
@@ -356,7 +356,7 @@ describe('Cache Detail Overview', () => {
     cy.get('[data-cy=queriesTab]').click();
 
     cy.get('#textSearchByQuery').click().clear().type('from org.infinispan.Person where age=2');
-    cy.get('[data-cy=searchButton]').click();
+    cy.get('button[aria-label=searchButton]').click();
     cy.contains('Values not found.');
     //Verify metrics
     verifyCacheMetrics(11, 11, 11, 2, 11, 11, 13, 0, 0, 0);
@@ -374,7 +374,6 @@ describe('Cache Detail Overview', () => {
     cy.contains('key-9');
   });
 
-  //@TODO uncomment when ISPN-14189 is fixed.
    it('successfully manages indexes', () => {
     //Opening indexed-cache cache page.
     cy.login(Cypress.env("username"), Cypress.env("password"), '/cache/indexed-cache');

diff --git a/cypress/e2e/rbac_func.cy.js b/cypress/e2e/rbac_func.cy.js
@@ -22,7 +22,7 @@ describe('RBAC Functionlity Tests', () => {
     //Running query on secured page
     cy.get('[data-cy=queriesTab]').click();
     cy.get('#textSearchByQuery').click().type('from org.infinispan.Person where age>2');
-    cy.get('[data-cy=searchButton]').click();
+    cy.get('button[aria-label=searchButton]').click();
     cy.contains('1 - 1 of 1');
     cy.contains('Elaia');
 
@@ -235,7 +235,7 @@ describe('RBAC Functionlity Tests', () => {
     //Running query
     cy.get('[data-cy=queriesTab]').click();
     cy.get('#textSearchByQuery').click().type('from org.infinispan.Child where age<2');
-    cy.get('[data-cy=searchButton]').click();
+    cy.get('button[aria-label=searchButton]').click();
     if (!isMonitor) {
       //@TODO remove when the bug is fixed
       cy.contains('1 - 1 of 1');
@@ -348,7 +348,7 @@ describe('RBAC Functionlity Tests', () => {
     //Running query
     cy.get('[data-cy=queriesTab]').click();
     cy.get('#textSearchByQuery').click().type('from org.infinispan.Car where year>2010');
-    cy.get('[data-cy=searchButton]').click();
+    cy.get('button[aria-label=searchButton]').click();
     cy.contains('1 - 1 of 1');
     cy.contains('Ford');
     //Reseting cache state for next test