cy.openHeaderKebab - and scroll to top first

ansible · Nov 30, 2023 · 0e32cf0 · 0e32cf0
1 parent 0e53440
commit 0e32cf0
Show file tree

Hide file tree

Showing 9 changed files with 19 additions and 14 deletions.
diff --git a/test/cypress/e2e/collections/collection.js b/test/cypress/e2e/collections/collection.js
@@ -22,7 +22,7 @@ describe('collection tests', () => {
 
     cy.visit(`${uiPrefix}repo/published/test_namespace/test_collection`);
 
-    cy.get('[data-cy="kebab-toggle"] [aria-label="Actions"]').click();
+    cy.openHeaderKebab();
     cy.get('[data-cy=delete-collection]').click();
     cy.get('input[id=delete_confirm]').click();
     cy.get('button').contains('Delete').click();
@@ -41,7 +41,7 @@ describe('collection tests', () => {
     cy.get(
       `a[href*="${uiPrefix}repo/published/my_namespace/my_collection"]`,
     ).click();
-    cy.get('[data-cy="kebab-toggle"] [aria-label="Actions"]').click();
+    cy.openHeaderKebab();
     cy.get('[data-cy=delete-collection-version]').click();
     cy.get('input[id=delete_confirm]').click();
     cy.get('button').contains('Delete').click();
@@ -62,7 +62,7 @@ describe('collection tests', () => {
     cy.galaxykit('task wait all');
     cy.visit(`${uiPrefix}repo/published/${namespace}/${collection}`);
 
-    cy.get('[data-cy="kebab-toggle"] [aria-label="Actions"]').click();
+    cy.openHeaderKebab();
     cy.get(
       '[data-cy="copy-collection-version-to-repository-dropdown"]',
     ).click();
@@ -156,7 +156,7 @@ describe('collection tests', () => {
       `${uiPrefix}repo/repo2/test_namespace/test_repo_collection_version2/?version=1.0.0`,
     );
 
-    cy.get('[data-cy="kebab-toggle"] [aria-label="Actions"]').click();
+    cy.openHeaderKebab();
     cy.contains('Remove version 1.0.0 from repository').click();
     cy.get('input[id=delete_confirm]').click();
     cy.get('button').contains('Delete').click();

diff --git a/test/cypress/e2e/collections/collection_detail.js b/test/cypress/e2e/collections/collection_detail.js
@@ -4,13 +4,13 @@ describe('Collection detail', () => {
   const baseURL = `${uiPrefix}repo/published/collection_detail_test_namespace/collection_detail_test_collection`;
 
   function deprecate() {
-    cy.get('[data-cy="kebab-toggle"] [aria-label="Actions"]').click();
+    cy.openHeaderKebab();
     cy.contains('Deprecate').click();
     cy.contains('This collection has been deprecated.', { timeout: 10000 });
   }
 
   function undeprecate() {
-    cy.get('[data-cy="kebab-toggle"] [aria-label="Actions"]').click();
+    cy.openHeaderKebab();
     cy.contains('Undeprecate').click();
     cy.contains('This collection has been deprecated.', {
       timeout: 10000,

diff --git a/test/cypress/e2e/collections/collection_upload.js b/test/cypress/e2e/collections/collection_upload.js
@@ -64,7 +64,7 @@ describe('Collection Upload Tests', () => {
     cy.login();
     cy.visit(`${uiPrefix}repo/published/testspace/testcollection`);
     cy.contains('testcollection');
-    cy.get('[data-cy="kebab-toggle"] [aria-label="Actions"]').click();
+    cy.openHeaderKebab();
     cy.contains('Upload new version').click();
     cy.contains('New version of testspace.testcollection');
   });

diff --git a/test/cypress/e2e/collections/collections_list.js b/test/cypress/e2e/collections/collections_list.js
@@ -21,7 +21,7 @@ describe('Collections list Tests', () => {
   function undeprecate() {
     cy.visit(`${uiPrefix}repo/published/my_namespace/my_collection0`);
     cy.contains('This collection has been deprecated.');
-    cy.get('[data-cy="kebab-toggle"] [aria-label="Actions"]').click();
+    cy.openHeaderKebab();
     cy.contains('Undeprecate').click();
     cy.contains('This collection has been deprecated.', {
       timeout: 10000,

diff --git a/test/cypress/e2e/insights_collections/collection.js b/test/cypress/e2e/insights_collections/collection.js
@@ -17,7 +17,7 @@ describe('collection tests', () => {
 
     cy.visit(`${uiPrefix}repo/published/test_namespace/test_collection`);
 
-    cy.get('[data-cy="kebab-toggle"] [aria-label="Actions"]').click();
+    cy.openHeaderKebab();
     cy.get('[data-cy=delete-collection]').click();
     cy.get('input[id=delete_confirm]').click();
     cy.get('button').contains('Delete').click();
@@ -36,7 +36,7 @@ describe('collection tests', () => {
     cy.get(
       `a[href*="${uiPrefix}repo/published/my_namespace/my_collection"]`,
     ).click();
-    cy.get('[data-cy="kebab-toggle"] [aria-label="Actions"]').click();
+    cy.openHeaderKebab();
     cy.get('[data-cy=delete-collection-version]').click();
     cy.get('input[id=delete_confirm]').click();
     cy.get('button').contains('Delete').click();

diff --git a/test/cypress/e2e/insights_collections/collection_detail.js b/test/cypress/e2e/insights_collections/collection_detail.js
@@ -4,13 +4,13 @@ describe('Collection detail', () => {
   const baseURL = `${uiPrefix}repo/published/collection_detail_test_namespace/collection_detail_test_collection`;
 
   function deprecate() {
-    cy.get('[data-cy="kebab-toggle"] [aria-label="Actions"]').click();
+    cy.openHeaderKebab();
     cy.contains('Deprecate').click();
     cy.contains('This collection has been deprecated.', { timeout: 10000 });
   }
 
   function undeprecate() {
-    cy.get('[data-cy="kebab-toggle"] [aria-label="Actions"]').click();
+    cy.openHeaderKebab();
     cy.contains('Undeprecate').click();
     cy.contains('This collection has been deprecated.', {
       timeout: 10000,

diff --git a/test/cypress/e2e/insights_collections/collections_list.js b/test/cypress/e2e/insights_collections/collections_list.js
@@ -20,7 +20,7 @@ describe('Collections list Tests', () => {
   function undeprecate() {
     cy.visit(`${uiPrefix}repo/published/my_namespace/my_collection0`);
     cy.contains('This collection has been deprecated.');
-    cy.get('[data-cy="kebab-toggle"] [aria-label="Actions"]').click();
+    cy.openHeaderKebab();
     cy.contains('Undeprecate').click();
     cy.contains('This collection has been deprecated.', {
       timeout: 10000,

diff --git a/test/cypress/e2e/misc/rbac.js b/test/cypress/e2e/misc/rbac.js
@@ -287,7 +287,7 @@ describe('RBAC test for user with permissions', () => {
     cy.visit(`${uiPrefix}repo/published/testspace2/testcollection2`);
 
     // can Delete collection
-    cy.get('[data-cy="kebab-toggle"] [aria-label="Actions"]').click();
+    cy.openHeaderKebab();
     cy.contains('Delete collection from system');
   });
 

diff --git a/test/cypress/support/commands.js b/test/cypress/support/commands.js
@@ -40,6 +40,11 @@ Cypress.Commands.add('assertTitle', {}, (title) => {
   cy.contains('.pf-c-title', title);
 });
 
+Cypress.Commands.add('openHeaderKebab', {}, () => {
+  cy.scrollTo(0, 0);
+  cy.get('[data-cy="kebab-toggle"] [aria-label="Actions"]').click();
+});
+
 Cypress.Commands.add(
   'createUser',
   {},