graphdb-workbench-tests 4.0.0-TR5 → 4.0.0-TR6

package/e2e-legacy/cluster/cluster-configuration/cluster-configuration-multi-region.spec.js

@@ -42,7 +42,9 @@ describe('Cluster configuration', () => {
         });
 
         ClusterStubs.stubClusterGroupStatusWithTag();
+        ClusterStubs.stubClusterConfigWithTag();
         cy.wait('@3-nodes-cluster-group-status-tag');
+        cy.wait('@cluster-config-with-tag');
         // Assert the tags table contains the expected tag
         ClusterConfigurationSteps.getTagsTable().should('be.visible');
         ClusterConfigurationSteps.getTagsTableRows().should('contain.text', tagName);
@@ -62,6 +64,11 @@ describe('Cluster configuration', () => {
         cy.wait('@delete-tag').then((interception) => {
             expect(interception.request.body).to.deep.equal({tag: tagName});
         });
+        ClusterStubs.stubClusterGroupStatus();
+        ClusterStubs.stubClusterConfig();
+        cy.wait('@3-nodes-cluster-group-status');
+        cy.wait('@cluster-config');
+        ClusterConfigurationSteps.getTagsTable().should('not.exist');
     });
 
     it('should show an alert when there is no elected leader in the cluster', () => {

package/e2e-legacy/cluster/edit-cluster-nodes-modal.spec.js

@@ -460,7 +460,7 @@ describe('Cluster management', () => {
                 "verificationTimeout": 1500,
                 "transactionLogMaximumSizeGB": 50.0,
                 "batchUpdateInterval": 5000,
-                "nodes": ['http://pc-desktop:7200', 'http://pc-desktop:7203']
+                "nodes": ['http://pc-desktop:7200', 'http://pc-desktop:7203'],
             });
         });
         // And expect success message to be displayed.

package/e2e-legacy/explore/visual-graph/visual.graph.spec.js

@@ -8,6 +8,19 @@ import HomeSteps from '../../../steps/home-steps.js';
 const FILE_TO_IMPORT = 'wine.rdf';
 const VALID_RESOURCE = 'USRegion';
 
+/**
+ * Updates the links limit and waits for the graph reload it triggers to complete.
+ *
+ * @param {string} value the new links limit
+ */
+function updateLinksLimit(value) {
+    VisualGraphSteps.updateLinksLimitField(value);
+    VisualGraphSteps.getLinksNumberField().should('have.value', value);
+    VisualGraphSteps.getUrl().should('match', new RegExp(`[?&]linksLimit=${value}(&|$)`));
+    VisualGraphSteps.getGraphVisualizationPane().should('be.visible');
+    VisualGraphSteps.getNodes();
+}
+
 describe('Visual graph screen validation', () => {
 
     let repositoryId;
@@ -311,6 +324,20 @@ describe('Visual graph screen validation', () => {
             VisualGraphSteps.getPredicates().should('have.length', 36);
         });
 
+        it('Should close the settings panel when navigating away from the graph', () => {
+            // Given I have opened a graph
+            VisualGraphSteps.openUSRegionUri();
+            // And I have opened the visual graph settings
+            VisualGraphSteps.openVisualGraphSettings();
+            VisualGraphSteps.getSettingsPanel().should('be.visible');
+
+            // When I click the visual graph submenu
+            MainMenuSteps.clickOnSubmenuVisualGraph();
+
+            // Then I expect the settings panel to be closed
+            VisualGraphSteps.getSettingsPanel().should('not.exist');
+        });
+
         it('Test include inferred Statements', () => {
             VisualGraphSteps.openUSRegionUri();
             // Check include inferred
@@ -361,9 +388,11 @@ describe('Visual graph screen validation', () => {
             // Pick a type that is displayed in the diagram for example "vin:Zinfandel"
             VisualGraphSteps.getNodes().and('contain', 'Zinfandel');
 
+            // Set the connections limit to 10 and wait for the graph reload it triggers,
+            // so that the settings are opened after the navigation has completed
+            updateLinksLimit('10');
+
             VisualGraphSteps.openVisualGraphSettings();
-            // Set the connections limit to 10
-            VisualGraphSteps.updateLinksLimitField('10');
             // Go to Settings and set "vin:Zinfandel" as an ignored type
             VisualGraphSteps.getIgnoredTypesField().clear().type('vin:Zinfandel').type('{enter}');
 
@@ -395,12 +424,14 @@ describe('Visual graph screen validation', () => {
             // Pick a type that is displayed in the diagram for example "vin:Zinfandel"
             VisualGraphSteps.getPredicates().should('contain', 'hasSugar');
 
+            // Set the connections limit to 10 and wait for the graph reload it triggers,
+            // so that the settings are opened after the navigation has completed
+            updateLinksLimit('10');
+
             VisualGraphSteps.openVisualGraphSettings();
             // Go to predicates tab
             VisualGraphSteps.openPredicatesTab();
 
-            // Set the connections limit to 10
-            VisualGraphSteps.updateLinksLimitField('10');
             // Set "vin:hasSugar" as an ignored predicate
             VisualGraphSteps.getIgnoredPredicatesField().clear().type('vin:hasSugar').type('{enter}');
 

package/e2e-legacy/setup/users-and-access/user-and-access.spec.js

@@ -280,7 +280,7 @@ describe('User and Access', () => {
                 LoginSteps.loginWithUser('admin', DEFAULT_ADMIN_PASSWORD);
                 UserAndAccessSteps.getUsersTable().should('be.visible');
 
-                cy.visit('/login?r=%252Fsparql');
+                cy.visit('/login?r=%2Fsparql');
                 cy.reload();
                 UserAndAccessSteps.getUrl().should('include', '/sparql');
             });

package/e2e-security/setup/users-and-access/user-and-access.spec.js

@@ -19,7 +19,6 @@ describe('User and Access', () => {
         repositoryId2 = 'user-access-repo2-' + Date.now();
         cy.createRepository({id: repositoryId1});
         cy.createRepository({id: repositoryId2});
-        cy.presetRepository(repositoryId1);
         UserAndAccessSteps.visit();
         // Users table should be visible
         UserAndAccessSteps.getUsersTable().should('be.visible');

package/fixtures/cluster/cluster-config-with-tag.json

@@ -0,0 +1,17 @@
+{
+    "electionMinTimeout": 8000,
+    "electionRangeTimeout": 6000,
+    "heartbeatInterval": 2000,
+    "messageSizeKB": 64,
+    "verificationTimeout": 1500,
+    "transactionLogMaximumSizeGB": 50.0,
+    "batchUpdateInterval": 5000,
+    "nodes": [
+        "pc-desktop:7302",
+        "pc-desktop:7300",
+        "pc-desktop:7301"
+    ],
+    "primaryTags": [
+        "test"
+    ]
+}

package/npm-shrinkwrap.json

@@ -1,12 +1,12 @@
 {
   "name": "graphdb-workbench-tests",
-  "version": "4.0.0-TR5",
+  "version": "4.0.0-TR6",
   "lockfileVersion": 3,
   "requires": true,
   "packages": {
     "": {
       "name": "graphdb-workbench-tests",
-      "version": "4.0.0-TR5",
+      "version": "4.0.0-TR6",
       "license": "Apache-2.0",
       "devDependencies": {
         "@bahmutov/cypress-code-coverage": "^2.7.2",

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "graphdb-workbench-tests",
-  "version": "4.0.0-TR5",
+  "version": "4.0.0-TR6",
   "description": "Cypress tests for GraphDB workbench",
   "type": "module",
   "scripts": {

package/steps/error-steps.js

@@ -9,7 +9,7 @@ export class ErrorSteps {
     }
 
     static getNoConnectedRepoMessage() {
-        return this.getRepositoryErrors().find('.alert.lead.alert-info');
+        return this.getRepositoryErrors().find('.alert.alert-info');
     }
 
     static verifyNoConnectedRepoMessage() {

package/stubs/cluster/cluster-stubs.js

@@ -77,6 +77,13 @@ export class ClusterStubs extends Stubs {
         }).as('cluster-config');
     }
 
+    static stubClusterConfigWithTag() {
+        cy.intercept('/rest/cluster/config', {
+            fixture: '/cluster/cluster-config-with-tag.json',
+            statusCode: 200
+        }).as('cluster-config-with-tag');
+    }
+
     static stubDeleteCluster() {
         cy.intercept('/rest/cluster/config?force=false', {
             fixture: '/cluster/delete-cluster.json',