Upgrades PT6.1

infinispan · Jan 20, 2025 · 4211b3c · 4211b3c
1 parent 4e59c59
commit 4211b3c
Show file tree

Hide file tree

Showing 10 changed files with 1,811 additions and 1,402 deletions.
diff --git a/.github/workflows/pull_requests.yml b/.github/workflows/pull_requests.yml
@@ -48,7 +48,7 @@ jobs:
           #Adding nashorn libraries to both containers
           for containerId in $(docker ps -q)
           do
-            docker exec -i $containerId /opt/infinispan/bin/cli.sh install org.openjdk.nashorn:nashorn-core:15.4
+            docker exec -i $containerId /opt/infinispan/bin/cli.sh install org.openjdk.nashorn:nashorn-core:15.6
             docker exec -i $containerId /opt/infinispan/bin/cli.sh install org.ow2.asm:asm:9.4
             docker exec -i $containerId /opt/infinispan/bin/cli.sh install org.ow2.asm:asm-commons:9.4
             docker exec -i $containerId /opt/infinispan/bin/cli.sh install org.ow2.asm:asm-tree:9.4
@@ -69,7 +69,7 @@ jobs:
           #Adding nashorn libraries to both containers
           for containerId in $(docker ps -q)
           do
-            docker exec -i $containerId /opt/infinispan/bin/cli.sh install org.openjdk.nashorn:nashorn-core:15.4
+            docker exec -i $containerId /opt/infinispan/bin/cli.sh install org.openjdk.nashorn:nashorn-core:15.6
             docker exec -i $containerId /opt/infinispan/bin/cli.sh install org.ow2.asm:asm:9.4
             docker exec -i $containerId /opt/infinispan/bin/cli.sh install org.ow2.asm:asm-commons:9.4
             docker exec -i $containerId /opt/infinispan/bin/cli.sh install org.ow2.asm:asm-tree:9.4
@@ -89,7 +89,7 @@ jobs:
           #Adding nashorn libraries to both containers
           for containerId in $(docker ps -q)
           do
-            docker exec -i $containerId /opt/infinispan/bin/cli.sh install org.openjdk.nashorn:nashorn-core:15.4
+            docker exec -i $containerId /opt/infinispan/bin/cli.sh install org.openjdk.nashorn:nashorn-core:15.6
             docker exec -i $containerId /opt/infinispan/bin/cli.sh install org.ow2.asm:asm:9.4
             docker exec -i $containerId /opt/infinispan/bin/cli.sh install org.ow2.asm:asm-commons:9.4
             docker exec -i $containerId /opt/infinispan/bin/cli.sh install org.ow2.asm:asm-tree:9.4
@@ -103,7 +103,7 @@ jobs:
           # Wait for server to startup
           curl --fail --silent --show-error --retry-all-errors --retry 240 --retry-delay 1 http://localhost:11222/rest/v2/cache-managers/default/health/status > /dev/null
           #Installing Nashorn dependencies
-          docker exec $(docker ps -q -l) /opt/infinispan/bin/cli.sh install org.openjdk.nashorn:nashorn-core:15.4
+          docker exec $(docker ps -q -l) /opt/infinispan/bin/cli.sh install org.openjdk.nashorn:nashorn-core:15.6
           docker exec $(docker ps -q -l) /opt/infinispan/bin/cli.sh install org.ow2.asm:asm:9.4
           docker exec $(docker ps -q -l) /opt/infinispan/bin/cli.sh install org.ow2.asm:asm-commons:9.4
           docker exec $(docker ps -q -l) /opt/infinispan/bin/cli.sh install org.ow2.asm:asm-tree:9.4

diff --git a/cypress/e2e/3_proto-schema.cy.js b/cypress/e2e/3_proto-schema.cy.js
@@ -1,5 +1,10 @@
 describe('Proto Schema CRUD', () => {
+  const schemaName = 'aTestSchema';
   beforeEach(() => {
+    // Make sure aTestSchema schema does not exist
+    cy.cleanupTest(Cypress.env('username'), Cypress.env('password'),
+      '/schemas/' + schemaName + '.proto');
+    cy.wait(1000);
     cy.login(Cypress.env('username'), Cypress.env('password'));
   });
 
@@ -50,11 +55,11 @@ describe('Proto Schema CRUD', () => {
   });
 
   it('successfully creates, edits and deletes a proto schema', () => {
+    cy.wait(2000); // wait for the delete to be done
     clickTabSchemas();
 
     //Creating new schema
     cy.get('button[aria-label="create-schema-button"]').click();
-    const schemaName = 'aTestSchema';
     cy.get('#schema-name').click().type(schemaName);
     cy.get('#schema').click().type('schemaValue');
     cy.get('[data-cy="addSchemaButton"]').click();
@@ -69,23 +74,22 @@ describe('Proto Schema CRUD', () => {
     cy.contains('schemaValue');
     cy.contains('Save');
     //Artificially adding here some delays between actions so that the proto schema is updated properly and normally shown on the page.
-    cy.wait(3000);
-    cy.get('[data-cy=schemaEditArea]').type('{selectall}', { timeout: 10000 });
-    cy.wait(3000);
+    cy.wait(1000);
+    cy.get('[data-cy=schemaEditArea]').type('{selectall}', { timeout: 5000 });
+    cy.wait(1000);
     cy.get('[data-cy=schemaEditArea]').type(
       'package org.infinispan; message ExampleProto { optional int32 other_id = 1; }',
       { parseSpecialCharSequences: false }
     );
-    cy.wait(3000);
+    cy.wait(1000);
     cy.get('button[aria-label="confirm-edit-schema-button"]').click();
-    cy.wait(3000);
     cy.contains('Schema ' + schemaName +'.proto updated.');
-    cy.wait(3000);
+    cy.wait(1000);
     cy.get('[name=close-alert-button]').click(); //Closing alert popup.
     //Waiting 5 seconds so that the proto schema is managed to be updated on the page.
-    cy.wait(3000);
+    cy.wait(1000);
     cy.get('[data-cy="' + schemaName + '.protoConfig"]').click();
-    cy.wait(3000);
+    cy.wait(1000);
     cy.contains('schemaValue').should('not.exist');
     cy.contains('ExampleProto');
     cy.contains('Schema ' + schemaName + '.proto has errors').should('not.exist');

diff --git a/jest.config.js b/jest.config.js
@@ -34,5 +34,5 @@ module.exports = {
   transformIgnorePatterns: ['/node_modules/(?!(react-syntax-highlighter)/)'],
 
   // The test environment that will be used for testing.
-  testEnvironment: "jsdom",
+  testEnvironment: "jest-fixed-jsdom",
 };