graphdb-workbench-tests 4.0.0-TR13 → 4.0.0-TR14

package/e2e-legacy/graph-navigator/graph-navigator.spec.js

@@ -64,6 +64,18 @@ describe('Graph Navigator', () => {
         GraphNavigatorSteps.getElement(SEED_RESOURCE_LABEL).should('exist');
     });
 
+    it('should show an error toast, when a graph request fails', () => {
+        // Given the repository's SPARQL requests fail.
+        cy.intercept('POST', `/repositories/${repositoryId}`, {statusCode: 500}).as('graphRequest');
+
+        // When I open the Graph Navigator view with a start resource.
+        GraphNavigatorSteps.visit(SEED_RESOURCE_ENCODED);
+        cy.wait('@graphRequest');
+
+        // Then I expect an error toast about the graph data.
+        ToasterSteps.getToasterMessage().should('contain', 'Could not load the graph data.');
+    });
+
     it('should seed the canvas with the graph computed from a CONSTRUCT query', () => {
         // Given I open the Graph Navigator view with a CONSTRUCT query, as sent from the SPARQL editor.
         GraphNavigatorSteps.visitWithQuery(CONSTRUCT_QUERY);

package/e2e-legacy/repository/ontop-repository.spec.js

@@ -287,7 +287,7 @@ describe('Ontop repositories', () => {
 
             // WHEN: I log in as a user with maintenance permission
             cy.loginAs(REPOSITORY_MAINTAINER_USERNAME, PASSWORD);
-            RepositorySteps.visit(false);
+            RepositorySteps.visit();
 
             // THEN: The repository is visible because the user can maintain it
             RepositorySteps.getRepositoryFromList(repositoryId).should('exist');
@@ -312,7 +312,7 @@ describe('Ontop repositories', () => {
             ModalDialogSteps.clickOnConfirmButton();
 
             // THEN: The changes are persisted
-            RepositorySteps.visit(false);
+            RepositorySteps.visit();
             RepositorySteps.getRepositoryFromList(repositoryId).should('exist');
             RepositorySteps.editRepository(repositoryId);
             cy.wait('@getJDBCProperties');
@@ -348,7 +348,7 @@ describe('Ontop repositories', () => {
             ModalDialogSteps.clickOnConfirmButton();
 
             // THEN: The OBDA file changes are persisted
-            RepositorySteps.visit(false);
+            RepositorySteps.visit();
             RepositorySteps.getRepositoryFromList(repositoryId).should('exist');
             RepositorySteps.editRepository(repositoryId);
             cy.wait('@getJDBCProperties');

package/e2e-legacy/setup/connectors/connectors-initial-state-with-selected-repository.spec.js

@@ -2,7 +2,7 @@ import {ConnectorsSteps} from "../../../steps/setup/connectors-steps";
 import HomeSteps from "../../../steps/home-steps";
 import {MainMenuSteps} from "../../../steps/main-menu-steps";
 
-const expectedButtons = ['elasticsearch', 'opensearch', 'solr', 'lucene', 'kafka', 'chatgpt-retrieval'];
+const expectedButtons = ['elasticsearch', 'opensearch', 'lucene', 'kafka', 'chatgpt-retrieval'];
 
 function verifyConnectorsPage() {
     expectedButtons.forEach(buttonId => {

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

@@ -18,7 +18,7 @@ describe('User and Access', () => {
     const DEFAULT_ADMIN_PASSWORD = 'root';
 
     context('User and access management', () => {
-        const user = 'user';
+        const user = 'user' + Date.now();
         let repoName;
 
         before(() => {
@@ -428,7 +428,7 @@ describe('User and Access', () => {
         let repositoryId1;
         let repositoryId2;
         let repositoryId3;
-        const graphqlUser = 'graphqlUser';
+        const graphqlUser = 'graphqlUser' + Date.now();
 
         beforeEach(() => {
             RepositoriesStubs.spyGetRepositories();
@@ -649,7 +649,7 @@ describe('User and Access', () => {
         let writeRepositoryId;
         let graphQLOnlyRepositoryId;
         let maintainedRepositoryId;
-        const maintainerUser = 'maintainerUser';
+        const maintainerUser = 'maintainerUser' + Date.now();
 
         beforeEach(() => {
             RepositoriesStubs.spyGetRepositories();
@@ -705,7 +705,7 @@ describe('User and Access', () => {
             // Wait for the login to complete, otherwise visiting another page aborts it.
             cy.url().should('not.include', '/login');
             // And navigate to the repository list view.
-            RepositorySteps.visit(false);
+            RepositorySteps.visit();
 
             // Then I should see all repositories for which the user has at least read permission.
             RepositorySteps.getRepositories().should('have.length', 4);
@@ -766,7 +766,7 @@ describe('User and Access', () => {
             LoginSteps.loginWithUser(maintainerUser, PASSWORD);
             // Wait for the login to complete, otherwise visiting another page aborts it.
             cy.url().should('not.include', '/login');
-            RepositorySteps.visit(false);
+            RepositorySteps.visit();
 
             // When the user opens the edit page of the repository they can maintain.
             RepositorySteps.getEditRepositoryButton(maintainedRepositoryId).should('be.visible');

package/e2e-legacy/ttyg/chat-list.spec.js

@@ -230,7 +230,7 @@ describe('TTYG chat list', () => {
         HomeSteps.visit();
         cy.wait('@get-chat');
         // and came back to the ttyg page
-        TTYGViewSteps.visit(false);
+        TTYGViewSteps.visit();
 
         // Then I expect to last used chat be selected.
         TTYGViewSteps.getChatFromGroup(0, 2).should('have.class', 'selected');

package/e2e-legacy/ttyg/create-chat.spec.js

@@ -61,7 +61,7 @@ describe('TTYG create chat', () => {
         // and returns to the TTYG page
         TTYGStubs.stubChatsListGet("/ttyg/chats/create/get-chats-after-create.json");
         TTYGStubs.stubAgentGet();
-        TTYGViewSteps.visit(false);
+        TTYGViewSteps.visit();
         cy.wait('@get-chat-list');
         // Then I expect newly created chat be selected.
         TTYGViewSteps.getChatFromGroup(0, 0).should('contain', 'New chat of Han Solo is a character');

package/fixtures/connectors/get-connectors.json

@@ -1,7 +1,6 @@
 {
     "Elasticsearch": "http://www.ontotext.com/connectors/elasticsearch#",
     "OpenSearch": "http://www.ontotext.com/connectors/opensearch#",
-    "Solr": "http://www.ontotext.com/connectors/solr#",
     "Lucene": "http://www.ontotext.com/connectors/lucene#",
     "Kafka": "http://www.ontotext.com/connectors/kafka#",
     "ChatGPT Retrieval": "http://www.ontotext.com/connectors/retrieval#"

package/npm-shrinkwrap.json

@@ -1,12 +1,12 @@
 {
   "name": "graphdb-workbench-tests",
-  "version": "4.0.0-TR13",
+  "version": "4.0.0-TR14",
   "lockfileVersion": 3,
   "requires": true,
   "packages": {
     "": {
       "name": "graphdb-workbench-tests",
-      "version": "4.0.0-TR13",
+      "version": "4.0.0-TR14",
       "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-TR13",
+  "version": "4.0.0-TR14",
   "description": "Cypress tests for GraphDB workbench",
   "type": "module",
   "scripts": {

package/steps/repository-steps.js

@@ -3,17 +3,14 @@ import {BaseSteps} from "./base-steps.js";
 
 export class RepositorySteps extends BaseSteps {
 
-    static visit(waitPageLoaded = true) {
+    static visit() {
         cy.intercept('/rest/locations').as('getLocations');
         cy.intercept(REPOSITORIES_URL + '/all').as('getRepositories');
         cy.visit('/repository');
-        if (waitPageLoaded) {
-            RepositorySteps.waitLoader();
-        }
+        RepositorySteps.waitUntilRepositoriesPageIsLoaded();
+        // Consumes the initial locations request, so a later cy.wait('@getLocations') in a test matches the next one.
+        // It must stay after the page-loaded check, which has a longer timeout than cy.wait for the request to start.
         cy.wait('@getLocations');
-        if (waitPageLoaded) {
-            RepositorySteps.waitUntilRepositoriesPageIsLoaded();
-        }
     }
 
     static visitEditPage(repositoryId) {
@@ -36,9 +33,12 @@ export class RepositorySteps extends BaseSteps {
         return cy.get('#wb-repositories-addRepositoryLink');
     }
 
+    // The page loader is hidden once the locations are loaded, regardless of the user's role.
     static waitUntilRepositoriesPageIsLoaded() {
-        RepositorySteps.getRepositoriesDropdown().should('not.be.disabled');
-        RepositorySteps.getCreateRepositoryButton().should('be.visible').and('not.be.disabled');
+        RepositorySteps.getRepositoriesPage()
+            .should('be.visible')
+            .find('.ot-loader-new-content')
+            .should('not.be.visible');
     }
 
     static getRepositoriesDropdown() {

package/steps/ttyg/ttyg-view-steps.js

@@ -1,21 +1,8 @@
 import {BaseSteps} from "../base-steps";
-import {DeprecationSteps} from '../deprecation-banner/deprecation-banner-steps.js';
 
 export class TTYGViewSteps extends BaseSteps {
-    /**
-     * Visits the TTYG page and closes the Solr deprecation banner by default.
-     *
-     * @param {boolean} closeSolrBanner Whether to close the banner. Set to `false`
-     * when revisiting the page after the banner has already been closed.
-     */
-    static visit(closeSolrBanner = true) {
+    static visit() {
         cy.visit('/ttyg');
-        // Temporary workaround until the Solr deprecation banner is removed.
-        // The banner changes the page layout, causing tests to fail randomly.
-        // This quick fix prevents GraphDB build failures and should be deleted together with the banner.
-        if (closeSolrBanner) {
-            DeprecationSteps.closeBanner();
-        }
     }
 
     static getTtygView() {

package/stubs/license-stubs.js

@@ -50,7 +50,6 @@ export class LicenseStubs {
                 "productType": "enterprise",
                 "licenseCapabilities": [
                     "Lucene connector",
-                    "Solr connector",
                     "Elasticsearch connector",
                     "OpenSearch connector",
                     "Kafka connector",
@@ -114,7 +113,6 @@ export class LicenseStubs {
                 "OpenSearch connector",
                 "Lucene connector",
                 "Kafka connector",
-                "Solr connector",
                 "Cluster",
                 "Elasticsearch connector"
             ],
@@ -140,7 +138,6 @@ export class LicenseStubs {
                 "OpenSearch connector",
                 "Lucene connector",
                 "Kafka connector",
-                "Solr connector",
                 "Cluster",
                 "Elasticsearch connector"
             ],

package/e2e-legacy/home/solr-banner/solr-banner.spec.js

@@ -1,137 +0,0 @@
-import HomeSteps from '../../../steps/home-steps.js';
-import {DeprecationSteps} from '../../../steps/deprecation-steps.js';
-import {LoginSteps} from '../../../steps/login-steps.js';
-import {GuidesStubs} from '../../../stubs/guides/guides-stubs.js';
-import {GuideSteps} from '../../../steps/guides/guide-steps.js';
-import {GuideDialogSteps} from '../../../steps/guides/guide-dialog-steps.js';
-
-describe('Solr deprecation banner', () => {
-    context('Security disabled', () => {
-        it('should keep the Solr deprecation banner hidden after the anonymous user dismisses it', () => {
-            // GIVEN: I have opened the application with security disabled.
-            HomeSteps.visit();
-
-            // THEN: I expect the Solr deprecation banner to be visible.
-            DeprecationSteps.getDeprecationBanner()
-                .should('be.visible')
-                .should('contain.text', 'The Solr connector is deprecated and will be removed in GraphDB 12');
-
-            // WHEN: I dismiss the Solr deprecation banner.
-            DeprecationSteps.closeBanner();
-            // THEN: I expect the Solr deprecation banner to be hidden.
-            DeprecationSteps.getDeprecationBanner().should('not.exist');
-
-            // WHEN: I reload the application.
-            HomeSteps.visit();
-            // THEN: I expect the Solr deprecation banner to remain hidden.
-            DeprecationSteps.getDeprecationBanner().should('not.exist');
-        });
-    });
-
-    context('Security enabled', () => {
-        const PASSWORD = 'root';
-        const USER_USERNAME = 'username';
-
-        beforeEach(() => {
-            cy.createUser({
-                username: USER_USERNAME,
-                password: PASSWORD
-            });
-
-            cy.switchOnSecurity()
-                .then(() => cy.loginAsAdmin())
-                .then(() => cy.switchOnFreeAccess(true));
-        });
-
-        afterEach(() => {
-            cy.loginAsAdmin()
-                .then(() => {
-                    cy.deleteUser(USER_USERNAME, true);
-                    cy.switchOffFreeAccess(true);
-                    cy.switchOffSecurity(true);
-                });
-        });
-
-        it('should persist separate Solr banner states for anonymous and logged-in users', () => {
-            // GIVEN: Security and free access are enabled, and no user is logged in.
-            HomeSteps.visit();
-
-            // THEN: I expect the Solr deprecation banner to be visible for the anonymous user.
-            DeprecationSteps.getDeprecationBanner()
-                .should('be.visible')
-                .should('contain.text', 'The Solr connector is deprecated and will be removed in GraphDB 12');
-
-            // WHEN: The anonymous user dismisses the banner.
-            DeprecationSteps.closeBanner();
-            // THEN: I expect the banner to be hidden for the anonymous user.
-            DeprecationSteps.getDeprecationBanner().should('not.exist');
-
-            // WHEN: I log in as a user who has not dismissed the banner.
-            cy.loginAs(USER_USERNAME, PASSWORD);
-            HomeSteps.visit();
-
-            // THEN: I expect the banner to be visible for the logged-in user.
-            DeprecationSteps.getDeprecationBanner()
-                .should('be.visible')
-                .should('contain.text', 'The Solr connector is deprecated and will be removed in GraphDB 12');
-
-            // WHEN: The logged-in user dismisses the banner.
-            DeprecationSteps.closeBanner();
-            // THEN: I expect the banner to be hidden for the logged-in user.
-            DeprecationSteps.getDeprecationBanner().should('not.exist');
-
-            // WHEN: The user logs out.
-            LoginSteps.logout();
-            // THEN: I expect the banner to remain hidden because the anonymous user has already dismissed it.
-            DeprecationSteps.getDeprecationBanner().should('not.exist');
-
-            // WHEN: I log in as the administrator, who has not dismissed the banner.
-            cy.loginAs('admin', 'root');
-            HomeSteps.visit();
-            // THEN: I expect the banner to be visible for the administrator.
-            DeprecationSteps.getDeprecationBanner()
-                .should('be.visible')
-                .should('contain.text', 'The Solr connector is deprecated and will be removed in GraphDB 12');
-
-            // WHEN: The administrator logs out.
-            LoginSteps.logout();
-            // THEN: I expect the banner to remain hidden because the anonymous user has already dismissed it.
-            DeprecationSteps.getDeprecationBanner().should('not.exist');
-
-            // WHEN: I log in again as the user who previously dismissed the banner.
-            cy.loginAs(USER_USERNAME, PASSWORD);
-            HomeSteps.visit();
-            // THEN: I expect the banner to remain hidden for the logged-in user.
-            DeprecationSteps.getDeprecationBanner().should('not.exist');
-        });
-    });
-
-    context('User guides', () => {
-        it('should hide the Solr deprecation banner while a guide is running', () => {
-            // GIVEN: The guides are loaded and ready to be started.
-            GuidesStubs.stubMainMenuGuide();
-            GuideSteps.visit();
-            GuideSteps.verifyGuidesListExists();
-            cy.wait('@getGuides');
-
-            // WHEN: I am on an application page, and the Solr deprecation banner has not been dismissed by the current user.
-            // THEN: I expect the Solr deprecation banner to be visible because it has not been dismissed by the current user.
-            DeprecationSteps.getDeprecationBanner()
-                .should('be.visible')
-                .should('contain.text', 'The Solr connector is deprecated and will be removed in GraphDB 12');
-
-            // WHEN: I start a guide.
-            GuideSteps.runFirstGuide();
-            // THEN: I expect the Solr deprecation banner to be hidden while the guide is running.
-            DeprecationSteps.getDeprecationBanner().should('not.exist');
-
-            // WHEN: I cancel the guide.
-            GuideDialogSteps.clickOnCancelButton();
-            GuideDialogSteps.clickConfirmCancelDialogExitButton();
-            // THEN: I expect the Solr deprecation banner to be visible again.
-            DeprecationSteps.getDeprecationBanner()
-                .should('be.visible')
-                .should('contain.text', 'The Solr connector is deprecated and will be removed in GraphDB 12');
-        });
-    });
-});

package/steps/deprecation-banner/deprecation-banner-steps.js

@@ -1,13 +0,0 @@
-export class DeprecationSteps {
-    static getDeprecationBanner() {
-        return cy.get('onto-deprecation-banner');
-    }
-
-    static getCloseButton() {
-        return DeprecationSteps.getDeprecationBanner().find('.close-button');
-    }
-
-    static closeBanner() {
-        DeprecationSteps.getCloseButton().click();
-    }
-}

package/steps/deprecation-steps.js

@@ -1,13 +0,0 @@
-export class DeprecationSteps {
-  static getDeprecationBanner() {
-    return cy.get('onto-deprecation-banner');
-  }
-
-  static getCloseButton() {
-    return DeprecationSteps.getDeprecationBanner().find('.close-button');
-  }
-
-  static closeBanner() {
-    DeprecationSteps.getCloseButton().click();
-  }
-}