graphdb-workbench-tests 4.0.0-TR15 → 4.0.0-TR16

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

@@ -245,48 +245,42 @@ describe('Ontop repositories', () => {
     context('Repository maintenance permission', () => {
 
         const PASSWORD = 'root';
-        const REPOSITORY_MAINTAINER_USERNAME = 'repoMaintainer';
-        const REPOSITORY_MANAGER_USERNAME = 'repoManager';
+        let repositoryMaintainerUsername;
 
         beforeEach(() => {
-            cy.createUser({
-                username: REPOSITORY_MAINTAINER_USERNAME,
-                password: PASSWORD,
-                grantedAuthorities: [
-                    `READ_REPO_${repositoryId}`,
-                    `MAINTAIN_REPO_${repositoryId}`,
-                    `WRITE_REPO_${repositoryId}`
-                ]
-            });
-            cy.createUser({
-                username: REPOSITORY_MANAGER_USERNAME,
-                password: PASSWORD,
-                grantedAuthorities: [
-                    'ROLE_USER',
-                    'ROLE_MONITORING',
-                    'ROLE_REPO_MANAGER'
-                ]
-            });
-            cy.switchOnSecurity();
+            repositoryMaintainerUsername = 'repo-maintainer-' + Date.now();
         });
 
         afterEach(() => {
             cy.loginAsAdmin()
                 .then(() => {
-                    cy.deleteUser(REPOSITORY_MAINTAINER_USERNAME, true);
-                    cy.deleteUser(REPOSITORY_MANAGER_USERNAME, true);
+                    cy.deleteUser(repositoryMaintainerUsername, true);
                     cy.switchOffSecurity(true);
                 });
         });
         it('should allow a repository maintainer to edit an Ontop repository', () => {
             RepositoryStubs.spyGetJDBCProperties();
             // GIVEN: An Ontop repository exists
-            cy.loginAs(REPOSITORY_MANAGER_USERNAME, PASSWORD);
             OntopRepositorySteps.visitCreate();
             createOntopRepository(repositoryId);
+            RepositorySteps.waitUntilRepositoriesPageIsLoaded();
+            RepositorySteps.getRepositoryFromList(repositoryId).should('exist');
+
+            // AND: A user with maintenance permission for it is created after the repository,
+            // because creating a repository removes the permissions already granted for its ID.
+            cy.createUser({
+                username: repositoryMaintainerUsername,
+                password: PASSWORD,
+                grantedAuthorities: [
+                    `READ_REPO_${repositoryId}`,
+                    `MAINTAIN_REPO_${repositoryId}`,
+                    `WRITE_REPO_${repositoryId}`
+                ]
+            });
+            cy.switchOnSecurity();
 
             // WHEN: I log in as a user with maintenance permission
-            cy.loginAs(REPOSITORY_MAINTAINER_USERNAME, PASSWORD);
+            cy.loginAs(repositoryMaintainerUsername, PASSWORD);
             RepositorySteps.visit();
 
             // THEN: The repository is visible because the user can maintain it
@@ -326,8 +320,7 @@ describe('Ontop repositories', () => {
                 .should('contain.value', 'ontop.cardinalityMode=LOOSE');
             // Saving of the OBDA file verifies that the repository maintainer can access rest/repositories/file/upload
             OntopRepositorySteps.editOBDAFile();
-            ModalDialogSteps.getDialogBody()
-                .find('textarea')
+            OntopRepositorySteps.getFileContentEditor()
                 .invoke('val')
                 .should('include', 'edited ODBA file');
             ModalDialogSteps.close();
@@ -339,8 +332,7 @@ describe('Ontop repositories', () => {
             ModalDialogSteps.getDialogHeader()
                 .should('contain', 'Edit "OBDA or R2RML file" contents');
 
-            ModalDialogSteps.getDialogBody()
-                .find('textarea')
+            OntopRepositorySteps.getFileContentEditor()
                 .type('{moveToStart}Add commentary for testing purpose');
 
             ModalDialogSteps.clickOKButton();
@@ -354,8 +346,7 @@ describe('Ontop repositories', () => {
             cy.wait('@getJDBCProperties');
             OntopRepositorySteps.editOBDAFile();
 
-            ModalDialogSteps.getDialogBody()
-                .find('textarea')
+            OntopRepositorySteps.getFileContentEditor()
                 .invoke('val')
                 .should('include', 'Add commentary for testing purpose');
         });

package/npm-shrinkwrap.json

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

package/steps/ontop-repository-steps.js

@@ -25,6 +25,10 @@ export class OntopRepositorySteps {
         OntopRepositorySteps.getOBDAFileFieldEditButton().click();
     }
 
+    static getFileContentEditor() {
+        return cy.getByTestId('repository-file-content');
+    }
+
     static getOntologyFileField() {
         return cy.get('div').contains("Ontology file");
     }