graphdb-workbench-tests 2.7.0-TR15 → 2.7.0-TR16

package/fixtures/locale-en.json

@@ -484,6 +484,7 @@
     "security.count.all.results": "Count all SPARQL results",
     "security.read.write.access": "Repositories read/write access",
     "security.user.rights": "Users should have rights to at least one repository!",
+    "security.user.role.too.short": "Must be at least 2 symbols long",
     "security.no.active.location": "There is no active location.",
     "security.repository.title": "Repository",
     "security.tooltip.read": "Read",

package/integration/import/import-server-files.spec.js

@@ -41,16 +41,12 @@ describe('Import server files', () => {
 
     it('Should be able to toggle the server file import help', () => {
         // When the page is loaded
-        // Then I expect import help message to be hidden because it is not an empty state
+        // Then I should not see the server files import help
         ImportServerFilesSteps.getHelpMessage().should('not.exist');
-        // When I click on the help button
-        ImportServerFilesSteps.openHelpMessage();
-        // Then the help should appear
-        ImportServerFilesSteps.getHelpMessage().should('be.visible');
-        // When I close the help
-        ImportServerFilesSteps.closeHelpMessage();
+        // When I open the help
+        ImportServerFilesSteps.toggleHelpMessage();
         // Then the help should disappear
-        ImportServerFilesSteps.getHelpMessage().should('not.exist');
+        ImportServerFilesSteps.getHelpMessage().should('be.visible');
     });
 
     it('Should be able to filter the files', () => {

package/integration/import/import-user-data.spec.js

@@ -78,26 +78,24 @@ describe('Import user data', () => {
         ImportUserDataSteps.visit();
         // When the page is loaded and no uploaded files are present
         ImportUserDataSteps.getResources().should('have.length', 0);
-        // Then I should see the user data import help
+        // Then I should not see the user data import help
         ImportUserDataSteps.getHelpMessage().should('be.visible');
-        // When I upload a text snippet
+        // When I have uploaded a text snippet
         ImportUserDataSteps.openImportTextSnippetDialog();
         ImportUserDataSteps.fillRDFTextSnippet(RDF_TEXT_SNIPPET);
         ImportUserDataSteps.clickImportTextSnippetButton();
         ImportSettingsDialogSteps.import();
         ImportUserDataSteps.getResources().should('have.length', 1);
-        // Then the help should disappear because it's not an empty state anymore
         ImportUserDataSteps.getHelpMessage().should('not.exist');
-        // When I open the help message
-        ImportUserDataSteps.openHelpMessage();
-        // Then the help message should appear
-        ImportUserDataSteps.getHelpMessage().should('be.visible');
-        // When I visit another page and return
+        ImportUserDataSteps.toggleHelpMessage();
+        // And I close the help
+        ImportUserDataSteps.closeHelpMessage();
+        // And I visit another page and return
         cy.visit('/webapi');
         cy.url().should('include', '/webapi');
         ImportUserDataSteps.visit();
         ImportUserDataSteps.getResources().should('have.length', 1);
-        // Then the help should not appear because it's not an empty state
+        // Then the help should not appear because I have closed it explicitly
         ImportUserDataSteps.getHelpMessage().should('not.exist');
         // When I delete the uploaded file
         ImportUserDataSteps.deleteUploadedFile(0);

package/integration/import/import-view.spec.js

@@ -1,6 +1,8 @@
 import {ImportSettingsDialogSteps} from "../../steps/import/import-settings-dialog-steps";
 import {ImportUserDataSteps} from "../../steps/import/import-user-data-steps";
 import {ImportServerFilesSteps} from "../../steps/import/import-server-files-steps";
+import ImportSteps from "../../steps/import/import-steps";
+import HomeSteps from "../../steps/home-steps";
 
 const bnodes = `_:node0 <http://purl.org/dc/elements/1.1/title> "A new book" ;
                     \t<http://purl.org/dc/elements/1.1/creator> "A.N.Other" .`;
@@ -42,4 +44,65 @@ describe('Import view', () => {
         ImportUserDataSteps.getResources().should('have.length', 1);
         ImportUserDataSteps.getResourceByName('bnodes.ttl').should('be.visible');
     });
+
+    it('Should display/hide help message depends on resource result', () => {
+        // Given I am on import page
+
+        // Then help message has to be displayed, because the result of imported files are empty.
+        ImportUserDataSteps.getHelpMessage().should('exist');
+
+        // When I toggle the help
+        ImportUserDataSteps.toggleHelpMessage();
+
+        // Then help message mustn't be displayed because the user has hidden it, regardless resources are empty.
+        ImportUserDataSteps.getHelpMessage().should('not.exist');
+
+        // When I go to server tab
+        ImportSteps.openServerFilesTab();
+
+        // Then help message mustn't be displayed because the resources are not empty.
+        ImportServerFilesSteps.getHelpMessage().should('not.exist');
+
+        // When I toggle the server help
+        ImportServerFilesSteps.toggleHelpMessage();
+
+        // Then I expect the help message be displayed.
+        ImportServerFilesSteps.getHelpMessage().should('exist');
+
+        // When I return to the user tab
+        ImportSteps.openUserDataTab();
+
+        // Then help message mustn't be displayed because the user has hidden it, regardless resources are empty.
+        ImportUserDataSteps.getHelpMessage().should('not.exist');
+
+        // When I go to server tab
+        ImportSteps.openServerFilesTab();
+
+        // Then I expect the help message be displayed.
+        ImportServerFilesSteps.getHelpMessage().should('exist');
+
+
+        // When I go to other view
+        HomeSteps.visit();
+        // And return to import user data
+        ImportUserDataSteps.visit();
+
+        // Then I expect the help message to be displayed, because there are no results, regardless of whether the user had previously hidden the help message.
+        ImportUserDataSteps.getHelpMessage().should('exist');
+
+        // When I go to server tab
+        ImportSteps.openServerFilesTab()
+
+        // Then help message mustn't be displayed because the resources are not empty.
+        ImportServerFilesSteps.getHelpMessage().should('not.exist');
+
+        // When I go to user tab and upload a file
+        ImportSteps.openUserDataTab();
+        ImportUserDataSteps.selectFile(ImportUserDataSteps.createFile(testFiles[0], bnodes));
+        ImportSettingsDialogSteps.import();
+        ImportUserDataSteps.getResources().should('have.length', 1);
+
+        // Then I expect the help message not exist, because user because there are resource displayed
+        ImportUserDataSteps.getHelpMessage().should('not.exist');
+    });
 });

package/integration/setup/user-and-access.spec.js

@@ -1,3 +1,5 @@
+import {UserAndAccessSteps} from "../../steps/setup/user-and-access-steps";
+
 describe('User and Access', () => {
 
     const PASSWORD = "password";
@@ -7,21 +9,21 @@ describe('User and Access', () => {
     const DEFAULT_ADMIN_PASSWORD = "root";
 
     beforeEach(() => {
-        cy.visit('/users');
+        UserAndAccessSteps.visit();
         cy.window();
         // Users table should be visible
-        getUsersTable().should('be.visible');
+        UserAndAccessSteps.getUsersTable().should('be.visible');
     });
 
     after(() => {
-        cy.visit('/users');
-        getUsersTable().should('be.visible');
-        cy.get('#wb-users-userInUsers tr').then((table) => {
-            cy.get('table > tbody  > tr').each(($el, index, $list) => {
-                getUsersTable().should('be.visible');
+        UserAndAccessSteps.visit();
+        UserAndAccessSteps.getUsersTable().should('be.visible');
+        UserAndAccessSteps.getUsersTableRow().then((table) => {
+            UserAndAccessSteps.getTableRow().each(($el, index, $list) => {
+                UserAndAccessSteps.getUsersTable().should('be.visible');
                 const username = $el.find('.username').text();
                 if (username !=='admin') {
-                    deleteUser(username);
+                    UserAndAccessSteps.deleteUser(username);
                 }
             });
         });
@@ -29,26 +31,22 @@ describe('User and Access', () => {
 
     it('Initial state', () => {
         // Create new user button should be visible
-        getCreateNewUserButton().should('be.visible');
+        UserAndAccessSteps.getCreateNewUserButton().should('be.visible');
         // Security should be disabled
-        cy.get('#toggle-security').find('.security-switch-label').should('be.visible')
-            .and('contain', 'Security is OFF');
-        cy.get('#toggle-security').find('.switch:checkbox').should('not.be.checked');
+        UserAndAccessSteps.getSecuritySwitchLabel().should('be.visible').and('contain', 'Security is OFF');
+        UserAndAccessSteps.getSecurityCheckbox().should('not.be.checked');
         // Only admin user should be created by default
-        getUsersTable().find('tbody tr').should('have.length', 1);
-        findUserInTable('admin');
-        cy.get('@user').find('.user-type').should('be.visible')
-            .and('contain', 'Administrator');
+        UserAndAccessSteps.getTableRow().should('have.length', 1);
+        UserAndAccessSteps.findUserInTable('admin');
+        UserAndAccessSteps.getUserType().should('be.visible').and('contain', 'Administrator');
         // The admin should have unrestricted rights
-        cy.get('@user').find('.repository-rights').should('be.visible')
-            .and('contain', 'Unrestricted');
+        UserAndAccessSteps.getRepositoryRights().should('be.visible').and('contain', 'Unrestricted');
         // And can be edited
-        cy.get('@user').find('.edit-user-btn').should('be.visible')
-            .and('not.be.disabled');
+        UserAndAccessSteps.getEditUserButton().should('be.visible').and('not.be.disabled');
         // And cannot be deleted
-        cy.get('@user').find('.delete-user-btn').should('not.exist');
+        UserAndAccessSteps.getDeleteUserButton().should('not.exist');
         // Date created should be visible
-        cy.get('@user').find('.date-created').should('be.visible');
+        UserAndAccessSteps.getDateCreated().should('be.visible');
     });
 
     it('Create user', () => {
@@ -72,140 +70,102 @@ describe('User and Access', () => {
         testForUser(name, true);
     });
 
-    function testForUser(name, isAdmin) {
-        //enable security
-        getToggleSecuritySwitch().click();
-        //login new user
-        loginWithUser(name, PASSWORD);
-        //verify permissions
-        cy.url().should('include', '/users');
-        if (isAdmin) {
-            getUsersTable().should('be.visible');
-        } else {
-            cy.get('.alert-danger').should('contain',
-                'You have no permission to access this functionality with your current credentials.');
-        }
-        logout();
-        //login with the admin
-        loginWithUser("admin", DEFAULT_ADMIN_PASSWORD);
-        cy.get('.ot-splash').should('not.be.visible');
-        getUsersTable().should('be.visible');
-        //delete new-user
-        deleteUser(name);
-        //disable security
-        getToggleSecuritySwitch().click({force: true});
-        cy.get('#toggle-security').find('.security-switch-label').should('be.visible')
-            .and('contain', 'Security is OFF');
-        getUsersTable().should('be.visible');
-    }
+    it('Create user with custom role', () => {
+        const name = "user";
+        // When I create a read/write user
+        UserAndAccessSteps.clickCreateNewUserButton();
+        UserAndAccessSteps.typeUsername(name);
+        UserAndAccessSteps.typePassword(PASSWORD);
+        UserAndAccessSteps.typeConfirmPasswordField(PASSWORD);
+        UserAndAccessSteps.selectRoleRadioButton(ROLE_USER);
+        // And add a custom role of 1 letter
+        UserAndAccessSteps.addTextToCustomRoleField('A');
+        UserAndAccessSteps.getRepositoryRightsList().contains('Any data repository').nextUntil('.write').eq(1).within(() => {
+            UserAndAccessSteps.clickWriteAccess();
+        });
+
+        // Then the 'create' button should be disabled
+        UserAndAccessSteps.getConfirmUserCreateButton().should('be.disabled');
+        // And the field should show an error
+        UserAndAccessSteps.getFieldError().should('contain.text', 'Must be at least 2 symbols long');
+        // When I add more text to the custom role tag
+        UserAndAccessSteps.addTextToCustomRoleField('A{enter}');
+        // Then the 'create' button should be enabled
+        UserAndAccessSteps.getConfirmUserCreateButton().should('be.enabled');
+        // And the field error should not exist
+        UserAndAccessSteps.getFieldError().should('not.be.visible');
+
+        // When I type an invalid tag
+        UserAndAccessSteps.addTextToCustomRoleField('B{enter}');
+        // And the field shows an error
+        UserAndAccessSteps.getFieldError().should('contain.text', 'Must be at least 2 symbols long');
+        // When I delete the invalid text
+        UserAndAccessSteps.addTextToCustomRoleField('{backspace}');
+        // Then the error should not be visible
+        UserAndAccessSteps.getFieldError().should('not.be.visible');
+    });
 
     it('Warn users when setting no password when creating new user admin', () => {
-        getUsersTable().should('be.visible');
+        UserAndAccessSteps.getUsersTable().should('be.visible');
         createUser("adminWithNoPassword", PASSWORD, ROLE_CUSTOM_ADMIN);
-        getUsersTable().should('be.visible');
-        cy.get('.ot-splash').should('not.be.visible');
-        deleteUser("adminWithNoPassword");
+        UserAndAccessSteps.getUsersTable().should('be.visible');
+        UserAndAccessSteps.getSplashLoader().should('not.be.visible');
+        UserAndAccessSteps.deleteUser("adminWithNoPassword");
     });
 
-    function getCreateNewUserButton() {
-        return cy.get('#wb-users-userCreateLink');
-    }
-
-    function getToggleSecuritySwitch() {
-        return cy.get('#toggle-security span.switch');
-    }
-
-    function getUsersTable() {
-        return cy.get('#wb-users-userInUsers');
-    }
-
-    function findUserInTable(username) {
-        return getUsersTable().find(`tbody .username:contains(${username})`)
-            .closest('tr').as('user');
-    }
-
-    function getUsernameField() {
-        return cy.get('#wb-user-username');
-    }
-
-    function getPasswordField() {
-        return cy.get('#wb-user-password');
-    }
-
-    function getConfirmPasswordField() {
-        return cy.get('#wb-user-confirmpassword');
-    }
-
-    function getConfirmUserCreateButton() {
-        return cy.get('#wb-user-submit');
-    }
-
-    function getRoleRadioButton(userRole) {
-        return cy.get(userRole);
-    }
-
-    function getRepoitoryRightsList() {
-        return cy.get('#user-repos');
-    }
-
     function createUser(username, password, role) {
-        getCreateNewUserButton().click();
-        getUsernameField().type(username);
-        getPasswordField().type(password);
-        getConfirmPasswordField().type(password);
-        getRoleRadioButton(role).click();
+        UserAndAccessSteps.clickCreateNewUserButton();
+        UserAndAccessSteps.typeUsername(username);
+        UserAndAccessSteps.typePassword(password);
+        UserAndAccessSteps.typeConfirmPasswordField(password);
+        UserAndAccessSteps.selectRoleRadioButton(role);
         if (role === "#roleUser") {
-            getRepoitoryRightsList().contains('Any data repository').nextUntil('.write').eq(1).within(() => {
-                cy.get('.write').click();
+            UserAndAccessSteps.getRepositoryRightsList().contains('Any data repository').nextUntil('.write').eq(1).within(() => {
+                UserAndAccessSteps.clickWriteAccess();
             });
-            getConfirmUserCreateButton().click();
+            UserAndAccessSteps.confirmUserCreate();
         } else if (role === "#roleAdmin" && username === "adminWithNoPassword") {
-            cy.get('#noPassword:checkbox').check()
+            UserAndAccessSteps.getNoPasswordCheckbox().check()
                 .then(() => {
-                    cy.get('#noPassword:checkbox')
+                    UserAndAccessSteps.getNoPasswordCheckbox()
                         .should('be.checked');
                 });
-            getConfirmUserCreateButton().click()
+            UserAndAccessSteps.getConfirmUserCreateButton().click()
                 .then(() => {
-                    cy.get('.modal-dialog').find('.lead').contains('If the password is unset and security is enabled, this administrator will not be ' +
+                    UserAndAccessSteps.getDialogText().contains('If the password is unset and security is enabled, this administrator will not be ' +
                         'able to log into GraphDB through the workbench. Are you sure that you want to continue?');
-                    cy.get('.modal-dialog').find('.confirm-btn').click();
+                    UserAndAccessSteps.confirmInDialog();
                 });
         } else {
-            getConfirmUserCreateButton().click();
+            UserAndAccessSteps.confirmUserCreate();
         }
-        cy.get('.ot-splash').should('not.be.visible');
-        getUsersTable().should('contain', username);
-    }
-
-    function deleteUser(username) {
-        findUserInTable(username);
-        cy.get('@user')
-            .should('have.length', 1)
-            .within(() => {
-                cy.get('.delete-user-btn')
-                    .as('deleteBtn');
-            });
-        return cy.waitUntil(() =>
-            cy.get('@deleteBtn')
-                .then((deleteBtn) => deleteBtn && Cypress.dom.isAttached(deleteBtn) && deleteBtn.trigger('click')))
-            .then(() => {
-                cy.get('.confirm-btn').click();
-            });
+        UserAndAccessSteps.getSplashLoader().should('not.be.visible');
+        UserAndAccessSteps.getUsersTable().should('contain', username);
     }
 
-    function loginWithUser(username, password) {
-        cy.get('#wb-login-username').type(username);
-        cy.get('#wb-login-password').type(password);
-        cy.get('#wb-login-submitLogin').click();
-    }
-
-    function logout() {
-        cy.get('#btnGroupDrop2').click();
-        cy.get('.dropdown-item')
-            .contains('Logout')
-            .closest('a')
-            // Force the click because Cypress sometimes determines that the item has 0x0 dimensions
-            .click({force: true});
+    function testForUser(name, isAdmin) {
+        //enable security
+        UserAndAccessSteps.toggleSecurity();
+        //login new user
+        UserAndAccessSteps.loginWithUser(name, PASSWORD);
+        //verify permissions
+        UserAndAccessSteps.getUrl().should('include', '/users');
+        if (isAdmin) {
+            UserAndAccessSteps.getUsersTable().should('be.visible');
+        } else {
+            UserAndAccessSteps.getError().should('contain',
+                'You have no permission to access this functionality with your current credentials.');
+        }
+        UserAndAccessSteps.logout();
+        //login with the admin
+        UserAndAccessSteps.loginWithUser("admin", DEFAULT_ADMIN_PASSWORD);
+        UserAndAccessSteps.getSplashLoader().should('not.be.visible');
+        UserAndAccessSteps.getUsersTable().should('be.visible');
+        //delete new-user
+        UserAndAccessSteps.deleteUser(name);
+        //disable security
+        UserAndAccessSteps.toggleSecurity();//.click({force: true});
+        UserAndAccessSteps.getSecuritySwitchLabel().should('be.visible').and('contain', 'Security is OFF');
+        UserAndAccessSteps.getUsersTable().should('be.visible');
     }
 });

package/npm-shrinkwrap.json

@@ -1,12 +1,12 @@
 {
     "name": "graphdb-workbench-tests",
-    "version": "2.7.0-TR15",
+    "version": "2.7.0-TR16",
     "lockfileVersion": 3,
     "requires": true,
     "packages": {
         "": {
             "name": "graphdb-workbench-tests",
-            "version": "2.7.0-TR15",
+            "version": "2.7.0-TR16",
             "license": "Apache-2.0",
             "devDependencies": {
                 "cypress": "^13.3.1",

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "graphdb-workbench-tests",
-    "version": "2.7.0-TR15",
+    "version": "2.7.0-TR16",
     "description": "Cypress tests for GraphDB workbench",
     "scripts": {
         "prepack": "npm shrinkwrap",

package/steps/import/import-steps.js

@@ -143,7 +143,7 @@ class ImportSteps {
         return cy.window().its('navigator.clipboard').invoke('readText').then((text) => text);
     }
 
-    static openHelpMessage() {
+    static toggleHelpMessage() {
         // For some reason the page info box opens unexpectedly and covers the help info icon.
         this.getView().find('.toggle-help-btn').click({force: true});
     }

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

@@ -0,0 +1,189 @@
+export class UserAndAccessSteps {
+    static visit() {
+        cy.visit('/users');
+    }
+
+    static getUrl() {
+        return cy.url();
+    }
+
+    static getSplashLoader() {
+        return cy.get('.ot-splash');
+    }
+
+    static getCreateNewUserButton() {
+        return cy.get('#wb-users-userCreateLink');
+    }
+
+    static clickCreateNewUserButton() {
+        this.getCreateNewUserButton().click();
+    }
+
+    static getToggleSecuritySwitch() {
+        return cy.get('#toggle-security span.switch');
+    }
+
+    static toggleSecurity() {
+        this.getToggleSecuritySwitch().click();
+    }
+
+    static getSecuritySwitchLabel() {
+        return cy.get('#toggle-security').find('.security-switch-label');
+    }
+
+    static getSecurityCheckbox() {
+        return cy.get('#toggle-security').find('.switch:checkbox');
+    }
+
+    static getUser() {
+        return cy.get('@user');
+    }
+
+    static getUserType() {
+        return this.getUser().find('.user-type');
+    }
+
+    static getRepositoryRights() {
+        return this.getUser().find('.repository-rights');
+    }
+
+    static getEditUserButton() {
+        return this.getUser().find('.edit-user-btn');
+    }
+
+    static getDeleteUserButton() {
+        return this.getUser().find('.delete-user-btn');
+    }
+
+    static getDateCreated() {
+        return this.getUser().find('.date-created');
+    }
+
+    static getUsersTable() {
+        return cy.get('#wb-users-userInUsers');
+    }
+
+    static getTableRow() {
+        return this.getUsersTable().find('tbody tr');
+    }
+
+    static getUsersTableRow() {
+        return cy.get('#wb-users-userInUsers tr');
+    }
+
+    static findUserInTable(username) {
+        return this.getUsersTable().find(`tbody .username:contains(${username})`)
+            .closest('tr').as('user');
+    }
+
+    static getUsernameField() {
+        return cy.get('#wb-user-username');
+    }
+
+    static typeUsername(text) {
+        this.getUsernameField().type(text);
+    }
+
+    static getPasswordField() {
+        return cy.get('#wb-user-password');
+    }
+
+    static typePassword(text) {
+        this.getPasswordField().type(text);
+    }
+
+    static getConfirmPasswordField() {
+        return cy.get('#wb-user-confirmpassword');
+    }
+
+    static typeConfirmPasswordField(text) {
+        this.getConfirmPasswordField().type(text);
+    }
+
+    static getNoPasswordCheckbox() {
+        return cy.get('#noPassword:checkbox');
+    }
+
+    static getCustomRoleField() {
+        return cy.get('tags-input');
+    }
+
+    static addTextToCustomRoleField(text) {
+        this.getCustomRoleField().type(text);
+    }
+
+    static getConfirmUserCreateButton() {
+        return cy.get('#wb-user-submit');
+    }
+
+    static confirmUserCreate() {
+        cy.get('#wb-user-submit').click();
+    }
+
+    static getRoleRadioButton(userRole) {
+        return cy.get(userRole);
+    }
+
+    static selectRoleRadioButton(role) {
+        this.getRoleRadioButton(role).click();
+    }
+
+    static getRepositoryRightsList() {
+        return cy.get('#user-repos');
+    }
+
+    static clickWriteAccess() {
+        cy.get('.write').click();
+    }
+
+    static getFieldError() {
+        return cy.get('div.small');
+    }
+
+    static getError() {
+        return cy.get('.alert-danger');
+    }
+
+    static getModal() {
+        return cy.get('.modal-dialog');
+    }
+
+    static getDialogText() {
+        return this.getModal().find('.lead');
+    }
+
+    static confirmInDialog() {
+        this.getModal().find('.confirm-btn').click();
+    }
+
+    static deleteUser(username) {
+        this.findUserInTable(username);
+        cy.get('@user')
+            .should('have.length', 1)
+            .within(() => {
+                cy.get('.delete-user-btn')
+                    .as('deleteBtn');
+            });
+        return cy.waitUntil(() =>
+            cy.get('@deleteBtn')
+                .then((deleteBtn) => deleteBtn && Cypress.dom.isAttached(deleteBtn) && deleteBtn.trigger('click')))
+            .then(() => {
+                cy.get('.confirm-btn').click();
+            });
+    }
+
+    static loginWithUser(username, password) {
+        cy.get('#wb-login-username').type(username);
+        cy.get('#wb-login-password').type(password);
+        cy.get('#wb-login-submitLogin').click();
+    }
+
+    static logout() {
+        cy.get('#btnGroupDrop2').click();
+        cy.get('.dropdown-item')
+            .contains('Logout')
+            .closest('a')
+            // Force the click because Cypress sometimes determines that the item has 0x0 dimensions
+            .click({force: true});
+    }
+}