Update tests to run with gateway (when CYPRESS_HUB_GATEWAY=true) (#5136)

* Update tests to run with gateway (when CYPRESS_HUB_GATEWAY=true) User Access > Users no create, no edit, no delete User Access > Groups no create, no delete no add/remove users yes add/remove roles User Access > Roles yes add/edit/delete No-Issue * add feature flag tests * prettier * increase defaltCommandTimeout, remove some custom timeouts * handle no source.parameter in namespace modal * more tests as only standalone - where creating users * community ci: disable signatures * ignore text in modal
ansible · Jun 27, 2024 · 26e7538 · 26e7538
1 parent e1cde29
commit 26e7538
Show file tree

Hide file tree

Showing 24 changed files with 229 additions and 179 deletions.
diff --git a/src/components/namespace-modal.tsx b/src/components/namespace-modal.tsx
@@ -60,8 +60,18 @@ export const NamespaceModal = ({
         onCreateSuccess(data);
       })
       .catch((error) => {
+        const nofield = [];
+
         for (const e of error.response.data.errors) {
-          errorMessages[e.source.parameter] = e.detail;
+          if (e.source) {
+            errorMessages[e.source.parameter] = e.detail;
+          } else {
+            nofield.push(e.detail || e.title);
+          }
+        }
+
+        if (nofield.length) {
+          errorMessages.__nofield = nofield.join('\n');
         }
 
         setNameValid(!('name' in errorMessages));

diff --git a/test/cypress.config.js b/test/cypress.config.js
@@ -4,6 +4,7 @@ module.exports = defineConfig({
   viewportWidth: 1280,
   viewportHeight: 800,
   e2e: {
+    defaultCommandTimeout: 20000,
     setupNodeEvents(on, _config) {
       if (process.env.CONSOLE_LOG_TO_TERMINAL) {
         return require('./cypress/plugins/console-logger').install(on);

diff --git a/test/cypress/e2e/approval-modal/approval-multiple-repos.js b/test/cypress/e2e/approval-modal/approval-multiple-repos.js
@@ -36,7 +36,6 @@ function rejectItem(repo) {
   menuActionClick(repo, 'Reject');
   cy.contains(
     'Certification status for collection "namespace collection1 v1.0.0" has been successfully updated.',
-    { timeout: 10000 },
   );
   cy.visit(`${uiPrefix}approval-dashboard`);
   cy.contains('Clear all filters').click();
@@ -113,7 +112,6 @@ describe('Approval Dashboard process with multiple repos', () => {
     cy.contains('button', 'Select').click();
     cy.contains(
       'Certification status for collection "namespace collection1 v1.0.0" has been successfully updated.',
-      { timeout: 20000 },
     );
 
     cy.visit(`${uiPrefix}approval-dashboard`);
@@ -144,7 +142,6 @@ describe('Approval Dashboard process with multiple repos', () => {
     cy.contains('button', 'Select').click();
     cy.contains(
       'Certification status for collection "namespace collection1 v1.0.0" has been successfully updated.',
-      { timeout: 20000 },
     );
 
     cy.visit(`${uiPrefix}approval-dashboard`);
@@ -183,7 +180,6 @@ describe('Approval Dashboard process with multiple repos', () => {
     cy.contains('button', 'Select').click();
     cy.contains(
       'Certification status for collection "namespace collection1 v1.0.0" has been successfully updated.',
-      { timeout: 20000 },
     );
 
     cy.visit(`${uiPrefix}approval-dashboard`);

diff --git a/test/cypress/e2e/approval-modal/feature-flags.js b/test/cypress/e2e/approval-modal/feature-flags.js
@@ -0,0 +1,21 @@
+const apiPrefix = Cypress.env('apiPrefix');
+
+describe('Feature flags', () => {
+  it('match expectations', () => {
+    cy.request(`${apiPrefix}_ui/v1/feature-flags/`).then(({ body }) => {
+      expect(body._messages).to.be.empty;
+      expect(body).to.include({ ai_deny_index: false });
+      expect(body).to.include({ can_create_signatures: true });
+      expect(body).to.include({ can_upload_signatures: false });
+      expect(body).to.include({ collection_auto_sign: true });
+      expect(body).to.include({ collection_signing: true });
+      expect(body).to.include({ container_signing: true });
+      expect(body).to.include({ display_repositories: true });
+      expect(body).to.include({ display_signatures: true });
+      expect(body).to.include({ execution_environments: true });
+      expect(body).to.include({ legacy_roles: false });
+      expect(body).to.include({ require_upload_signatures: false });
+      expect(body).to.include({ signatures_enabled: true });
+    });
+  });
+});
diff --git a/test/cypress/e2e/approval/approval-process.js b/test/cypress/e2e/approval/approval-process.js
@@ -25,7 +25,7 @@ describe('Approval Dashboard process', () => {
     cy.visit(`${uiPrefix}approval-dashboard`);
     cy.contains('[data-cy^="ApprovalRow"]', 'Needs review');
     cy.contains('[data-cy^="ApprovalRow"] button', 'Sign and approve').click();
-    cy.contains('.body', 'No results found', { timeout: 8000 });
+    cy.contains('.body', 'No results found');
     cy.visit(`${uiPrefix}approval-dashboard`);
     cy.contains('button', 'Clear all filters').click();
     cy.contains('[data-cy^="ApprovalRow"]', 'Signed and approved');
@@ -77,7 +77,7 @@ describe('Approval Dashboard process', () => {
     cy.wait(10000);
     cy.contains('My imports');
     cy.get('.pf-v5-c-label__content').contains('Running').should('exist');
-    cy.wait('@upload', { timeout: 10000 });
+    cy.wait('@upload');
     cy.wait(5000);
     cy.get('.pf-v5-c-label__content').contains('Failed').should('not.exist');
     cy.get('.pf-v5-c-label__content').contains('Completed').should('exist');

diff --git a/test/cypress/e2e/approval/signing.js b/test/cypress/e2e/approval/signing.js
@@ -36,10 +36,7 @@ describe('signing versions - auto sign on approval', () => {
 
     // Go and check if it is signed in the collections
     cy.visit(`${uiPrefix}collections`);
-    cy.get('[data-cy="signature-badge"]', { timeout: 20000 }).should(
-      'have.length',
-      1,
-    );
+    cy.get('[data-cy="signature-badge"]').should('have.length', 1);
     cy.get('[data-cy="signature-badge"]').first().should('contain', 'Signed');
 
     // Optimization: check the signature button too here

diff --git a/test/cypress/e2e/collections/collection-detail.js b/test/cypress/e2e/collections/collection-detail.js
@@ -6,15 +6,13 @@ describe('Collection detail', () => {
   function deprecate() {
     cy.openHeaderKebab();
     cy.contains('Deprecate').click();
-    cy.contains('This collection has been deprecated.', { timeout: 10000 });
+    cy.contains('This collection has been deprecated.');
   }
 
   function undeprecate() {
     cy.openHeaderKebab();
     cy.contains('Undeprecate').click();
-    cy.contains('This collection has been deprecated.', {
-      timeout: 10000,
-    }).should('not.exist');
+    cy.contains('This collection has been deprecated.').should('not.exist');
   }
 
   before(() => {
@@ -80,9 +78,7 @@ describe('Collection detail', () => {
       }
 
       if (tab.name == 'Import log') {
-        cy.contains('.body', 'Approval status', {
-          timeout: 10000,
-        });
+        cy.contains('.body', 'Approval status');
       }
 
       if (tab.name == 'Contents') {

diff --git a/test/cypress/e2e/collections/collection-upload.js b/test/cypress/e2e/collections/collection-upload.js
@@ -104,7 +104,7 @@ describe('Collection Upload Tests', () => {
     cy.get('[data-cy="confirm-upload"]').click();
     cy.wait('@upload');
     cy.contains('My imports');
-    cy.get('.pf-v5-c-label__content').contains('Completed', { timeout: 15000 });
+    cy.get('.pf-v5-c-label__content').contains('Completed');
     cy.get('.pf-v5-c-label__content').contains('Failed').should('not.exist');
     cy.get('.pf-v5-c-label__content').contains('Running').should('not.exist');
   });

diff --git a/test/cypress/e2e/collections/collection.js b/test/cypress/e2e/collections/collection.js
@@ -26,7 +26,7 @@ describe('collection tests', () => {
     cy.get('[data-cy=delete-collection]').click();
     cy.get('input[id=delete_confirm]').click();
     cy.get('button').contains('Delete').click();
-    cy.contains('No collections yet', { timeout: 10000 });
+    cy.contains('No collections yet');
   });
 
   it('deletes a collection version', () => {
@@ -113,9 +113,6 @@ describe('collection tests', () => {
     cy.get('button').contains('Delete').click();
     cy.contains(
       'Collection "test_repo_collection2" has been successfully deleted.',
-      {
-        timeout: 10000,
-      },
     );
     cy.contains('[data-cy="CollectionListItem"]', 'repo2');
     cy.contains('[data-cy="CollectionListItem"]', 'Published').should(
@@ -167,9 +164,6 @@ describe('collection tests', () => {
     cy.get('button').contains('Delete').click();
     cy.contains(
       'Collection "test_repo_collection_version2 v1.0.0" has been successfully deleted.',
-      {
-        timeout: 10000,
-      },
     );
 
     cy.visit(

diff --git a/test/cypress/e2e/collections/collections-list.js b/test/cypress/e2e/collections/collections-list.js
@@ -15,17 +15,15 @@ describe('Collections list Tests', () => {
 
     cy.get('.collection-container [aria-label="Actions"]').click();
     cy.contains('Deprecate').click();
-    cy.contains('No results found', { timeout: 10000 });
+    cy.contains('No results found');
   }
 
   function undeprecate() {
     cy.visit(`${uiPrefix}repo/published/my_namespace/my_collection0`);
     cy.contains('This collection has been deprecated.');
     cy.openHeaderKebab();
     cy.contains('Undeprecate').click();
-    cy.contains('This collection has been deprecated.', {
-      timeout: 10000,
-    }).should('not.exist');
+    cy.contains('This collection has been deprecated.').should('not.exist');
   }
 
   function undeprecateIfDeprecated() {
@@ -138,9 +136,7 @@ describe('Collections list Tests', () => {
     cy.contains('Delete collection from system').click();
     cy.get('[data-cy=modal_checkbox] input').click();
     cy.get('[data-cy=delete-button] button').click();
-    cy.contains('Collection "my_collection0" has been successfully deleted.', {
-      timeout: 15000,
-    });
+    cy.contains('Collection "my_collection0" has been successfully deleted.');
     cy.contains('No results found');
   });
 
@@ -156,9 +152,7 @@ describe('Collections list Tests', () => {
     cy.get('[data-cy=modal_checkbox] input').click();
     cy.get('[data-cy=delete-button] button').click();
 
-    cy.contains('Collection "my_collection1" has been successfully deleted.', {
-      timeout: 15000,
-    });
+    cy.contains('Collection "my_collection1" has been successfully deleted.');
     cy.contains('No results found');
   });
 });
diff --git a/test/cypress/e2e/community/compose.env b/test/cypress/e2e/community/compose.env
@@ -1,7 +1,10 @@
 PULP_GALAXY_ENABLE_UNAUTHENTICATED_COLLECTION_ACCESS='true'
 PULP_GALAXY_ENABLE_UNAUTHENTICATED_COLLECTION_DOWNLOAD='true'
-PULP_GALAXY_REQUIRE_CONTENT_APPROVAL='false'
 PULP_GALAXY_FEATURE_FLAGS__ai_deny_index='true'
+PULP_GALAXY_FEATURE_FLAGS__collection_signing='false'
+PULP_GALAXY_FEATURE_FLAGS__container_signing='false'
 PULP_GALAXY_FEATURE_FLAGS__display_repositories='false'
 PULP_GALAXY_FEATURE_FLAGS__execution_environments='false'
 PULP_GALAXY_FEATURE_FLAGS__legacy_roles='true'
+PULP_GALAXY_FEATURE_FLAGS__signatures_enabled='false'
+PULP_GALAXY_REQUIRE_CONTENT_APPROVAL='false'
diff --git a/test/cypress/e2e/community/feature-flags.js b/test/cypress/e2e/community/feature-flags.js
@@ -0,0 +1,22 @@
+const apiPrefix = Cypress.env('apiPrefix');
+
+describe('Feature flags', () => {
+  it('match expectations', () => {
+    cy.request(`${apiPrefix}_ui/v1/feature-flags/`).then(({ body }) => {
+      expect(body._messages).to.be.empty;
+      expect(body).to.include({ ai_deny_index: true });
+      expect(body).to.include({ can_create_signatures: false });
+      expect(body).to.include({ can_upload_signatures: false });
+      expect(body).to.include({ collection_auto_sign: false });
+      expect(body).to.include({ collection_signing: false });
+      expect(body).to.include({ container_signing: false });
+      expect(body).to.include({ display_repositories: false });
+      expect(body).to.include({ display_signatures: false });
+      expect(body).to.include({ execution_environments: false });
+      expect(body).to.include({ external_authentication: true });
+      expect(body).to.include({ legacy_roles: true });
+      expect(body).to.include({ require_upload_signatures: false });
+      expect(body).to.include({ signatures_enabled: false });
+    });
+  });
+});
diff --git a/test/cypress/e2e/namespaces/docs-menu.js b/test/cypress/e2e/namespaces/docs-menu.js
@@ -28,7 +28,6 @@ describe('Documentation dropdown', () => {
     cy.get('[data-cy="docs-dropdown"]').click();
     cy.get('.pf-v5-c-dropdown__menu').contains('About').click();
     cy.get('.pf-v5-c-about-modal-box').should('be.visible');
-    cy.get('h1').contains('Galaxy NG');
     cy.get('[aria-label="Close Dialog"]').click();
     cy.get('.pf-v5-c-about-modal-box').should('not.exist');
   });

diff --git a/test/cypress/e2e/namespaces/group-management.js b/test/cypress/e2e/namespaces/group-management.js
@@ -79,15 +79,15 @@ describe('Hub Group Management Tests', () => {
     cy.login();
   });
 
-  it('admin user can create/delete a group', () => {
+  it.standalone('admin user can create/delete a group', () => {
     const name = 'testGroup';
 
     createGroupManually(name);
     deleteGroupManually(name);
     cy.contains('No groups yet').should('exist');
   });
 
-  it('admin user can add/remove a user to/from a group', () => {
+  it.standalone('admin user can add/remove a user to/from a group', () => {
     const groupName = 'testGroup';
     const userName = 'testUser';
 

diff --git a/test/cypress/e2e/namespaces/login.js b/test/cypress/e2e/namespaces/login.js
@@ -37,13 +37,16 @@ describe('Login helpers', () => {
     cy.galaxykit('user create', username, password);
   });
 
-  it('can login manually and logout as admin or different user', () => {
-    manualLogin(username, password);
-    cy.contains(username);
-    manualLogout();
-    manualLogin(adminUsername, adminPassword);
-    cy.contains(adminUsername);
-  });
+  it.standalone(
+    'can login manually and logout as admin or different user',
+    () => {
+      manualLogin(username, password);
+      cy.contains(username);
+      manualLogout();
+      manualLogin(adminUsername, adminPassword);
+      cy.contains(adminUsername);
+    },
+  );
 
   it('can use api login', () => {
     cy.login();

diff --git a/test/cypress/e2e/namespaces/profile.js b/test/cypress/e2e/namespaces/profile.js
@@ -6,7 +6,7 @@ const helperText = (id) =>
     .parents('.pf-v5-c-form__group')
     .find('.pf-v5-c-helper-text__item-text');
 
-describe('My Profile Tests', () => {
+describe.standalone('My Profile Tests', () => {
   const username = 'nopermission';
   const password = 'n0permissi0n';
 

diff --git a/test/cypress/e2e/namespaces/rbac-access.js b/test/cypress/e2e/namespaces/rbac-access.js
@@ -154,7 +154,7 @@ function testAccessTab({
   cy.get(
     `[data-cy="RoleListTable-ExpandableRow-row-${role}"] .pf-v5-c-table__toggle button`,
   ).click();
-  cy.contains('.pf-v5-c-label', permissionLabel, { timeout: 10000 });
+  cy.contains('.pf-v5-c-label', permissionLabel);
 
   // role list view, remove
   cy.get(