graphdb-workbench-tests 3.4.0-TR3 → 3.4.0-TR5

package/e2e-legacy/cluster/cluster-states.spec.js

@@ -104,14 +104,14 @@ describe('Cluster states', () => {
         ClusterViewSteps.getLink('pc-desktop-7300-pc-desktop-7302').should('have.css', 'stroke-dasharray', '10px, 10px')
             .and('have.css', 'marker-mid', 'url("#arrowhead_big")')
             .invoke('attr', 'stroke')
-            .should('eq', 'var(--gw-secondary-base)');
+            .should('eq', 'var(--gw-foreground-on-surface-primary)');
         // And I expect an out of sync link between the leader and the out of sync node (the one receiving the snapshot)
         ClusterViewSteps.getLink('pc-desktop-7301-pc-desktop-7300').should('have.css', 'stroke-dasharray', '10px, 10px')
             .invoke('attr', 'stroke')
-            .should('eq', 'var(--gw-neutral-base)');
+            .should('eq', 'var(--gw-neutral-light)');
         // And I expect to have an in sync link between the leader and the node sending the snapshot
         ClusterViewSteps.getLink('pc-desktop-7301-pc-desktop-7302').should('have.css', 'stroke-dasharray', 'none')
             .invoke('attr', 'stroke')
-            .should('eq', 'var(--gw-secondary-base)');
+            .should('eq', 'var(--gw-foreground-on-surface-primary)');
     });
 });

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

@@ -5,6 +5,7 @@ import {ApplicationSteps} from '../../../steps/application-steps';
 import HomeSteps from '../../../steps/home-steps.js';
 import {BaseSteps} from "../../../steps/base-steps.js";
 import SparqlSteps from "../../../steps/sparql-steps.js";
+import {VisualGraphSplitButtonSteps} from '../../../steps/visual-graph-split-button-steps.js';
 
 const FILE_TO_IMPORT = 'wine.rdf';
 const VALID_RESOURCE = 'USRegion';
@@ -121,9 +122,10 @@ describe('Visual graph linksLimit URL parameter', () => {
             SparqlSteps.visit();
             SparqlSteps.typeQuery(`CONSTRUCT WHERE {?s ?p ?o} LIMIT 10`);
             SparqlSteps.executeQuery();
-            SparqlSteps.visualizeConstructQuery();
+            VisualGraphSplitButtonSteps.clickOnVisualizeMainButton();
 
             // Then, I expect to see 10 nodes before changing the limit
+            BaseSteps.getUrl().should('include', 'linksLimit=10');
             VisualGraphSteps.getNodes().should('have.length', 10); // 10 nodes total, since we don't have a root node
 
             // When, I update the link limit from the input field

package/e2e-legacy/guides/table-graph-explore/table-graph-explore-guide.spec.js

@@ -3,6 +3,7 @@ import {GuideSteps} from "../../../steps/guides/guide-steps.js";
 import {GuideDialogSteps} from "../../../steps/guides/guide-dialog-steps.js";
 import {YasrSteps} from "../../../steps/yasgui/yasr-steps.js";
 import {ResourceSteps} from "../../../steps/resource/resource-steps.js";
+import {VisualGraphSplitButtonSteps} from '../../../steps/visual-graph-split-button-steps.js';
 
 describe('Table Graph explore', () => {
     const FILE_TO_IMPORT = 'wine.rdf';
@@ -107,7 +108,7 @@ describe('Table Graph explore', () => {
 
             GuideDialogSteps.assertDialogWithTitleIsVisible('Explore RDF as a table — 6/8');
             GuideDialogSteps.assertDialogWithContentIsVisible('You can always explore the same data using the Visual graph view. Click on the Visual graph button to try it now.');
-            ResourceSteps.clickOnVisualGraphButton();
+            VisualGraphSplitButtonSteps.clickOnVisualizeMainButton();
 
             GuideDialogSteps.assertDialogWithTitleIsVisible('Explore RDF as a table — 7/8');
             GuideDialogSteps.assertDialogWithContentIsVisible('The graph shows connections between the start node, vin:WineGrape, and other nodes. Each arrow represents one or more connections (RDF statements).');

package/e2e-legacy/resource/resource.spec.js

@@ -7,10 +7,12 @@ import {YasqeSteps} from "../../steps/yasgui/yasqe-steps";
 import {YasrSteps} from "../../steps/yasgui/yasr-steps";
 import {YasguiSteps} from "../../steps/yasgui/yasgui-steps";
 import {JsonLdModalSteps} from "../../steps/json-ld-modal-steps";
+import {GraphConfigStubs} from '../../stubs/graph-config-stubs.js';
+import {VisualGraphSplitButtonSteps} from '../../steps/visual-graph-split-button-steps.js';
 
 const FILE_TO_IMPORT = 'resource-test-data.ttl';
-const SUBJECT_RESOURCE = 'http:%2F%2Fexample.com%2Fontology%23CustomerLoyalty';
-const SUBJECT_RESOURCE_SHORT_URI = 'http://example.com/ontology#CustomerLoyalty';
+const SUBJECT_RESOURCE_ENCODED = 'http:%2F%2Fexample.com%2Fontology%23CustomerLoyalty';
+const SUBJECT_RESOURCE = 'http://example.com/ontology#CustomerLoyalty';
 const PREDICATE_SOURCE = 'http:%2F%2Fwww.w3.org%2F2000%2F01%2Frdf-schema%23subClassOf';
 const CONTEXT_EXPLICIT = 'http://www.ontotext.com/explicit';
 const OBJECT_RESOURCE = 'http:%2F%2Fexample.com%2Fontology%23Metric';
@@ -33,13 +35,13 @@ describe('Resource view', () => {
 
     it('should open resource view with active role tab depend on url role parameter', () => {
         ResourceSteps.getAllRoles().forEach((role) => {
-            ResourceSteps.visit(`uri=${SUBJECT_RESOURCE}&role=${role}`);
+            ResourceSteps.visit(`uri=${SUBJECT_RESOURCE_ENCODED}&role=${role}`);
             ResourceSteps.verifyActiveRoleTab(role);
         });
     });
 
     it('should open subject tab if role parameter is miss', () => {
-        ResourceSteps.visit(`uri=${SUBJECT_RESOURCE}&role=subject`);
+        ResourceSteps.visit(`uri=${SUBJECT_RESOURCE_ENCODED}&role=subject`);
         ResourceSteps.verifyActiveRoleTab('subject');
     });
 
@@ -62,17 +64,35 @@ describe('Resource view', () => {
         YasrSteps.getResults().should('have.length', 5);
     });
 
-    it('should navigate to visual graph view', () => {
+    it('should open graphs-visualizations view when click on main button', () => {
         // When I am on resource view and page loaded a resource.
-        ResourceSteps.visit(`uri=${SUBJECT_RESOURCE}&role=subject`);
+        ResourceSteps.visit(`uri=${SUBJECT_RESOURCE_ENCODED}&role=subject`);
 
         // When I click on "Visual graph" button.
-        ResourceSteps.clickOnVisualGraphButton();
+        VisualGraphSplitButtonSteps.clickOnVisualizeMainButton();
 
         // Then I expect to be redirected to explore graph view.
         VisualGraphSteps.verifyUrl();
     });
 
+    it('should open graphs-visualizations view when select a graph configuration', () => {
+        // When I am on resource view and page loaded a resource.
+        ResourceSteps.visit(`uri=${SUBJECT_RESOURCE_ENCODED}&role=subject`);
+        GraphConfigStubs.stubGetGraphConfigs();
+
+        // WHEN: I open the dropdown.
+        VisualGraphSplitButtonSteps.toggleGraphConfigDropdown();
+        // THEN: I expect to see all graph configurations.
+        VisualGraphSplitButtonSteps.getGraphConfigs().should('have.length', 3);
+
+        // WHEN: I select a graph configuration
+        VisualGraphSplitButtonSteps.selectGraphConfig();
+        // THEN: I expect to be navigated to graphs-visualizations view.
+        cy.url().should('include', 'graphs-visualizations');
+        cy.getQueryParam('uri').should('include', SUBJECT_RESOURCE);
+        cy.getQueryParam('config').should('eq', 'de99fd5de7f94ef98f1875dff55fc1c9');
+    });
+
     it('should displays results depends on explicit/implicit dropdown', () => {
         // When I am on resource view and page loaded a resource that has triplets in explicit and implicit context,
         ResourceSteps.visit(`uri=${IMPLICIT_EXPLICIT_RESOURCE}&role=all`);
@@ -175,11 +195,11 @@ describe('Resource view', () => {
         it('should list the triples of a resource used as subject', () => {
             // When I am on resource view,
             // and page loaded a resource that is used as subject,
-            ResourceSteps.visit(`uri=${SUBJECT_RESOURCE}&role=subject`);
+            ResourceSteps.visit(`uri=${SUBJECT_RESOURCE_ENCODED}&role=subject`);
 
             // Then I expect to see only one result because the resource has only one triplet as subject.
             YasrSteps.getResults().should('have.length', 1);
-            YasrSteps.getResultLink(0, 1).should('contain', SUBJECT_RESOURCE_SHORT_URI);
+            YasrSteps.getResultLink(0, 1).should('contain', SUBJECT_RESOURCE);
             YasrSteps.getResultLink(0, 2).should('contain', 'rdfs:subClassOf');
             YasrSteps.getResultLink(0, 3).should('contain', 'http://example.com/ontology#Metric');
             YasrSteps.getResultLink(0, 4).should('contain', CONTEXT_EXPLICIT);
@@ -196,7 +216,7 @@ describe('Resource view', () => {
             YasrSteps.getResults().should('have.length', 1);
             YasrSteps.getResultLink(0, 1).should('contain', 'http://example.com/resource/person/W6J1827/customerLoyalty');
             YasrSteps.getResultLink(0, 2).should('contain', 'rdf:type');
-            YasrSteps.getResultLink(0, 3).should('contain', SUBJECT_RESOURCE_SHORT_URI);
+            YasrSteps.getResultLink(0, 3).should('contain', SUBJECT_RESOURCE);
             YasrSteps.getResultLink(0, 4).should('contain', CONTEXT_EXPLICIT);
 
             // When I click on "context" tab.
@@ -211,14 +231,14 @@ describe('Resource view', () => {
             // Then I expect to see all triples of subject without mater of its role.
             YasrSteps.getResults().should('have.length', 2);
 
-            YasrSteps.getResultLink(0, 1).should('contain', SUBJECT_RESOURCE_SHORT_URI);
+            YasrSteps.getResultLink(0, 1).should('contain', SUBJECT_RESOURCE);
             YasrSteps.getResultLink(0, 2).should('contain', 'rdfs:subClassOf');
             YasrSteps.getResultLink(0, 3).should('contain', 'http://example.com/ontology#Metric');
             YasrSteps.getResultLink(0, 4).should('contain', CONTEXT_EXPLICIT);
 
             YasrSteps.getResultLink(1, 1).should('contain', 'http://example.com/resource/person/W6J1827/customerLoyalty');
             YasrSteps.getResultLink(1, 2).should('contain', 'rdf:type');
-            YasrSteps.getResultLink(1, 3).should('contain', SUBJECT_RESOURCE_SHORT_URI);
+            YasrSteps.getResultLink(1, 3).should('contain', SUBJECT_RESOURCE);
             YasrSteps.getResultLink(1, 4).should('contain', CONTEXT_EXPLICIT);
         });
 
@@ -364,7 +384,7 @@ describe('Resource view', () => {
     context('Download as', () => {
         it('should download as JSON-LD and then restore defaults', () => {
             // Given I am in the Resource view
-            ResourceSteps.visit(`uri=${SUBJECT_RESOURCE}&role=subject`);
+            ResourceSteps.visit(`uri=${SUBJECT_RESOURCE_ENCODED}&role=subject`);
             cy.window().then((win) => {
                 expect(win.jsonld).to.exist;
                 cy.stub(win.jsonld, 'compact').resolves({

package/e2e-legacy/sparql-editor/yasr/toolbar/visual-graph-button.spec.js

@@ -1,9 +1,9 @@
 import {SparqlEditorSteps} from '../../../../steps/sparql-editor-steps';
 import {YasqeSteps} from '../../../../steps/yasgui/yasqe-steps';
-import {YasrSteps} from '../../../../steps/yasgui/yasr-steps';
 import {QueryStubs} from '../../../../stubs/yasgui/query-stubs';
 import {GraphConfigStubs} from '../../../../stubs/graph-config-stubs.js';
 import {BrowserStubs} from '../../../../stubs/browser-stubs.js';
+import {VisualGraphSplitButtonSteps} from '../../../../steps/visual-graph-split-button-steps.js';
 
 describe('"Visualize" split button', () => {
     let repositoryId;
@@ -25,17 +25,17 @@ describe('"Visualize" split button', () => {
         // WHEN: I visit a page with 'ontotext-yasgui-web-component' on it, and execute select query.
         executeSelectQuery();
         // THEN: I expect the 'Visualize' button to not be visible.
-        YasrSteps.getVisualizeMainButton().should('not.be.visible');
+        VisualGraphSplitButtonSteps.getVisualizeMainButton().should('not.be.visible');
 
         // WHEN: I execute a CONSTRUCT query.
         executeConstructQuery();
         // THEN: I expect the 'Visualize' button to be visible.
-        YasrSteps.getVisualizeMainButton().should('be.visible');
+        VisualGraphSplitButtonSteps.getVisualizeMainButton().should('be.visible');
 
         // WHEN: I execute SELECT query again.
         executeSelectQuery();
         // THEN: I expect the 'Visualize' button to not be visible.
-        YasrSteps.getVisualizeMainButton().should('not.be.visible');
+        VisualGraphSplitButtonSteps.getVisualizeMainButton().should('not.be.visible');
     });
 
     it('should inform user that there no created graph configurations', () => {
@@ -45,13 +45,13 @@ describe('"Visualize" split button', () => {
         executeConstructQuery();
 
         // WHEN: I open the dropdown.
-        YasrSteps.toggleGraphConfigDropdown();
+        VisualGraphSplitButtonSteps.toggleGraphConfigDropdown();
         // THEN: I expect to see message that informs that there are no graph configurations.
-        YasrSteps.getNoConfigurationsMessage().should('contain.text', 'No advanced graph configuration.');
+        VisualGraphSplitButtonSteps.getNoConfigurationsMessage().should('contain.text', 'No advanced graph configuration.');
 
         // WHEN: I click on create link.
         BrowserStubs.stubWindowOpen();
-        YasrSteps.clickCreateGraphConfigLink();
+        VisualGraphSplitButtonSteps.clickCreateGraphConfigLink();
         // THEN: I expect to be navigated to graph configurations page.
         cy.get(BrowserStubs.WINDOW_OPEN_ALIAS()).should('have.been.calledWithMatch', 'graphs-visualizations', '_blank', 'noopener,noreferrer');
     });
@@ -61,7 +61,7 @@ describe('"Visualize" split button', () => {
         executeConstructQuery();
 
         // WHEN: I click on main button
-        YasrSteps.clickOnVisualizeMainButton();
+        VisualGraphSplitButtonSteps.clickOnVisualizeMainButton();
         // THEN: I expect to be navigated to graphs-visualizations view.
         cy.url().should('include', 'graphs-visualizations');
         cy.getQueryParam('query').should('include', 'PREFIX rdf: <http://www.w3.org/1999/02/22-rdf-syntax-ns#>PREFIX onto: <http://www.ontotext.com/>CONSTRUCT {?source rdf:type ?destination .} WHERE {?bag rdf:type ?source .?flight rdf:type ?destination}');
@@ -74,12 +74,12 @@ describe('"Visualize" split button', () => {
         GraphConfigStubs.stubGetGraphConfigs();
 
         // WHEN: I open the dropdown.
-        YasrSteps.toggleGraphConfigDropdown();
+        VisualGraphSplitButtonSteps.toggleGraphConfigDropdown();
         // THEN: I expect to see all graph configurations.
-        YasrSteps.getGraphConfigs().should('have.length', 3);
+        VisualGraphSplitButtonSteps.getGraphConfigs().should('have.length', 3);
 
         // WHEN: I select a graph configuration
-        YasrSteps.selectGraphConfig();
+        VisualGraphSplitButtonSteps.selectGraphConfig();
         // THEN: I expect to be navigated to graphs-visualizations view.
         cy.url().should('include', 'graphs-visualizations');
         cy.getQueryParam('query').should('include', 'PREFIX rdf: <http://www.w3.org/1999/02/22-rdf-syntax-ns#>PREFIX onto: <http://www.ontotext.com/>CONSTRUCT {?source rdf:type ?destination .} WHERE {?bag rdf:type ?source .?flight rdf:type ?destination}');

package/npm-shrinkwrap.json

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

package/package.json

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

package/steps/guides/movies-guide-steps.js

@@ -5,6 +5,7 @@ import {VisualGraphSteps} from "../visual-graph-steps";
 import {YasrSteps} from "../yasgui/yasr-steps";
 import {YasqeSteps} from "../yasgui/yasqe-steps";
 import {ResourceSteps} from "../resource/resource-steps";
+import {VisualGraphSplitButtonSteps} from '../visual-graph-split-button-steps.js';
 
 export class MoviesGuideSteps {
 
@@ -181,7 +182,7 @@ export class MoviesGuideSteps {
     static assertExploreRDFStep7() {
         GuideSteps.assertPageNotInteractive();
         GuideDialogSteps.assertDialogWithTitleIsVisible('Explore RDF as a table — 7/10');
-        ResourceSteps.getVisualGraphButton().should('be.visible');
+        VisualGraphSplitButtonSteps.getVisualizeMainButton().should('be.visible');
     }
 
     static assertExploreRDFStep8() {

package/steps/resource/resource-steps.js

@@ -61,14 +61,6 @@ export class ResourceSteps {
         cy.get('.download-options li').eq(option).click();
     }
 
-    static getVisualGraphButton() {
-        return cy.get('.visual-graph-btn');
-    }
-
-    static clickOnVisualGraphButton() {
-        ResourceSteps.getVisualGraphButton().click();
-    }
-
     static getEditResourceLink() {
         return cy.get('.edit-resource-link');
     }

package/steps/ttyg/ttyg-agent-settings-modal.steps.js

@@ -429,7 +429,7 @@ export class TtygAgentSettingsModalSteps extends ModalDialogSteps {
     }
 
     static enterContextSize(input) {
-        this.getContextSizeField().type(input);
+        this.getContextSizeField().type(input, {force: true});
     }
 
     static getContextSizeError() {

package/steps/visual-graph-split-button-steps.js

@@ -0,0 +1,45 @@
+export class VisualGraphSplitButtonSteps {
+    static getGraphExploreSplitButton() {
+        return cy.get('onto-graph-explore-split-button');
+    }
+
+    static getVisualizeMainButton() {
+        return VisualGraphSplitButtonSteps.getGraphExploreSplitButton().find('.explore-visual-graph-button');
+    }
+
+    static clickOnVisualizeMainButton() {
+        VisualGraphSplitButtonSteps.getVisualizeMainButton().click();
+    }
+
+    static getDropdownToggleButton() {
+        return VisualGraphSplitButtonSteps.getGraphExploreSplitButton().find('.onto-dropdown-button');
+    }
+
+    static toggleGraphConfigDropdown() {
+        VisualGraphSplitButtonSteps.getDropdownToggleButton().click();
+    }
+
+    static getGraphConfigs() {
+        return VisualGraphSplitButtonSteps.getGraphExploreSplitButton().find('.onto-dropdown-menu-item');
+    }
+
+    static getGraphConfig(index = 0) {
+        return VisualGraphSplitButtonSteps.getGraphConfigs().eq(index);
+    }
+
+    static selectGraphConfig(index = 0) {
+        VisualGraphSplitButtonSteps.getGraphConfig(index).click();
+    }
+
+    static getCreateGraphConfigLink() {
+        return VisualGraphSplitButtonSteps.getGraphExploreSplitButton().find('.graph-create-link');
+    }
+
+    static clickCreateGraphConfigLink() {
+        VisualGraphSplitButtonSteps.getCreateGraphConfigLink().click();
+    }
+
+    static getNoConfigurationsMessage() {
+        return VisualGraphSplitButtonSteps.getGraphExploreSplitButton().find('.no-configurations-message');
+    }
+}

package/steps/yasgui/yasr-steps.js

@@ -113,50 +113,6 @@ export class YasrSteps extends BaseSteps {
         return YasrSteps.getYasr().find('.yasr-toolbar');
     }
 
-    static getGraphExploreSplitButton() {
-        return YasrSteps.getYasrToolbar().find('.explore-visual-graph');
-    }
-
-    static getVisualizeMainButton() {
-        return YasrSteps.getGraphExploreSplitButton().find('.explore-visual-graph-button');
-    }
-
-    static clickOnVisualizeMainButton() {
-        YasrSteps.getVisualizeMainButton().click();
-    }
-
-    static getDropdownToggleButton() {
-        return YasrSteps.getGraphExploreSplitButton().find('.onto-dropdown-button');
-    }
-
-    static toggleGraphConfigDropdown() {
-        YasrSteps.getDropdownToggleButton().click();
-    }
-
-    static getGraphConfigs() {
-        return YasrSteps.getGraphExploreSplitButton().find('.onto-dropdown-menu-item');
-    }
-
-    static getGraphConfig(index = 0) {
-        return YasrSteps.getGraphConfigs().eq(index);
-    }
-
-    static selectGraphConfig(index = 0) {
-        YasrSteps.getGraphConfig(index).click();
-    }
-
-    static getCreateGraphConfigLink() {
-        return YasrSteps.getGraphExploreSplitButton().find('.graph-create-link');
-    }
-
-    static clickCreateGraphConfigLink() {
-        YasrSteps.getCreateGraphConfigLink().click();
-    }
-
-    static getNoConfigurationsMessage() {
-        return YasrSteps.getGraphExploreSplitButton().find('.no-configurations-message');
-    }
-
     static getNoDataElement() {
         return cy.get('.dataTables_empty');
     }