graphdb-workbench-tests 3.5.0-reactodia-resource-construct-TR1 → 3.5.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "graphdb-workbench-tests",
-  "version": "3.5.0-reactodia-resource-construct-TR1",
+  "version": "3.5.0",
   "description": "Cypress tests for GraphDB workbench",
   "type": "module",
   "scripts": {
@@ -10,10 +10,9 @@
     "cy:open-legacy": "cypress open  --config-file cypress-legacy.config.js",
     "cy:open-security": "cypress open  --config-file cypress-security.config.js",
     "cy:open-flaky": "cypress open --config-file cypress-flaky.config.js",
-    "cy:open-guides": "cypress open --config-file cypress-guides.config.js",
-    "cy:run-guides": "cypress run --config-file cypress-guides.config.js",
+    "cy:guides": "cypress run --config-file cypress-legacy.config.js --spec \"e2e-legacy/guides/**/*.spec.js\" --browser chrome",
     "cy:run": "npm run cy:run-legacy && cypress run",
-    "cy:run:partial": "cypress run --config-file cypress-legacy.config.js --spec \"e2e-legacy/**/jdbc-create.spec.js\" --browser chrome",
+    "cy:run:partial": "cypress run --config-file cypress-legacy.config.js --spec \"e2e-legacy/ttyg/**/*.spec.js\" --browser chrome",
     "cy:run-legacy": "cypress run --config-file cypress-legacy.config.js --browser chrome",
     "cy:run-security": "cypress run --config-file cypress-security.config.js --browser chrome",
     "cy:run-legacy:coverage": "cypress run --config-file cypress-legacy.config.js --browser chrome",
@@ -41,12 +40,12 @@
     "@eslint/js": "^9.33.0",
     "babel-loader": "^10.0.0",
     "babel-plugin-istanbul": "^7.0.0",
-    "cypress": "15.9.0",
+    "cypress": "^15.19.0",
     "cypress-failed-log": "^2.10.0",
     "cypress-file-upload": "^5.0.8",
     "cypress-localstorage-commands": "^2.2.7",
     "cypress-multi-reporters": "^2.0.5",
-    "cypress-real-events": "^1.14.0",
+    "cypress-real-events": "^1.15.0",
     "cypress-terminal-report": "^7.2.0",
     "cypress-wait-until": "^3.0.2",
     "del": "^8.0.0",

package/steps/application-steps.js

@@ -28,7 +28,7 @@ export class ApplicationSteps {
         cy.get('onto-navbar .menu-element').eq(0).click();
     }
 
-    static geLoader() {
+    static getLoader() {
         return cy.get('.ot-loader-new-content');
     }
 

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

@@ -0,0 +1,13 @@
+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

@@ -0,0 +1,13 @@
+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/main-menu-steps.js

@@ -53,7 +53,11 @@ export class MainMenuSteps {
 
     static clickOnMenu(menuName) {
         // Forced it because some element as "Explore" for example has CSS pointer-events: none
-        MainMenuSteps.getMenuButton(menuName).click({force: true});
+        MainMenuSteps.getMenuButton(menuName).realClick();
+    }
+
+    static getSubmenuFor(menuName) {
+        return MainMenuSteps.getMainMenu().contains('.menu-element', menuName).find('.sub-menu');
     }
 
     static clickOnSubmenuTriggerElement(menuName) {

package/steps/ontop-repository-steps.js

@@ -9,10 +9,22 @@ export class OntopRepositorySteps {
         return cy.get('div').contains("OBDA or R2RML file *").parent();
     }
 
+    static getPage() {
+        return cy.get('#wb-repository');
+    }
+
     static getOBDAUploadButton() {
         return cy.get('span[for="obdaFile"]').contains("Upload file...");
     }
 
+    static getOBDAFileFieldEditButton() {
+        return OntopRepositorySteps.getOBDAFileField().find('.ot-edit-input');
+    }
+
+    static editOBDAFile() {
+        OntopRepositorySteps.getOBDAFileFieldEditButton().click();
+    }
+
     static getOntologyFileField() {
         return cy.get('div').contains("Ontology file");
     }
@@ -119,9 +131,17 @@ export class OntopRepositorySteps {
         OntopRepositorySteps.getOBDAUploadButton().click();
     }
 
+    static getAdditionalJDBCProperties() {
+        return OntopRepositorySteps.getPage().find('.additional-jdbc-properties');
+    }
+
     static uploadObdaFile(file) {
         // The label for the input has visibility: hidden, so force must be used
         // eq() index 0 for location of OBDA field input
         cy.get('input[type=file]').eq(0).selectFile(file, {force: true});
     }
+
+    static getOntopSaveButton() {
+        return  cy.get('#addEditOntopRepository');
+    }
 }

package/steps/repository-steps.js

@@ -3,13 +3,17 @@ import {BaseSteps} from "./base-steps.js";
 
 export class RepositorySteps extends BaseSteps {
 
-    static visit() {
+    static visit(waitPageLoaded = true) {
         cy.intercept('/rest/locations').as('getLocations');
         cy.intercept(REPOSITORIES_URL + '/all').as('getRepositories');
         cy.visit('/repository');
-        RepositorySteps.waitLoader();
+        if (waitPageLoaded) {
+            RepositorySteps.waitLoader();
+        }
         cy.wait('@getLocations');
-        RepositorySteps.waitUntilRepositoriesPageIsLoaded();
+        if (waitPageLoaded) {
+            RepositorySteps.waitUntilRepositoriesPageIsLoaded();
+        }
     }
 
     static visitEditPage(repositoryId) {
@@ -62,6 +66,11 @@ export class RepositorySteps extends BaseSteps {
         return this.getRepositoriesList().find('.repository.active');
     }
 
+    static getRepositories() {
+        return RepositorySteps.getRepositoriesList()
+            .find('.repository');
+    }
+
     static getRepositoryFromList(repository) {
         RepositorySteps.waitLoader();
         return RepositorySteps.getRepositoriesList()
@@ -105,6 +114,38 @@ export class RepositorySteps extends BaseSteps {
             .click();
     }
 
+    static getRepositoryActions(repositoryId) {
+        return  RepositorySteps.getRepositoryFromList(repositoryId).find('.repository-actions');
+    }
+
+    static getCopyRepositoryButton(repositoryId) {
+        return RepositorySteps.getRepositoryActions(repositoryId).find('.copy-repository-btn');
+    }
+
+    static getEditRepositoryButton(repositoryId) {
+        return RepositorySteps.getRepositoryActions(repositoryId).find('.edit-repository-btn');
+    }
+
+    static getDownloadRepositoryConfigurationButton(repositoryId) {
+        return RepositorySteps.getRepositoryActions(repositoryId).find('.download-repository-config-btn');
+    }
+
+    static getRestartRepositoryButton(repositoryId) {
+        return RepositorySteps.getRepositoryActions(repositoryId).find('.restart-repository-btn');
+    }
+
+    static getDeleteRepositoryButton(repositoryId) {
+        return RepositorySteps.getRepositoryActions(repositoryId).find('.delete-repository-btn');
+    }
+
+    static getSetDefaultRepositoryButton(repositoryId) {
+        return RepositorySteps.getRepositoryActions(repositoryId).find('.pin-repository-btn');
+    }
+
+    static getPageButtons() {
+        return RepositorySteps.getRepositoriesPage().find('.btns-all');
+    }
+
     static editRepository(repositoryId) {
         RepositorySteps.clickRepositoryIcon(repositoryId, '.repository-actions .edit-repository-btn');
     }

package/steps/resource/resource-steps.js

@@ -147,12 +147,4 @@ export class ResourceSteps {
     static getDataTable() {
         return cy.get('.dataTable');
     }
-
-    static getVisualizeReactodiaButton() {
-        return cy.getByTestId('visualize-reactodia-button');
-    }
-
-    static clickOnVisualizeReactodiaButton() {
-        ResourceSteps.getVisualizeReactodiaButton().click();
-    }
 }

package/steps/setup/settings-steps.js

@@ -7,7 +7,7 @@ export class SettingsSteps {
 
     static visitInProdMode() {
         cy.visit('/settings', {
-            onBeforeLoad: (win) => {
+            onBeforeLoad: () => {
                 EnvironmentStubs.stubWbProdMode();
             }
         });
@@ -15,7 +15,7 @@ export class SettingsSteps {
 
     static visitInDevMode() {
         cy.visit('/settings', {
-            onBeforeLoad: (win) => {
+            onBeforeLoad: () => {
                 EnvironmentStubs.stubWbDevMode();
             }
         });
@@ -71,7 +71,7 @@ export class SettingsSteps {
     }
 
     static getUserRolePanel() {
-        return this.getSettingsPage().find('.user-role');
+        return this.getSettingsPage().find('.user-roles');
     }
 
     static getUserRoleRadioButton() {

package/steps/setup/user-and-access-steps.js

@@ -169,8 +169,12 @@ export class UserAndAccessSteps {
         return cy.get('#user-repos');
     }
 
-    static clickWriteAccess() {
-        cy.get('.write').click();
+    static getRepositoryRightsLine(repoName) {
+        if (repoName === '*') {
+            return this.getRepositoryRightsList().find('.any-repo');
+        } else {
+            return this.getRepositoryRightsList().contains(repoName).parent('tr');
+        }
     }
 
     static getCustomRoleFieldError() {
@@ -186,7 +190,7 @@ export class UserAndAccessSteps {
     }
 
     static getRepositoryRightsError() {
-        return cy.get('#user-repos [ng-show="repositoryCheckError"].form-control-feedback');
+        return this.getRepositoryRightsList().find('[ng-show="repositoryCheckError"].form-control-feedback');
     }
 
     static getError() {
@@ -231,23 +235,21 @@ export class UserAndAccessSteps {
 
     static clickGraphqlAccessAny() {
         cy.get('#user-repos')
-            .contains('Any data repository')
+            .contains('Global (any data repository)')
             .parent('tr')
             .find('.graphql')
             .realClick();
     }
 
     static clickGraphqlAccessRepo(repoName) {
-        cy.get('#user-repos')
-            .contains(repoName)
-            .parent('tr')
+        this.getRepositoryRightsLine(repoName)
             .find('.graphql')
             .realClick();
     }
 
     static clickReadAccessAny() {
         cy.get('#user-repos')
-            .contains('Any data repository')
+            .contains('Global (any data repository)')
             .parent('tr')
             .find('.read')
             .realClick();
@@ -263,7 +265,7 @@ export class UserAndAccessSteps {
 
     static clickWriteAccessAny() {
         cy.get('#user-repos')
-            .contains('Any data repository')
+            .contains('Global (any data repository)')
             .parent('tr')
             .find('.write')
             .realClick();
@@ -289,7 +291,7 @@ export class UserAndAccessSteps {
 
     static getRepoLine(userRowAlias, matchText) {
         return cy.get(userRowAlias)
-            .find('.repository-rights > div')
+            .find('.repository-rights-list')
             .filter(`:contains("${matchText}")`)
     }
 
@@ -301,6 +303,10 @@ export class UserAndAccessSteps {
         return cy.get(repoLineAlias).find('.ri-edit-line');
     }
 
+    static findMaintainIconAlias(repoLineAlias) {
+        return cy.get(repoLineAlias).find('.ri-folder-settings-line');
+    }
+
     static findGraphqlIconAlias(repoLineAlias) {
         return cy.get(repoLineAlias).find('.icon-graphql');
     }
@@ -308,38 +314,98 @@ export class UserAndAccessSteps {
     static openEditUserPage(username) {
         this.findUserInTable(username); // sets @user
         cy.get('@user').find('.edit-user-btn').click();
+        cy.url().should('include', `/user/${username}`);
+        UserAndAccessSteps.getUsernameField().should('be.visible');
     }
 
     static confirmUserEdit() {
         cy.get('#wb-user-submit').click();
     }
 
+    static validateRightsForRepo(repoName, checkbox, expectedState) {
+        const {checked, disabled} = expectedState;
+        if (checked === true) {
+            checkbox.should('be.checked');
+        } else if (checked === false) {
+            checkbox.should('not.be.checked');
+        }
+        if (disabled === true) {
+            checkbox.should('be.disabled');
+        } else if (disabled === false) {
+            checkbox.should('not.be.disabled');
+        }
+    }
+
+    // ============= Read Access Toggles and Validations =============
+
     static getReadAccessForRepo(repoName) {
-        const matchText = (repoName === '*') ? 'Any data repository' : repoName;
+        const matchText = (repoName === '*') ? 'Global (any data repository)' : repoName;
         return cy.get('#user-repos')
             .contains(matchText)
             .parent('tr')
             .find('.read')
     }
 
+    static toggleReadAccessAny() {
+        UserAndAccessSteps.toggleReadAccessForRepo('*');
+    }
+
     static toggleReadAccessForRepo(repoName) {
         return this.getReadAccessForRepo(repoName).realClick();
     }
 
+    static validateReadAccessForRepo(repoName, expectedState) {
+        const readAccessCheckbox = this.getReadAccessForRepo(repoName);
+        this.validateRightsForRepo(repoName, readAccessCheckbox, expectedState);
+    }
+
+    // ============= Write Access Toggles and Validations =============
+
     static getWriteAccessForRepo(repoName) {
-        const matchText = (repoName === '*') ? 'Any data repository' : repoName;
+        const matchText = (repoName === '*') ? 'Global (any data repository)' : repoName;
         return cy.get('#user-repos')
             .contains(matchText)
             .parent('tr')
             .find('.write')
     }
 
+    static toggleWriteAccessAny() {
+        UserAndAccessSteps.toggleWriteAccessForRepo('*');
+    }
+
     static toggleWriteAccessForRepo(repoName) {
         return this.getWriteAccessForRepo(repoName).realClick();
     }
 
+    static validateWriteAccessForRepo(repoName, expectedState) {
+        const writeAccessCheckbox = this.getWriteAccessForRepo(repoName);
+        this.validateRightsForRepo(repoName, writeAccessCheckbox, expectedState);
+    }
+
+    // ============= Maintain Repository Access Toggles and Validations =============
+
+    static getMaintainAccessRepoCheckbox(repoName) {
+        return this.getRepositoryRightsLine(repoName)
+            .find('.maintain-repository');
+    }
+
+    static clickMaintainAccessRepo(repoName) {
+        UserAndAccessSteps.getMaintainAccessRepoCheckbox(repoName).realClick();
+    }
+
+    static toggleMaintainRepoForRepo(repoName) {
+        return this.clickMaintainAccessRepo(repoName);
+    }
+
+    static validateMaintainAccessForRepo(repoName, expectedState) {
+        const maintainAccessCheckbox = this.getMaintainAccessRepoCheckbox(repoName);
+        this.validateRightsForRepo(repoName, maintainAccessCheckbox, expectedState);
+    }
+
+    // ============= GraphQL Access Toggles and Validations =============
+
     static getGraphqlAccessForRepo(repoName) {
-        const matchText = (repoName === '*') ? 'Any data repository' : repoName;
+        const matchText = (repoName === '*') ? 'Global (any data repository)' : repoName;
         return cy.get('#user-repos')
             .contains(matchText)
             .parent('tr')
@@ -350,6 +416,11 @@ export class UserAndAccessSteps {
         return this.getGraphqlAccessForRepo(repoName).realClick();
     }
 
+    static validateGraphqlAccessForRepo(repoName, expectedState) {
+        const graphqlAccessCheckbox = this.getGraphqlAccessForRepo(repoName);
+        this.validateRightsForRepo(repoName, graphqlAccessCheckbox, expectedState);
+    }
+
     static clickMenuItem(label) {
         return cy.get('.main-menu').contains(label).click({force: true});
     }

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

@@ -1,8 +1,21 @@
 import {BaseSteps} from "../base-steps";
+import {DeprecationSteps} from '../deprecation-banner/deprecation-banner-steps.js';
 
 export class TTYGViewSteps extends BaseSteps {
-    static visit() {
+    /**
+     * 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) {
         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() {
@@ -243,6 +256,7 @@ export class TTYGViewSteps extends BaseSteps {
     }
 
     static getOpenAgentActionsButton(index) {
+        this.getAgent(index).scrollIntoView();
         return this.getAgent(index).realHover().find('.open-agent-actions-btn');
     }
 

package/stubs/repositories/repositories-stubs.js

@@ -247,4 +247,8 @@ export class RepositoriesStubs extends Stubs {
             }
         });
     }
+
+    static spyGetJDBCProperties() {
+        cy.intercept('GET', '/rest/repositories/ontop/jdbc-properties?**').as('getJDBCProperties');
+    }
 }

package/stubs/security-stubs.js

@@ -14,6 +14,10 @@ export class SecurityStubs {
         cy.intercept('POST', 'rest/security/users/*').as('create-user');
     }
 
+    static spyOnUserGet() {
+        cy.intercept('GET', 'rest/security/users/*').as('get-user');
+    }
+
     static stubInferAndSameAsDefaults() {
         cy.intercept('rest/security/all', (req) => {
             req.reply(SecurityStubs.getResponseSecurityEnabled());

package/support/security-command.js

@@ -29,6 +29,30 @@ Cypress.Commands.add('loginAsAdmin', () => {
     });
 });
 
+Cypress.Commands.add('loginAs', (username, password) => {
+    return cy.request({
+        method: 'POST',
+        url: '/rest/login',
+        body: {
+            username,
+            password,
+        },
+        headers: {
+            'Content-Type': 'application/json',
+        },
+        failOnStatusCode: true,
+    }).then((response) => {
+        const authHeader = response.headers['authorization'];
+        const token = Array.isArray(authHeader)
+            ? authHeader[0]
+            : authHeader;
+        cy.window().then((win) => {
+            win.localStorage.setItem('ontotext.gdb.auth.jwt', token);
+            win.localStorage.setItem('ontotext.gdb.auth.authenticated', 'true');
+        });
+    });
+});
+
 Cypress.Commands.add('switchOffSecurity', (secured = false) => {
     let headers = {'Content-Type': 'application/json'};
     if (secured) {
@@ -64,3 +88,22 @@ Cypress.Commands.add('switchOffFreeAccess', (secured = false) => {
         failOnStatusCode: true,
     });
 });
+
+Cypress.Commands.add('switchOnFreeAccess', (secured = false) => {
+    let headers = {'Content-Type': 'application/json'};
+    if (secured) {
+        const authHeader = Cypress.env('adminToken');
+        headers = {...headers,
+            'Authorization': authHeader
+        }
+    }
+    return cy.request({
+        method: 'POST',
+        url: '/rest/security/free-access',
+        body: {
+            'enabled': true
+        },
+        headers,
+        failOnStatusCode: false,
+    });
+});

package/cypress-guides.config.js

@@ -1,45 +0,0 @@
-import { defineConfig } from 'cypress';
-import setupPlugins from './plugins/index.js';
-
-const isCoverage = process.env.COVERAGE === 'true';
-
-const loadCodeCoverage = async (on, config) => {
-    const mod = await import('@bahmutov/cypress-code-coverage/plugin');
-    const plugin = ('default' in mod) ? mod.default : mod;
-    plugin(on, config);
-};
-
-export default defineConfig({
-    projectId: 'v35btb',
-    fixturesFolder: 'fixtures',
-    screenshotsFolder: 'report/screenshots',
-    videosFolder: 'report/videos',
-    video: true,
-    defaultCommandTimeout: 25000,
-    numTestsKeptInMemory: 10,
-    viewportWidth: 1600,
-    viewportHeight: 1200,
-    e2e: {
-        retries: {
-            runMode: 2,
-            openMode: 0
-        },
-        async setupNodeEvents(on, config) {
-            setupPlugins(on, config);
-            if (isCoverage) {
-                await loadCodeCoverage(on, config);
-            }
-            return config;
-        },
-        baseUrl: 'http://localhost:9000',
-        specPattern: 'e2e-legacy/guides/**/*.{js,jsx,ts,tsx}',
-        supportFile: 'support/e2e.js',
-        reporter: "cypress-multi-reporters",
-        reporterOptions: {
-            configFile: 'cypress-reporter-config.json'
-        }
-    },
-    env: {
-        set_default_user_data: true
-    }
-});