graphdb-workbench-tests 3.5.0-TR2 → 3.5.0-TR3

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

@@ -38,8 +38,8 @@ describe('User Management – Creation, Validation, Permissions & Deletion', ()
         it('should show error when username is empty', () => {
             UserAndAccessSteps.typePassword(testPassword);
             UserAndAccessSteps.typeConfirmPasswordField(testPassword);
-            UserAndAccessSteps.clickReadAccessRepo(repositoryId);
-            UserAndAccessSteps.clickWriteAccessRepo(repositoryId);
+            UserAndAccessSteps.toggleReadAccessForRepo(repositoryId);
+            UserAndAccessSteps.toggleWriteAccessForRepo(repositoryId);
             UserAndAccessSteps.confirmUserCreate();
             UserAndAccessSteps.getUserFieldError('username').should('be.visible').and('contain.text', 'Enter username!');
         });
@@ -55,8 +55,8 @@ describe('User Management – Creation, Validation, Permissions & Deletion', ()
             UserAndAccessSteps.typeUsername(testUsername);
             UserAndAccessSteps.typePassword(testPassword);
             UserAndAccessSteps.typeConfirmPasswordField('Different123!');
-            UserAndAccessSteps.clickReadAccessRepo(repositoryId);
-            UserAndAccessSteps.clickWriteAccessRepo(repositoryId);
+            UserAndAccessSteps.toggleReadAccessForRepo(repositoryId);
+            UserAndAccessSteps.toggleWriteAccessForRepo(repositoryId);
             UserAndAccessSteps.confirmUserCreate();
             UserAndAccessSteps.getUserFieldError('confirmPassword').should('be.visible').and('contain.text', 'Confirm password!');
         });
@@ -65,8 +65,8 @@ describe('User Management – Creation, Validation, Permissions & Deletion', ()
             UserAndAccessSteps.typeUsername('user');
             UserAndAccessSteps.typePassword(testPassword);
             UserAndAccessSteps.typeConfirmPasswordField(testPassword);
-            UserAndAccessSteps.clickReadAccessRepo(repositoryId);
-            UserAndAccessSteps.clickWriteAccessRepo(repositoryId);
+            UserAndAccessSteps.toggleReadAccessForRepo(repositoryId);
+            UserAndAccessSteps.toggleWriteAccessForRepo(repositoryId);
             UserAndAccessSteps.confirmUserCreate();
 
             cy.url().should('include', '/users');
@@ -74,7 +74,7 @@ describe('User Management – Creation, Validation, Permissions & Deletion', ()
             UserAndAccessSteps.typeUsername('user');
             UserAndAccessSteps.typePassword(testPassword);
             UserAndAccessSteps.typeConfirmPasswordField(testPassword);
-            UserAndAccessSteps.clickWriteAccessRepo(repositoryId);
+            UserAndAccessSteps.toggleWriteAccessForRepo(repositoryId);
             UserAndAccessSteps.confirmUserCreate();
 
             // Using the toaster from the shared components which has different class names
@@ -96,8 +96,8 @@ describe('User Management – Creation, Validation, Permissions & Deletion', ()
             UserAndAccessSteps.typePassword(testPassword);
             UserAndAccessSteps.typeConfirmPasswordField(testPassword);
             UserAndAccessSteps.addTextToCustomRoleField('a');
-            UserAndAccessSteps.clickReadAccessRepo(repositoryId);
-            UserAndAccessSteps.clickWriteAccessRepo(repositoryId);
+            UserAndAccessSteps.toggleReadAccessForRepo(repositoryId);
+            UserAndAccessSteps.toggleWriteAccessForRepo(repositoryId);
             UserAndAccessSteps.getCustomRoleFieldError().should('be.visible').and('contain.text', 'Must be at least 2 symbols long');
         });
     });
@@ -116,9 +116,9 @@ describe('User Management – Creation, Validation, Permissions & Deletion', ()
             UserAndAccessSteps.typeUsername(rwUsername);
             UserAndAccessSteps.typePassword(testPassword);
             UserAndAccessSteps.typeConfirmPasswordField(testPassword);
-            UserAndAccessSteps.clickReadAccessRepo(repositoryId);
-            UserAndAccessSteps.clickWriteAccessRepo(repositoryId);
-            UserAndAccessSteps.getWriteAccessForRepo(repositoryId).should('be.checked');
+            UserAndAccessSteps.toggleReadAccessForRepo(repositoryId);
+            UserAndAccessSteps.toggleWriteAccessForRepo(repositoryId);
+            UserAndAccessSteps.validateWriteAccessForRepo(repositoryId, {checked: true});
             UserAndAccessSteps.confirmUserCreate();
             UserAndAccessSteps.toggleSecurity();
 
@@ -159,9 +159,9 @@ describe('User Management – Creation, Validation, Permissions & Deletion', ()
             UserAndAccessSteps.typeUsername(roUsername);
             UserAndAccessSteps.typePassword(testPassword);
             UserAndAccessSteps.typeConfirmPasswordField(testPassword);
-            UserAndAccessSteps.clickReadAccessRepo(repositoryId);
-            UserAndAccessSteps.getReadAccessForRepo(repositoryId).should('be.checked');
-            UserAndAccessSteps.getWriteAccessForRepo(repositoryId).should('not.be.checked');
+            UserAndAccessSteps.toggleReadAccessForRepo(repositoryId);
+            UserAndAccessSteps.validateReadAccessForRepo(repositoryId, {checked: true});
+            UserAndAccessSteps.validateWriteAccessForRepo(repositoryId, {checked: false});
             UserAndAccessSteps.confirmUserCreate();
             UserAndAccessSteps.toggleSecurity();
 

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

@@ -51,7 +51,7 @@ describe('GraphQL-only User – Playground Access & Mutation Restriction', () =>
         UserAndAccessSteps.typeUsername(gqlUsername);
         UserAndAccessSteps.typePassword(testPassword);
         UserAndAccessSteps.typeConfirmPasswordField(testPassword);
-        UserAndAccessSteps.clickReadAccessRepo(repositoryId);
+        UserAndAccessSteps.toggleReadAccessForRepo(repositoryId);
         UserAndAccessSteps.clickGraphqlAccessRepo(repositoryId);
         UserAndAccessSteps.confirmUserCreate();
 
@@ -88,8 +88,8 @@ describe('GraphQL-only User – Playground Access & Mutation Restriction', () =>
         UserAndAccessSteps.typeUsername(gqlUsername);
         UserAndAccessSteps.typePassword(testPassword);
         UserAndAccessSteps.typeConfirmPasswordField(testPassword);
-        UserAndAccessSteps.clickReadAccessRepo(repositoryId);
-        UserAndAccessSteps.clickWriteAccessRepo(repositoryId);
+        UserAndAccessSteps.toggleReadAccessForRepo(repositoryId);
+        UserAndAccessSteps.toggleWriteAccessForRepo(repositoryId);
         UserAndAccessSteps.clickGraphqlAccessRepo(repositoryId);
         UserAndAccessSteps.confirmUserCreate();
 

package/e2e-security/setup/users-and-access/repo-admin-role.spec.js

@@ -24,8 +24,8 @@ describe('Repository Admin – Permissions and Access Control', () => {
         UserAndAccessSteps.typeConfirmPasswordField(password);
         UserAndAccessSteps.selectRoleRadioButton('#roleRepoAdmin');
 
-        UserAndAccessSteps.getReadAccessForRepo('*').should('be.checked').and('be.disabled');
-        UserAndAccessSteps.getWriteAccessForRepo('*').should('be.checked').and('be.disabled');
+        UserAndAccessSteps.validateReadAccessForRepo('*', {checked: true, disabled: true});
+        UserAndAccessSteps.validateWriteAccessForRepo('*', {checked: true, disabled: true});
 
         UserAndAccessSteps.confirmUserCreate();
         UserAndAccessSteps.toggleSecurity();

package/eslint.config.js

@@ -20,6 +20,7 @@ export default [
                 cy: 'readonly',
                 Cypress: 'readonly',
                 describe: 'readonly',
+                context: 'readonly',
                 it: 'readonly',
                 beforeEach: 'readonly',
                 afterEach: 'readonly',

package/npm-shrinkwrap.json

@@ -1,12 +1,12 @@
 {
   "name": "graphdb-workbench-tests",
-  "version": "3.5.0-TR2",
+  "version": "3.5.0-TR3",
   "lockfileVersion": 3,
   "requires": true,
   "packages": {
     "": {
       "name": "graphdb-workbench-tests",
-      "version": "3.5.0-TR2",
+      "version": "3.5.0-TR3",
       "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.5.0-TR2",
+  "version": "3.5.0-TR3",
   "description": "Cypress tests for GraphDB workbench",
   "type": "module",
   "scripts": {
@@ -12,7 +12,7 @@
     "cy:open-flaky": "cypress open --config-file cypress-flaky.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",

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/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/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() {
@@ -230,53 +234,17 @@ export class UserAndAccessSteps {
     }
 
     static clickGraphqlAccessAny() {
-        cy.get('#user-repos')
-            .contains('Any data repository')
-            .parent('tr')
+        this.getRepositoryRightsLine('*')
             .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')
-            .parent('tr')
-            .find('.read')
-            .realClick();
-    }
-
-    static clickReadAccessRepo(repoName) {
-        cy.get('#user-repos')
-            .contains(repoName)
-            .parent('tr')
-            .find('.read')
-            .realClick();
-    }
-
-    static clickWriteAccessAny() {
-        cy.get('#user-repos')
-            .contains('Any data repository')
-            .parent('tr')
-            .find('.write')
-            .realClick();
-    }
-
-    static clickWriteAccessRepo(repoName) {
-        cy.get('#user-repos')
-            .contains(repoName)
-            .parent('tr')
-            .find('.write')
-            .realClick();
-    }
-
     static findUserRowAlias(username, aliasName = 'userRow') {
         this.findUserInTable(username);
         cy.get('@user').as(aliasName);
@@ -301,6 +269,10 @@ export class UserAndAccessSteps {
         return cy.get(repoLineAlias).find('.ri-edit-line');
     }
 
+    static findManageIconAlias(repoLineAlias) {
+        return cy.get(repoLineAlias).find('.ri-folder-settings-line');
+    }
+
     static findGraphqlIconAlias(repoLineAlias) {
         return cy.get(repoLineAlias).find('.icon-graphql');
     }
@@ -308,41 +280,92 @@ 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;
-        return cy.get('#user-repos')
-            .contains(matchText)
-            .parent('tr')
+        return this.getRepositoryRightsLine(repoName)
             .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;
-        return cy.get('#user-repos')
-            .contains(matchText)
-            .parent('tr')
+        return this.getRepositoryRightsLine(repoName)
             .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);
+    }
+
+    // ============= Manange Repository Access Toggles and Validations =============
+
+    static getManageAccessRepoCheckbox(repoName) {
+        return this.getRepositoryRightsLine(repoName)
+            .find('.manage-repository');
+    }
+
+    static clickManageAccessRepo(repoName) {
+        UserAndAccessSteps.getManageAccessRepoCheckbox(repoName).realClick();
+    }
+
+    static toggleManageRepoForRepo(repoName) {
+        return this.clickManageAccessRepo(repoName);
+    }
+
+    static validateManageAccessForRepo(repoName, expectedState) {
+        const manageAccessCheckbox = this.getManageAccessRepoCheckbox(repoName);
+        this.validateRightsForRepo(repoName, manageAccessCheckbox, expectedState);
+    }
+
+    // ============= GraphQL Access Toggles and Validations =============
+
     static getGraphqlAccessForRepo(repoName) {
-        const matchText = (repoName === '*') ? 'Any data repository' : repoName;
-        return cy.get('#user-repos')
-            .contains(matchText)
-            .parent('tr')
+        return this.getRepositoryRightsLine(repoName)
             .find('.graphql')
     }
 
@@ -350,6 +373,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/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());