graphdb-workbench-tests 2.7.4-GA2 → 2.7.4-RC2

package/integration/repository/repositories.spec.js

@@ -53,7 +53,6 @@ describe('Repositories', () => {
     });
 
 
-
     it('create repository page should list available repository types options', () => {
         const expectedRepoTypes = ['GraphDB Repository', 'Ontop Virtual SPARQL', 'FedX Virtual SPARQL'];
         RepositorySteps.createRepository();
@@ -208,6 +207,33 @@ describe('Repositories', () => {
         // getRepositoryFtsCheckbox().should('be.checked');
     });
 
+    it('should create repository with selected ruleset file', () => {
+        interceptRulesetFileUpload();
+        // Given I create a repository
+        RepositorySteps.createRepository();
+        RepositorySteps.chooseRepositoryType(GDB_REPOSITORY_TYPE);
+        RepositorySteps.typeRepositoryId(repositoryId);
+        // When I select an invalid ruleset file
+        RepositorySteps.getRepositoryRulesetMenu().select('OWL-Horst (Optimized)').then(() => {
+            RepositorySteps.selectRulesetFile();
+            RepositorySteps.uploadRulesetFile('fixtures/repositories/invalid_builtin_Rules.pie');
+            // Then I see an error
+            ToasterSteps.verifyError('Error compiling ruleset: ');
+            // And I wait for it to disappear
+            ToasterSteps.getToast().should('not.exist');
+        });
+
+        // When I select a valid ruleset file
+        RepositorySteps.getRepositoryRulesetMenu().select('OWL-Horst (Optimized)').then(() => {
+            RepositorySteps.selectRulesetFile();
+            RepositorySteps.uploadRulesetFile('fixtures/repositories/builtin_Rules.pie');
+            // Then there should be no error
+            ToasterSteps.getToast().should('not.exist');
+            // And I should be able to save the repository
+            RepositorySteps.saveRepository();
+        });
+    });
+
     it('should allow to switch between repositories', () => {
         const secondRepoId = 'second-repo-' + Date.now();
         RepositorySteps.createRepository();
@@ -491,4 +517,38 @@ describe('Repositories', () => {
                 .then(($el) => $el)
                 .then(($el) => $el && $el.text() === status));
     }
+
+    function interceptRulesetFileUpload() {
+       cy.intercept(
+            {
+                method: 'POST',
+                url: 'rest/repositories/ruleset/upload'
+            },
+            (req) => {
+                const bodyString = req.body.toString();
+
+                if (bodyString.includes('filename="invalid_builtin_Rules.pie"')) {
+                    req.reply({
+                        statusCode: 200,
+                        body: {
+                            success: false,
+                            errorMessage: 'Error compiling ruleset: invalid_builtin_Rulestmp1724942106843.pie',
+                            fileLocation: ''
+                        }
+                    });
+                } else if (bodyString.includes('filename="builtin_Rules.pie"')) {
+                    req.reply({
+                        statusCode: 200,
+                        body: {
+                            success: true,
+                            errorMessage: '',
+                            fileLocation: 'builtin_Rulestmp1724944380374.pie'
+                        }
+                    });
+                } else {
+                    throw new Error('Test failed: Request did not match stubbed headers.');
+                }
+            }
+        ).as('uploadRuleset');
+    }
 });

package/integration/setup/aclmanagement/create-rule.spec.js

@@ -108,7 +108,8 @@ describe('ACL Management: create rule', () => {
                     "subject": "<urn:Mary>",
                     "predicate": "*",
                     "object": "*",
-                    "context": "*"
+                    "context": "*",
+                    "warnForPrefix": false
                 },
                 {
                     "scope": "statement",
@@ -118,7 +119,8 @@ describe('ACL Management: create rule', () => {
                     "subject": "*",
                     "predicate": "<http://www.w3.org/1999/02/22-rdf-syntax-ns#type>",
                     "object": "*",
-                    "context": "*"
+                    "context": "*",
+                    "warnForPrefix": false
                 },
                 {
                     "scope": "statement",
@@ -128,7 +130,8 @@ describe('ACL Management: create rule', () => {
                     "subject": "<urn:John>",
                     "predicate": "*",
                     "object": "*",
-                    "context": "*"
+                    "context": "*",
+                    "warnForPrefix": false
                 },
                 {
                     "scope": "statement",
@@ -138,7 +141,8 @@ describe('ACL Management: create rule', () => {
                     "subject": "<<<http://example.com/test> <http://www.w3.org/2000/01/rdf-schema#label> \"test aber auf Deutsch\"@de>>",
                     "predicate": "*",
                     "object": "\"test aber auf Deutsch\"@en",
-                    "context": "<http://example.com/graph1>"
+                    "context": "<http://example.com/graph1>",
+                    "warnForPrefix": false
                 },
                 {
                     "scope": "statement",
@@ -148,7 +152,8 @@ describe('ACL Management: create rule', () => {
                     "subject": "*",
                     "predicate": "*",
                     "object": "\"15\"^^<http://www.w3.org/2001/XMLSchema#int>",
-                    "context": "*"
+                    "context": "*",
+                    "warnForPrefix": false
                 },
                 {
                     "scope": "statement",
@@ -158,7 +163,8 @@ describe('ACL Management: create rule', () => {
                     "subject": "<urn:Cat>",
                     "predicate": "*",
                     "object": "<<<http://example.com/test> <http://www.w3.org/2000/01/rdf-schema#label> \"test aber auf Deutsch\"@de>>",
-                    "context": "*"
+                    "context": "*",
+                    "warnForPrefix": false
                 }
             ];
             expect(interception.request.body).to.deep.eq(expected);
@@ -222,17 +228,16 @@ describe('ACL Management: create rule', () => {
         AclManagementSteps.fillRole(0, 'CUSTOM_ROLE_FOO');
 
         // Then I expect the prefix warning to appear
-        AclManagementSteps.getPrefixWarning().should('be.visible');
-        AclManagementSteps.getPrefixWarning().should('contain.text', 'Custom roles should be entered without the "CUSTOM_" prefix in Workbench');
+        AclManagementSteps.getPrefixWarning(0).should('be.visible');
+        AclManagementSteps.getPrefixWarning(0).should('contain.text', 'Custom roles should be entered without the "CUSTOM_" prefix in Workbench');
         // When I save the rule
         AclManagementSteps.saveRule(0);
         // Then the text should be how the user typed it
         AclManagementSteps.getSavedRoleField(0).should('contain', 'CUSTOM_ROLE_FOO');
         // And I expect a warning icon to appear
-        AclManagementSteps.getWarningIcon().should('be.visible');
-        AclManagementSteps.mouseoverWarningIcon();
+        AclManagementSteps.getWarningIcon(0).should('be.visible');
         // And the icon should have the same tooltip text as the warning
-        AclManagementSteps.getWarningIconTooltipText().should('be.visible').and('contain.text', 'Custom roles should be entered without the "CUSTOM_" prefix in Workbench');
+        AclManagementSteps.getWarningIconTooltipText(0).should('be.visible').and('contain.text', 'Custom roles should be entered without the "CUSTOM_" prefix in Workbench');
     });
 });
 

package/integration/setup/aclmanagement/scopes.spec.js

@@ -138,20 +138,23 @@ describe('ACL Management: rule scopes', () => {
                     "scope": "clear_graph",
                     "policy": "deny",
                     "role": "CUSTOM_ROLE1",
-                    "context": "all"
+                    "context": "all",
+                    "warnForPrefix": false
                 },
                 {
                     "scope": "plugin",
                     "policy": "deny",
                     "role": "CUSTOM_ROLE2",
                     "operation": "write",
-                    "plugin": "*"
+                    "plugin": "*",
+                    "warnForPrefix": false
                 },
                 {
                     "scope": "system",
                     "policy": "allow",
                     "role": "CUSTOM_ROLE3",
-                    "operation": "write"
+                    "operation": "write",
+                    "warnForPrefix": false
                 },
                 {
                     "scope": "statement",
@@ -161,7 +164,8 @@ describe('ACL Management: rule scopes', () => {
                     "subject": "*",
                     "predicate": "*",
                     "object": "*",
-                    "context": "*"
+                    "context": "*",
+                    "warnForPrefix": false
                 }
             ];
             expect(interception.request.body).to.deep.eq(expectedPayload);

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

@@ -109,9 +109,9 @@ describe('User and Access', () => {
         // When I create a user
         UserAndAccessSteps.clickCreateNewUserButton();
         // And I add a custom role tag with prefix CUSTOM_
-        UserAndAccessSteps.addTextToCustomRoleField('CUSTOM_USER');
+        UserAndAccessSteps.addTextToCustomRoleField('CUSTOM_USER{Enter}');
         // There should be a warning text
-        UserAndAccessSteps.getPrefixWarning().should('contain', 'Custom roles should be entered without the "CUSTOM_" prefix in Workbench');
+        UserAndAccessSteps.getPrefixWarning(0).should('contain', 'Custom roles should be entered without the "CUSTOM_" prefix in Workbench');
     });
 
     it('Warn users when setting no password when creating new user admin', () => {

package/npm-shrinkwrap.json

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

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "graphdb-workbench-tests",
-    "version": "2.7.4-GA2",
+    "version": "2.7.4-RC2",
     "description": "Cypress tests for GraphDB workbench",
     "scripts": {
         "prepack": "npm shrinkwrap",

package/steps/repository-steps.js

@@ -206,4 +206,40 @@ export class RepositorySteps {
             .and('contain', 'Repositories from: ')
             .and('contain', 'Local');
     }
+
+    static getOntopicTable() {
+        return cy.get('#wb-repositories-ontopic-repositoryInGetRepositories');
+    }
+
+    static getDeleteOntopicInstanceBtn(url) {
+        return RepositorySteps.getOntopicTable().find('tr').contains(url).parent().find('.delete-ontopic-location');
+    }
+
+    static deleteOntopicInstance(url) {
+        RepositorySteps.getDeleteOntopicInstanceBtn(url).click();
+    }
+
+    static getEditOntopicInstanceBtn(url) {
+        return RepositorySteps.getOntopicTable().find('tr').contains(url).parent().find('.edit-ontopic-location');
+    }
+
+    static editOntopicInstance(url) {
+        RepositorySteps.getEditOntopicInstanceBtn(url).click();
+    }
+
+    static getRemoteGraphDBTable() {
+        return cy.get('#wb-locations-locationInGetRemoteLocations');
+    }
+
+    static getLocalGraphDBTable() {
+        return cy.get('#wb-locations-locationInGetLocations');
+    }
+
+    static selectRulesetFile() {
+        cy.get('#additionalParams .form-group .selectFiles').click();
+    }
+
+    static uploadRulesetFile(file) {
+        cy.get('input[type=file]').eq(1).selectFile(file, {force: true});
+    }
 }

package/steps/setup/acl-management-steps.js

@@ -169,22 +169,19 @@ export class AclManagementSteps {
         return cy.get('div.small');
     }
 
-    static getPrefixWarning() {
-        return cy.get('.prefix-warning-text');
+    static getPrefixWarning(index) {
+        return this.getSavedRoleField(index).find('.prefix-warning-text');
     }
 
-    static getWarningIcon() {
-        return cy.get('.icon-warning');
+    static getWarningIcon(index) {
+        return this.getSavedRoleField(index).get('.icon-warning');
     }
 
-    static getWarningIconTooltipText() {
+    static getWarningIconTooltipText(index) {
+        this.getWarningIcon(index).trigger('mouseover');
         return cy.get('.angular-tooltip');
     }
 
-    static mouseoverWarningIcon() {
-        cy.get('.icon-warning').first().trigger('mouseover');
-    }
-
     static getPluginField(index) {
         return this.getRule(index).find('.plugin-cell textarea');
     }