graphdb-workbench-tests 2.0.0-TR10 → 2.0.0-TR11

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

@@ -55,7 +55,7 @@ describe('User and Access', () => {
         cy.get('@user').find('.edit-user-btn').should('be.visible')
             .and('not.be.disabled');
         // And cannot be deleted
-        cy.get('@user').find('.delete-user-btn').should('not.be.visible');
+        cy.get('@user').find('.delete-user-btn').should('not.exist');
         // Date created should be visible
         cy.get('@user').find('.date-created').should('be.visible');
     });
@@ -91,22 +91,26 @@ describe('User and Access', () => {
         cy.get('.ot-splash').should('not.be.visible');
         getUsersTable().should('be.visible');
         //delete repository manager
-        deleteUser("repo-manager");
-        //create a custom admin
-        createUser("second-admin", PASSWORD, ROLE_CUSTOM_ADMIN);
-        logout();
-        //login with custom admin
-        loginWithUser("second-admin", PASSWORD);
-        cy.url().should('include', '/users');
-        logout();
-        //login with admin
-        loginWithUser("admin", DEFAULT_ADMIN_PASSWORD);
-        cy.get('.ot-splash').should('not.be.visible');
-        getUsersTable().should('be.visible');
-        //delete custom admin
-         deleteUser("second-admin");
-        //disable security
-        getToggleSecuritySwitch().click();
+        deleteUser("repo-manager")
+            .then(() => {
+                //create a custom admin
+                createUser("second-admin", PASSWORD, ROLE_CUSTOM_ADMIN);
+                logout();
+                //login with custom admin
+                loginWithUser("second-admin", PASSWORD);
+                cy.url().should('include', '/users');
+                logout();
+                //login with admin
+                loginWithUser("admin", DEFAULT_ADMIN_PASSWORD);
+                cy.get('.ot-splash').should('not.be.visible');
+                getUsersTable().should('be.visible');
+                //delete custom admin
+                deleteUser("second-admin")
+                    .then(() => {
+                        //disable security
+                        getToggleSecuritySwitch().click();
+                    });
+            });
     });
     it('Warn users when setting no password when creating new user admin', () => {
         getUsersTable().should('be.visible');
@@ -188,10 +192,19 @@ describe('User and Access', () => {
     }
 
     function deleteUser(username) {
-        cy.get('#wb-users-userInUsers tr').contains(username).parent().parent().within(() => {
-            cy.get('.icon-trash').click();
-        });
-        cy.get('.confirm-btn').click();
+        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();
+            });
     }
 
     function loginWithUser(username, password) {

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "graphdb-workbench-tests",
-    "version": "2.0.0-TR10",
+    "version": "2.0.0-TR11",
     "description": "Cypress tests for GraphDB workbench",
     "scripts": {
         "start": "cypress open",

package/support/sparql-commands.js

@@ -1,7 +1,7 @@
 Cypress.Commands.add('pasteQuery', (query) => {
     clearQuery();
     // Using force because the textarea is not visible
-    getQueryTextArea().invoke('val', query).trigger('change', {force: true});
+    getQueryTextArea().invoke('val', query).trigger('change', {force: true}).should('have.value', query);
     waitUntilQueryIsVisible();
 });
 
@@ -53,7 +53,7 @@ function getQueryTextArea() {
 }
 
 function waitUntilQueryIsVisible() {
-    cy.waitUntil(() =>
+    return cy.waitUntil(() =>
         getQueryArea()
             .then(codeMirrorEl =>
                 codeMirrorEl && codeMirrorEl[0].CodeMirror.getValue().trim().length > 0));