npm - graphdb-workbench-tests - Versions diffs - 2.6.0-TR5 → 2.6.0-TR6 - Mend

graphdb-workbench-tests 2.6.0-TR5 → 2.6.0-TR6

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (13) hide show

package/fixtures/locale-en.json CHANGED Viewed

@@ -144,21 +144,30 @@
     },
     "acl_management": {
         "rulestable": {
+            "tab": {
+                "statement": "Statement",
+                "clear_graph": "Clear graph",
+                "plugin": "Plugin",
+                "system": "System"
+            },
             "column": {
                 "index": "#",
+                "policy": "Policy",
+                "role": "Role",
+                "operation": "Operation",
                 "subject": "Subject",
                 "predicate": "Predicate",
                 "object": "Object",
                 "context": "Context",
-                "role": "Role",
-                "policy": "Policy"
+                "plugin": "Plugin"
             },
             "field_placeholders": {
                 "subject": "Subject",
                 "predicate": "Predicate",
                 "object": "Object",
                 "context": "Context",
-                "role": "Role"
+                "role": "Custom role",
+                "plugin": "Plugin"
             },
             "actions": {
                 "move_up": "Move the rule up",

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

@@ -1,6 +1,5 @@
 import {AclManagementSteps} from "../../../steps/setup/acl-management-steps";
-import {ACL} from "../../../steps/setup/acl-management-steps";
-import {ToasterSteps} from "../../../steps/toaster-steps";
+import {ACL_VIEW} from "../../../steps/setup/acl-management-steps";
 import {ApplicationSteps} from "../../../steps/application-steps";
 describe('ACL Management: create rule', () => {
@@ -19,6 +18,7 @@ describe('ACL Management: create rule', () => {
         cy.enableAutocomplete(repositoryId);
         AclManagementSteps.importRules(repositoryId);
         AclManagementSteps.visit();
+        ApplicationSteps.geLoader().should('not.exist');
         // ensure rules are rendered
         AclManagementSteps.getAclRules().should('have.length.gt', 0);
     });
@@ -41,6 +41,9 @@ describe('ACL Management: create rule', () => {
     it('Should add a new rule in the list', () => {
         // When I add a new rule
         AclManagementSteps.addRule(1);
+        // When I fill in the role field
+        AclManagementSteps.getRoleField(2).should('have.value', '');
+        AclManagementSteps.fillRole(2, 'ROLE1');
         // Then I expect that the save rule button should be enabled because all fields have some default values
         AclManagementSteps.checkIfRuleSavingIsAllowed(2);
         // When I fill in the subject field
@@ -63,30 +66,103 @@ describe('ACL Management: create rule', () => {
         AclManagementSteps.fillContext(2, '*');
         // Then I expect that the save rule button should be enabled
         AclManagementSteps.checkIfRuleSavingIsAllowed(2);
-        // When I fill in the role field
-        AclManagementSteps.getRoleField(2).should('have.value', 'CUSTOM_');
-        AclManagementSteps.fillRole(2, 'CUSTOM_ROLE1');
         // Then I expect that the save rule button should be enabled
         AclManagementSteps.checkIfRuleSavingIsAllowed(2);
         // When I change the policy
         AclManagementSteps.selectPolicy(2, 'deny');
         // Then I expect that the save rule button should be enabled
         AclManagementSteps.checkIfRuleSavingIsAllowed(2);
+        // When I change the operation
+        AclManagementSteps.selectOperation(2, 'write');
+        // Then I expect that the save rule button should be enabled
+        AclManagementSteps.checkIfRuleSavingIsAllowed(2);
         // When I save the rule
         AclManagementSteps.saveRule(2);
         // Then the rule should be saved
         AclManagementSteps.getAclRules().should('have.length', 6);
         const newRule = {
+            "scope": "statement",
+            "policy": "deny",
+            "role": "ROLE1",
             "subject": "<urn:John>",
             "predicate": "*",
             "object": "*",
             "context": "*",
-            "role": "CUSTOM_ROLE1",
-            "policy": "deny",
+            "operation": "write",
             "moveUp": true,
             "moveDown": true
         };
-        AclManagementSteps.checkRules([ACL[0], ACL[1], newRule, ACL[2], ACL[3], ACL[4]]);
+        AclManagementSteps.checkStatementRules([ACL_VIEW[0], ACL_VIEW[1], newRule, ACL_VIEW[2], ACL_VIEW[3], ACL_VIEW[4]]);
+        cy.intercept('PUT', '/rest/repositories/acl-management-*/acl').as('putCall');
+        // When I save the rules
+        AclManagementSteps.saveAcl();
+        // Then wait for the PUT call to occur and assert the request body
+        cy.wait('@putCall').then((interception) => {
+            const expected = [
+                {
+                    "scope": "statement",
+                    "policy": "allow",
+                    "role": "!CUSTOM_ROLE2",
+                    "operation": "write",
+                    "subject": "<urn:Mary>",
+                    "predicate": "*",
+                    "object": "*",
+                    "context": "*"
+                },
+                {
+                    "scope": "statement",
+                    "policy": "deny",
+                    "role": "CUSTOM_ROLE1",
+                    "operation": "read",
+                    "subject": "*",
+                    "predicate": "<http://www.w3.org/1999/02/22-rdf-syntax-ns#type>",
+                    "object": "*",
+                    "context": "*"
+                },
+                {
+                    "scope": "statement",
+                    "policy": "deny",
+                    "role": "CUSTOM_ROLE1",
+                    "operation": "write",
+                    "subject": "<urn:John>",
+                    "predicate": "*",
+                    "object": "*",
+                    "context": "*"
+                },
+                {
+                    "scope": "statement",
+                    "policy": "deny",
+                    "role": "CUSTOM_ROLE3",
+                    "operation": "read",
+                    "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>"
+                },
+                {
+                    "scope": "statement",
+                    "policy": "allow",
+                    "role": "CUSTOM_ROLE3",
+                    "operation": "write",
+                    "subject": "*",
+                    "predicate": "*",
+                    "object": "\"15\"^^<http://www.w3.org/2001/XMLSchema#int>",
+                    "context": "*"
+                },
+                {
+                    "scope": "statement",
+                    "policy": "deny",
+                    "role": "CUSTOM_ROLE4",
+                    "operation": "write",
+                    "subject": "<urn:Cat>",
+                    "predicate": "*",
+                    "object": "<<<http://example.com/test> <http://www.w3.org/2000/01/rdf-schema#label> \"test aber auf Deutsch\"@de>>",
+                    "context": "*"
+                }
+            ];
+            expect(interception.request.body).to.deep.eq(expected);
+        });
     });
     it('Should hide all unnecessary actions during rule creation', () => {
@@ -110,12 +186,13 @@ describe('ACL Management: create rule', () => {
     it('should not allow creating of a new rule if it is not unique', () => {
         // When I am on "ACL Management" page and create a rule that exist,
         AclManagementSteps.addRuleInBeginning();
+        AclManagementSteps.selectPolicy(0, 'allow');
+        AclManagementSteps.fillRole(0, '!ROLE2');
+        AclManagementSteps.selectOperation(0, 'write');
         AclManagementSteps.fillSubject(0, '<urn:Mary>');
         AclManagementSteps.fillPredicate(0, '*');
         AclManagementSteps.fillObject(0, '*');
         AclManagementSteps.fillContext(0, '*');
-        AclManagementSteps.fillRole(0, '!CUSTOM_ROLE2');
-        AclManagementSteps.selectPolicy(0, 'allow');
         // and try to save it.
         AclManagementSteps.saveRule(0);

package/integration/setup/aclmanagement/delete-rule.spec.js CHANGED Viewed

@@ -1,6 +1,7 @@
 import {AclManagementSteps} from "../../../steps/setup/acl-management-steps";
-import {ACL} from "../../../steps/setup/acl-management-steps";
+import {ACL_VIEW} from "../../../steps/setup/acl-management-steps";
 import {ModalDialogSteps} from "../../../steps/modal-dialog-steps";
+import {ApplicationSteps} from "../../../steps/application-steps";
 describe('ACL Management: delete rule', () => {
@@ -18,6 +19,7 @@ describe('ACL Management: delete rule', () => {
         cy.enableAutocomplete(repositoryId);
         AclManagementSteps.importRules(repositoryId);
         AclManagementSteps.visit();
+        ApplicationSteps.geLoader().should('not.exist');
         // ensure rules are rendered
         AclManagementSteps.getAclRules().should('have.length.gt', 0);
     });
@@ -41,6 +43,6 @@ describe('ACL Management: delete rule', () => {
         // Then I expect the rule to be removed from the list
         ModalDialogSteps.getDialog().should('not.exist');
         AclManagementSteps.getAclRules().should('have.length', 4);
-        AclManagementSteps.checkRules([ACL[0], ACL[1], ACL[2], ACL[3]]);
+        AclManagementSteps.checkStatementRules([ACL_VIEW[0], ACL_VIEW[1], ACL_VIEW[2], ACL_VIEW[3]]);
     });
 });

package/integration/setup/aclmanagement/edit-rule.spec.js CHANGED Viewed

@@ -1,5 +1,6 @@
 import {AclManagementSteps} from "../../../steps/setup/acl-management-steps";
-import {ACL} from "../../../steps/setup/acl-management-steps";
+import {ACL_VIEW} from "../../../steps/setup/acl-management-steps";
+import {ApplicationSteps} from "../../../steps/application-steps";
 describe('ACL Management: edit rule', () => {
@@ -17,6 +18,7 @@ describe('ACL Management: edit rule', () => {
         cy.enableAutocomplete(repositoryId);
         AclManagementSteps.importRules(repositoryId);
         AclManagementSteps.visit();
+        ApplicationSteps.geLoader().should('not.exist');
         // ensure rules are rendered
         AclManagementSteps.getAclRules().should('have.length.gt', 0);
     });
@@ -50,7 +52,7 @@ describe('ACL Management: edit rule', () => {
             predicate: '*',
             object: '"test aber auf Deutsch"@en',
             context: '<http://example.com/graph1>',
-            role: 'CUSTOM_ROLE3',
+            role: 'ROLE3',
             policy: 'deny'
         });
         AclManagementSteps.checkIfRuleSavingIsAllowed(2);
@@ -58,7 +60,7 @@ describe('ACL Management: edit rule', () => {
         AclManagementSteps.cancelRuleEditing(2);
         // Then I expect that the rule will be opened in preview mode again with the same values
         AclManagementSteps.getAclRules().should('have.length', 5);
-        AclManagementSteps.checkRules(ACL);
+        AclManagementSteps.checkStatementRules(ACL_VIEW);
         // When I edit the rule again
         AclManagementSteps.editRule(2);
         AclManagementSteps.fillSubject(2, '<urn:Me>');
@@ -68,18 +70,21 @@ describe('ACL Management: edit rule', () => {
         AclManagementSteps.fillContext(2, '*');
         AclManagementSteps.fillRole(2, 'TEST');
         AclManagementSteps.selectPolicy(2, 'allow');
+        AclManagementSteps.selectOperation(2, 'write');
         // And I save the rule
         AclManagementSteps.saveRule(2);
         // Then I expect the rule to be saved with the new data
         const editedRule = {
+            scope: "statement",
+            policy: 'allow',
+            role: 'TEST',
+            operation: "write",
             subject: '<urn:Me>',
             predicate: '<http://www.w3.org/1999/02/22-rdf-syntax-ns#>',
             object: '*',
-            context: '*',
-            role: 'TEST',
-            policy: 'allow'
+            context: '*'
         };
-        AclManagementSteps.checkRules([ACL[0], ACL[1], editedRule, ACL[3], ACL[4]]);
+        AclManagementSteps.checkStatementRules([ACL_VIEW[0], ACL_VIEW[1], editedRule, ACL_VIEW[3], ACL_VIEW[4]]);
     });
 });

package/integration/setup/aclmanagement/render-rules.spec.js CHANGED Viewed

@@ -1,5 +1,6 @@
 import {AclManagementSteps} from "../../../steps/setup/acl-management-steps";
-import {ACL} from "../../../steps/setup/acl-management-steps";
+import {ACL_VIEW} from "../../../steps/setup/acl-management-steps";
+import {ApplicationSteps} from "../../../steps/application-steps";
 describe('ACL Management: render rules', () => {
@@ -16,6 +17,7 @@ describe('ACL Management: render rules', () => {
             cy.presetRepository(repositoryId);
             cy.initializeRepository(repositoryId);
             AclManagementSteps.visit();
+            ApplicationSteps.geLoader().should('not.exist');
         });
         it('Should render empty ACL rules table', () => {
@@ -42,7 +44,7 @@ describe('ACL Management: render rules', () => {
         it('Should render ACL rules in a table', () => {
             AclManagementSteps.getAclRules().should('have.length', 5);
             AclManagementSteps.getAddFirstRuleButton().should('be.visible');
-            AclManagementSteps.checkRules(ACL);
+            AclManagementSteps.checkStatementRules(ACL_VIEW);
         });
     });
 });

package/integration/setup/aclmanagement/reorder-rules.spec.js CHANGED Viewed

@@ -1,5 +1,6 @@
 import {AclManagementSteps} from "../../../steps/setup/acl-management-steps";
-import {ACL} from "../../../steps/setup/acl-management-steps";
+import {ACL_VIEW} from "../../../steps/setup/acl-management-steps";
+import {ApplicationSteps} from "../../../steps/application-steps";
 describe('ACL Management: reorder rules', () => {
@@ -16,17 +17,18 @@ describe('ACL Management: reorder rules', () => {
         cy.initializeRepository(repositoryId);
         AclManagementSteps.importRules(repositoryId);
         AclManagementSteps.visit();
+        ApplicationSteps.geLoader().should('not.exist');
         // ensure rules are rendered
         AclManagementSteps.getAclRules().should('have.length.gt', 0);
     });
     it('Should move rule up', () => {
         AclManagementSteps.moveRuleUp(1);
-        AclManagementSteps.checkRules([ACL[1], ACL[0], ACL[2], ACL[3], ACL[4]]);
+        AclManagementSteps.checkStatementRules([ACL_VIEW[1], ACL_VIEW[0], ACL_VIEW[2], ACL_VIEW[3], ACL_VIEW[4]]);
     });
     it('Should move rule down', () => {
         AclManagementSteps.moveRuleDown(1);
-        AclManagementSteps.checkRules([ACL[0], ACL[2], ACL[1], ACL[3], ACL[4]]);
+        AclManagementSteps.checkStatementRules([ACL_VIEW[0], ACL_VIEW[2], ACL_VIEW[1], ACL_VIEW[3], ACL_VIEW[4]]);
     });
 });

package/integration/setup/aclmanagement/revert-rules.spec.js CHANGED Viewed

@@ -1,4 +1,4 @@
-import {ACL, AclManagementSteps} from "../../../steps/setup/acl-management-steps";
+import {ACL_VIEW, AclManagementSteps} from "../../../steps/setup/acl-management-steps";
 import {ApplicationSteps} from "../../../steps/application-steps";
 import {ModalDialogSteps} from "../../../steps/modal-dialog-steps";
@@ -18,13 +18,14 @@ describe('ACL Management: revert rules', () => {
         cy.enableAutocomplete(repositoryId);
         AclManagementSteps.importRules(repositoryId);
         AclManagementSteps.visit();
+        ApplicationSteps.geLoader().should('not.exist');
         // ensure rules are rendered
         AclManagementSteps.getAclRules().should('have.length.gt', 0);
     });
     it('Should be able to revert changes in the ACL', () => {
         // Given I have opened ACL management page
-        AclManagementSteps.checkRules(ACL);
+        AclManagementSteps.checkStatementRules(ACL_VIEW);
         // When I add a new rule
         AclManagementSteps.addRule(1);
         AclManagementSteps.fillSubject(2, '<urn:John>');
@@ -52,7 +53,7 @@ describe('ACL Management: revert rules', () => {
         // Then I expect that all changes in the ACL should be reverted
         ApplicationSteps.getSuccessNotifications().should('be.visible');
         AclManagementSteps.getAclRules().should('have.length', 5);
-        AclManagementSteps.checkRules(ACL);
+        AclManagementSteps.checkStatementRules(ACL_VIEW);
         // And the model should become pristine again after the revert
         // I should be able to navigate away from the page without any confirmation
         ApplicationSteps.openImportPage();

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

@@ -0,0 +1,220 @@
+import {AclManagementSteps} from "../../../steps/setup/acl-management-steps";
+import {ApplicationSteps} from "../../../steps/application-steps";
+describe('ACL Management: rule scopes', () => {
+    let repositoryId;
+    afterEach(() => {
+        cy.deleteRepository(repositoryId);
+    });
+    beforeEach(() => {
+        repositoryId = 'acl-management-' + Date.now();
+        cy.createRepository({id: repositoryId});
+        cy.presetRepository(repositoryId);
+        cy.initializeRepository(repositoryId);
+        cy.enableAutocomplete(repositoryId);
+        AclManagementSteps.visit();
+        ApplicationSteps.geLoader().should('not.exist');
+    });
+    it('Should render empty tabs', () => {
+        // I expect 4 tabs
+        AclManagementSteps.getAclTabs().should('have.length', 4);
+        // I expect empty rules table
+        AclManagementSteps.getAclTable().should('be.visible');
+        AclManagementSteps.getAclTabs().should('be.visible');
+        AclManagementSteps.getNoDataMessage().should('be.visible');
+        AclManagementSteps.getActiveTab().should('have.text', 'Statement ');
+        // When I select Clear graph tab
+        AclManagementSteps.selectTab(1);
+        // I expect empty rules table
+        AclManagementSteps.getAclTabs().should('be.visible');
+        AclManagementSteps.getNoDataMessage().should('be.visible');
+        AclManagementSteps.getActiveTab().should('have.text', 'Clear graph ');
+        // When I select Plugins tab
+        AclManagementSteps.selectTab(2);
+        // I expect empty rules table
+        AclManagementSteps.getAclTabs().should('be.visible');
+        AclManagementSteps.getNoDataMessage().should('be.visible');
+        AclManagementSteps.getActiveTab().should('have.text', 'Plugin ');
+        // When I select System tab
+        AclManagementSteps.selectTab(3);
+        // I expect empty rules table
+        AclManagementSteps.getAclTabs().should('be.visible');
+        AclManagementSteps.getNoDataMessage().should('be.visible');
+        AclManagementSteps.getActiveTab().should('have.text', 'System ');
+    });
+    it('Should create rules', () => {
+        // I select Clear graph tab
+        AclManagementSteps.selectTab(1);
+        AclManagementSteps.getActiveTab().should('have.text', 'Clear graph ');
+        // I can create rule
+        AclManagementSteps.addRuleInBeginning();
+        // I fill the policy
+        AclManagementSteps.selectPolicy(0, 'deny');
+        // I fill in the role field
+        AclManagementSteps.fillRole(0, 'ROLE1');
+        // I fill in the context field
+        AclManagementSteps.fillContext(0, '*');
+        // I save the rule
+        AclManagementSteps.saveRule(0);
+        // Then the tab label is changed
+        AclManagementSteps.getActiveTab().should('contain', '*');
+        // I select Plugin tab
+        AclManagementSteps.selectTab(2);
+        AclManagementSteps.getActiveTab().should('have.text', 'Plugin ');
+        // I can create rule
+        AclManagementSteps.addRuleInBeginning();
+        // I fill the policy
+        AclManagementSteps.selectPolicy(0, 'deny');
+        // I fill in the role field
+        AclManagementSteps.fillRole(0, 'ROLE2');
+        // I select the operation
+        AclManagementSteps.selectOperation(0, 'write');
+        // I fill in the plugin field
+        AclManagementSteps.fillPlugin(0, '*');
+        // I save the rule
+        AclManagementSteps.saveRule(0);
+        // Then the tab label is changed
+        AclManagementSteps.getActiveTab().should('contain', '*');
+        // I select System tab
+        AclManagementSteps.selectTab(3);
+        AclManagementSteps.getActiveTab().should('have.text', 'System ');
+        // I can create rule
+        AclManagementSteps.addRuleInBeginning();
+        // I fill the policy
+        AclManagementSteps.selectPolicy(0, 'allow');
+        // I fill in the role field
+        AclManagementSteps.fillRole(0, 'ROLE3');
+        // I select the operation
+        AclManagementSteps.selectOperation(0, 'write');
+        // I save the rule
+        AclManagementSteps.saveRule(0);
+        // Then the tab label is changed
+        AclManagementSteps.getActiveTab().should('contain', '*');
+        // I select Statement tab
+        AclManagementSteps.selectTab(0);
+        AclManagementSteps.getActiveTab().should('have.text', 'Statement ');
+        // I can create rule
+        AclManagementSteps.addRuleInBeginning();
+        // I fill the policy
+        AclManagementSteps.selectPolicy(0, 'deny');
+        // I fill in the role field
+        AclManagementSteps.fillRole(0, 'ROLE4');
+        // I select the operation
+        AclManagementSteps.selectOperation(0, 'write');
+        // I fill in the subject field
+        AclManagementSteps.fillSubject(0, '*');
+        // I fill in the predicate field
+        AclManagementSteps.fillPredicate(0, '*');
+        // I fill in the object field
+        AclManagementSteps.fillObject(0, '*');
+        // I fill in the context field
+        AclManagementSteps.fillContext(0, '*');
+        // I save the rule
+        AclManagementSteps.saveRule(0);
+        // Then the tab label is changed
+        AclManagementSteps.getActiveTab().should('contain', '*');
+        cy.intercept('PUT', '/rest/repositories/acl-management-*/acl').as('putCall');
+        // And I save the ACL
+        AclManagementSteps.saveAcl();
+        // Then wait for the PUT call to occur and assert the request body
+        cy.wait('@putCall').then((interception) => {
+            const expectedPayload = [
+                {
+                    "scope": "clear_graph",
+                    "policy": "deny",
+                    "role": "CUSTOM_ROLE1",
+                    "context": "*"
+                },
+                {
+                    "scope": "plugin",
+                    "policy": "deny",
+                    "role": "CUSTOM_ROLE2",
+                    "operation": "write",
+                    "plugin": "*"
+                },
+                {
+                    "scope": "system",
+                    "policy": "allow",
+                    "role": "CUSTOM_ROLE3",
+                    "operation": "write"
+                },
+                {
+                    "scope": "statement",
+                    "policy": "deny",
+                    "role": "CUSTOM_ROLE4",
+                    "operation": "write",
+                    "subject": "*",
+                    "predicate": "*",
+                    "object": "*",
+                    "context": "*"
+                }
+            ];
+            expect(interception.request.body).to.deep.eq(expectedPayload);
+        });
+        ApplicationSteps.geLoader().should('not.exist');
+        // Then I expect the ACL to be saved
+        ApplicationSteps.getSuccessNotifications().should('be.visible');
+        // I expect to be on Statement tab
+        AclManagementSteps.getActiveTab().should('have.text', 'Statement ');
+        // I expect to have one statement rule
+        AclManagementSteps.getAclRules().should('have.length', 1);
+        const expectedStatementRule = {
+            "scope": "statement",
+            "policy": "deny",
+            "role": "ROLE4",
+            "operation": "write",
+            "subject": "*",
+            "predicate": "*",
+            "object": "*",
+            "context": "*"
+        };
+        AclManagementSteps.checkStatementRules([expectedStatementRule]);
+        // I visit Clear graph tab
+        AclManagementSteps.selectTab(1);
+        AclManagementSteps.getActiveTab().should('have.text', 'Clear graph ');
+        const expectedClearGraphRule = {
+            "scope": "clear_graph",
+            "policy": "deny",
+            "role": "ROLE1",
+            "context": "*"
+        };
+        AclManagementSteps.checkClearGraphRules([expectedClearGraphRule]);
+        // I visit Plugin tab
+        AclManagementSteps.selectTab(2);
+        AclManagementSteps.getActiveTab().should('have.text', 'Plugin ');
+        const expectedPluginRule = {
+            "scope": "plugin",
+            "policy": "deny",
+            "role": "ROLE2",
+            "operation": "write",
+            "plugin": "*"
+        };
+        AclManagementSteps.checkPluginRules([expectedPluginRule]);
+        // I visit System tab
+        AclManagementSteps.selectTab(3);
+        AclManagementSteps.getActiveTab().should('have.text', 'System ');
+        const expectedSystemRule = {
+            "scope": "system",
+            "policy": "allow",
+            "role": "ROLE3",
+            "operation": "write"
+        };
+        AclManagementSteps.checkSystemRules([expectedSystemRule]);
+    });
+});

package/integration/setup/aclmanagement/update-rules.spec.js CHANGED Viewed

@@ -1,4 +1,4 @@
-import {ACL, AclManagementSteps} from "../../../steps/setup/acl-management-steps";
+import {ACL_VIEW, AclManagementSteps} from "../../../steps/setup/acl-management-steps";
 import {ApplicationSteps} from "../../../steps/application-steps";
 import {ModalDialogSteps} from "../../../steps/modal-dialog-steps";
@@ -18,21 +18,23 @@ describe('ACL Management: update rules', () => {
         cy.enableAutocomplete(repositoryId);
         AclManagementSteps.importRules(repositoryId);
         AclManagementSteps.visit();
+        ApplicationSteps.geLoader().should('not.exist');
         // ensure rules are rendered
         AclManagementSteps.getAclRules().should('have.length.gt', 0);
     });
     it('Should be able to edit and save ACL', () => {
         // Given I have opened ACL management page
-        AclManagementSteps.checkRules(ACL);
+        AclManagementSteps.checkStatementRules(ACL_VIEW);
         // When I add a new rule
         AclManagementSteps.addRule(1);
         AclManagementSteps.fillSubject(2, '<urn:John>');
         AclManagementSteps.fillPredicate(2, '*');
         AclManagementSteps.fillObject(2, '*');
         AclManagementSteps.fillContext(2, '*');
-        AclManagementSteps.fillRole(2, 'CUSTOM_ROLE1');
+        AclManagementSteps.fillRole(2, 'ROLE1');
         AclManagementSteps.selectPolicy(2, 'deny');
+        AclManagementSteps.selectOperation(2, 'write');
         AclManagementSteps.saveRule(2);
         // And I edit an existing rule
         AclManagementSteps.editRule(1);
@@ -40,38 +42,44 @@ describe('ACL Management: update rules', () => {
         AclManagementSteps.fillPredicate(1, '*');
         AclManagementSteps.fillObject(1, '*');
         AclManagementSteps.fillContext(1, '*');
-        AclManagementSteps.fillRole(1, 'CUSTOM_TEST');
+        AclManagementSteps.fillRole(1, 'TEST');
         AclManagementSteps.selectPolicy(1, 'allow');
+        AclManagementSteps.selectOperation(1, 'write');
         AclManagementSteps.saveRule(1);
         // And I delete an existing rule
         AclManagementSteps.deleteRule(5);
         ModalDialogSteps.clickOnConfirmButton();
         // And I save the ACL list
         AclManagementSteps.saveAcl();
+        ApplicationSteps.geLoader().should('not.exist');
         // Then I expect the ACL to be saved
         ApplicationSteps.getSuccessNotifications().should('be.visible');
         AclManagementSteps.getAclRules().should('have.length', 5);
         const editedRule = {
+            "scope": "statement",
+            "policy": "deny",
+            "role": "ROLE1",
+            "operation": "write",
             "subject": "<urn:John>",
             "predicate": "*",
             "object": "*",
             "context": "*",
-            "role": "CUSTOM_ROLE1",
-            "policy": "deny",
             "moveUp": true,
             "moveDown": true
         };
         const newRule = {
+            "scope": "statement",
+            "policy": "allow",
+            "role": "TEST",
+            "operation": "write",
             "subject": "<urn:Me>",
             "predicate": "*",
             "object": "*",
             "context": "*",
-            "role": "CUSTOM_TEST",
-            "policy": "allow",
             "moveUp": true,
             "moveDown": true
         };
-        AclManagementSteps.checkRules([ACL[0], newRule, editedRule, ACL[2], ACL[3]]);
+        AclManagementSteps.checkStatementRules([ACL_VIEW[0], newRule, editedRule, ACL_VIEW[2], ACL_VIEW[3]]);
     });
     it('Should prevent leaving the page when there is new rule added', () => {

package/package.json CHANGED Viewed

@@ -1,6 +1,6 @@
 {
     "name": "graphdb-workbench-tests",
-    "version": "2.6.0-TR5",
+    "version": "2.6.0-TR6",
     "description": "Cypress tests for GraphDB workbench",
     "scripts": {
         "start": "cypress open",

package/steps/application-steps.js CHANGED Viewed

@@ -25,4 +25,8 @@ export class ApplicationSteps {
     static openImportPage() {
         cy.get('.main-menu .menu-element-root[href=import]').click();
     }
+    static geLoader() {
+        return cy.get('.ot-loader-new-content');
+    }
 }

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

@@ -57,6 +57,18 @@ export class AclManagementSteps {
         return this.getAclTable().find('.no-data');
     }
+    static getAclTabs() {
+        return cy.get('.nav-tabs.acl-tabs .nav-item');
+    }
+    static getActiveTab() {
+        return this.getAclTabs().find('.active');
+    }
+    static selectTab(index) {
+        return this.getAclTabs().eq(index).click();
+    }
     static addRuleInBeginning() {
         this.getAddFirstRuleButton().click();
     }
@@ -106,7 +118,7 @@ export class AclManagementSteps {
     }
     static getSubjectField(index) {
-        return this.getRule(index).find('.subject-cell input');
+        return this.getRule(index).find('.subject-cell textarea');
     }
     static fillSubject(index, value) {
@@ -114,7 +126,7 @@ export class AclManagementSteps {
     }
     static getPredicateField(index) {
-        return this.getRule(index).find('.predicate-cell input');
+        return this.getRule(index).find('.predicate-cell textarea');
     }
     static fillPredicate(index, value) {
@@ -122,7 +134,7 @@ export class AclManagementSteps {
     }
     static getObjectField(index) {
-        return this.getRule(index).find('.object-cell input');
+        return this.getRule(index).find('.object-cell textarea');
     }
     static fillObject(index, value) {
@@ -130,7 +142,7 @@ export class AclManagementSteps {
     }
     static getContextField(index) {
-        return this.getRule(index).find('.context-cell input');
+        return this.getRule(index).find('.context-cell textarea');
     }
     static fillContext(index, value) {
@@ -145,6 +157,14 @@ export class AclManagementSteps {
         this.getRoleField(index).clear().type(value);
     }
+    static getPluginField(index) {
+        return this.getRule(index).find('.plugin-cell textarea');
+    }
+    static fillPlugin(index, value) {
+        this.getPluginField(index).clear().type(value);
+    }
     static getPolicySelectorField(index) {
         return this.getRule(index).find('.policy-cell select');
     }
@@ -153,6 +173,14 @@ export class AclManagementSteps {
         this.getPolicySelectorField(index).select(value);
     }
+    static getOperationSelectorField(index) {
+        return this.getRule(index).find('.operation-cell select');
+    }
+    static selectOperation(index, value) {
+        this.getOperationSelectorField(index).select(value);
+    }
     static getMoveUpButtons() {
         return this.getAclTable().find('.move-up-btn');
     }
@@ -189,7 +217,29 @@ export class AclManagementSteps {
         this.getCancelAclSavingButton().click();
     }
-    static checkRules(rules = []) {
+    static checkStatementRules(rules = []) {
+        rules.forEach((rule, index) => {
+            AclManagementSteps.getRule(index).within(() => {
+                cy.get('td:nth-child(1)').should('contain.text', index);
+                const moveUpVisibilityCommand = index > 0 ? 'be.visible' : 'not.exist';
+                cy.get('td:nth-child(2)').scrollIntoView().find('.move-up-btn').should(moveUpVisibilityCommand);
+                const moveDownVisibilityCommand = index < rules.length - 1 ? 'be.visible' : 'not.exist';
+                cy.get('td:nth-child(2)').scrollIntoView().find('.move-down-btn').should(moveDownVisibilityCommand);
+                cy.get('td:nth-child(3)').should('contain.text', rule.policy);
+                cy.get('td:nth-child(4)').should('contain.text', rule.role);
+                cy.get('td:nth-child(5)').should('contain.text', rule.operation);
+                cy.get('td:nth-child(6)').should('contain.text', rule.subject);
+                cy.get('td:nth-child(7)').should('contain.text', rule.predicate);
+                cy.get('td:nth-child(8)').should('contain.text', rule.object);
+                cy.get('td:nth-child(9)').should('contain.text', rule.context);
+                cy.get('td:nth-child(10)').scrollIntoView().find('.delete-rule-btn').should('be.visible');
+                cy.get('td:nth-child(10)').scrollIntoView().find('.edit-rule-btn').should('be.visible');
+                cy.get('td:nth-child(10)').scrollIntoView().find('.add-rule-btn').should('be.visible');
+            });
+        });
+    }
+    static checkClearGraphRules(rules = []) {
         rules.forEach((rule, index) => {
             AclManagementSteps.getRule(index).within(() => {
                 cy.get('td:nth-child(1)').should('contain.text', index);
@@ -197,15 +247,49 @@ export class AclManagementSteps {
                 cy.get('td:nth-child(2)').scrollIntoView().find('.move-up-btn').should(moveUpVisibilityCommand);
                 const moveDownVisibilityCommand = index < rules.length - 1 ? 'be.visible' : 'not.exist';
                 cy.get('td:nth-child(2)').scrollIntoView().find('.move-down-btn').should(moveDownVisibilityCommand);
-                cy.get('td:nth-child(3)').should('contain.text', rule.subject);
-                cy.get('td:nth-child(4)').should('contain.text', rule.predicate);
-                cy.get('td:nth-child(5)').should('contain.text', rule.object);
-                cy.get('td:nth-child(6)').should('contain.text', rule.context);
-                cy.get('td:nth-child(7)').should('contain.text', rule.role);
-                cy.get('td:nth-child(8)').should('contain.text', rule.policy);
-                cy.get('td:nth-child(9)').scrollIntoView().find('.delete-rule-btn').should('be.visible');
-                cy.get('td:nth-child(9)').scrollIntoView().find('.edit-rule-btn').should('be.visible');
-                cy.get('td:nth-child(9)').scrollIntoView().find('.add-rule-btn').should('be.visible');
+                cy.get('td:nth-child(3)').should('contain.text', rule.policy);
+                cy.get('td:nth-child(4)').should('contain.text', rule.role);
+                cy.get('td:nth-child(5)').should('contain.text', rule.context);
+                cy.get('td:nth-child(6)').scrollIntoView().find('.delete-rule-btn').should('be.visible');
+                cy.get('td:nth-child(6)').scrollIntoView().find('.edit-rule-btn').should('be.visible');
+                cy.get('td:nth-child(6)').scrollIntoView().find('.add-rule-btn').should('be.visible');
+            });
+        });
+    }
+    static checkPluginRules(rules = []) {
+        rules.forEach((rule, index) => {
+            AclManagementSteps.getRule(index).within(() => {
+                cy.get('td:nth-child(1)').should('contain.text', index);
+                const moveUpVisibilityCommand = index > 0 ? 'be.visible' : 'not.exist';
+                cy.get('td:nth-child(2)').scrollIntoView().find('.move-up-btn').should(moveUpVisibilityCommand);
+                const moveDownVisibilityCommand = index < rules.length - 1 ? 'be.visible' : 'not.exist';
+                cy.get('td:nth-child(2)').scrollIntoView().find('.move-down-btn').should(moveDownVisibilityCommand);
+                cy.get('td:nth-child(3)').should('contain.text', rule.policy);
+                cy.get('td:nth-child(4)').should('contain.text', rule.role);
+                cy.get('td:nth-child(5)').should('contain.text', rule.operation);
+                cy.get('td:nth-child(6)').should('contain.text', rule.plugin);
+                cy.get('td:nth-child(7)').scrollIntoView().find('.delete-rule-btn').should('be.visible');
+                cy.get('td:nth-child(7)').scrollIntoView().find('.edit-rule-btn').should('be.visible');
+                cy.get('td:nth-child(7)').scrollIntoView().find('.add-rule-btn').should('be.visible');
+            });
+        });
+    }
+    static checkSystemRules(rules = []) {
+        rules.forEach((rule, index) => {
+            AclManagementSteps.getRule(index).within(() => {
+                cy.get('td:nth-child(1)').should('contain.text', index);
+                const moveUpVisibilityCommand = index > 0 ? 'be.visible' : 'not.exist';
+                cy.get('td:nth-child(2)').scrollIntoView().find('.move-up-btn').should(moveUpVisibilityCommand);
+                const moveDownVisibilityCommand = index < rules.length - 1 ? 'be.visible' : 'not.exist';
+                cy.get('td:nth-child(2)').scrollIntoView().find('.move-down-btn').should(moveDownVisibilityCommand);
+                cy.get('td:nth-child(3)').should('contain.text', rule.policy);
+                cy.get('td:nth-child(4)').should('contain.text', rule.role);
+                cy.get('td:nth-child(5)').should('contain.text', rule.operation);
+                cy.get('td:nth-child(6)').scrollIntoView().find('.delete-rule-btn').should('be.visible');
+                cy.get('td:nth-child(6)').scrollIntoView().find('.edit-rule-btn').should('be.visible');
+                cy.get('td:nth-child(6)').scrollIntoView().find('.add-rule-btn').should('be.visible');
             });
         });
     }
@@ -230,45 +314,107 @@ export class AclManagementSteps {
     }
 }
-export const ACL = [
+export const ACL_VIEW = [
     {
+        "scope": "statement",
+        "policy": "allow",
+        "role": "!ROLE2",
+        "operation": "write",
         "subject": "<urn:Mary>",
         "predicate": "*",
         "object": "*",
-        "context": "*",
-        "role": "!CUSTOM_ROLE2",
-        "policy": "allow"
+        "context": "*"
     },
     {
+        "scope": "statement",
+        "policy": "deny",
+        "role": "ROLE1",
+        "operation": "read",
         "subject": "*",
         "predicate": "<http://www.w3.org/1999/02/22-rdf-syntax-ns#type>",
         "object": "*",
-        "context": "*",
-        "role": "CUSTOM_ROLE1",
-        "policy": "deny"
+        "context": "*"
     },
     {
+        "scope": "statement",
+        "policy": "deny",
+        "role": "ROLE3",
+        "operation": "read",
         "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>",
-        "role": "CUSTOM_ROLE3",
-        "policy": "deny"
+        "context": "<http://example.com/graph1>"
     },
     {
+        "scope": "statement",
+        "policy": "allow",
+        "role": "ROLE3",
+        "operation": "write",
         "subject": "*",
         "predicate": "*",
         "object": "\"15\"^^<http://www.w3.org/2001/XMLSchema#int>",
-        "context": "*",
-        "role": "CUSTOM_ROLE3",
-        "policy": "allow"
+        "context": "*"
     },
     {
+        "scope": "statement",
+        "policy": "deny",
+        "role": "ROLE4",
+        "operation": "write",
         "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": "*"
+    }
+];
+export const ACL = [
+    {
+        "scope": "statement",
+        "policy": "allow",
+        "role": "!CUSTOM_ROLE2",
+        "operation": "write",
+        "subject": "<urn:Mary>",
+        "predicate": "*",
+        "object": "*",
+        "context": "*"
+    },
+    {
+        "scope": "statement",
+        "policy": "deny",
+        "role": "CUSTOM_ROLE1",
+        "operation": "read",
+        "subject": "*",
+        "predicate": "<http://www.w3.org/1999/02/22-rdf-syntax-ns#type>",
+        "object": "*",
+        "context": "*"
+    },
+    {
+        "scope": "statement",
+        "policy": "deny",
+        "role": "CUSTOM_ROLE3",
+        "operation": "read",
+        "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>"
+    },
+    {
+        "scope": "statement",
+        "policy": "allow",
+        "role": "CUSTOM_ROLE3",
+        "operation": "write",
+        "subject": "*",
+        "predicate": "*",
+        "object": "\"15\"^^<http://www.w3.org/2001/XMLSchema#int>",
+        "context": "*"
+    },
+    {
+        "scope": "statement",
+        "policy": "deny",
         "role": "CUSTOM_ROLE4",
-        "policy": "deny"
+        "operation": "write",
+        "subject": "<urn:Cat>",
+        "predicate": "*",
+        "object": "<<<http://example.com/test> <http://www.w3.org/2000/01/rdf-schema#label> \"test aber auf Deutsch\"@de>>",
+        "context": "*"
     }
 ];

package/support/repository-commands.js CHANGED Viewed

@@ -71,12 +71,12 @@ Cypress.Commands.add('getNamespaces', (id) => {
     });
 });
-let toggleAutocomplete = (repositoryId, enable) => {
+const toggleAutocomplete = (repositoryId, enable) => {
     cy.request({
         method: 'POST',
         url: `${AUTOCOMPLETE_URL}enabled?enabled=${enable}`,
         headers: {
-            'X-GraphDB-Repository': repositoryId,
+            'X-GraphDB-Repository': repositoryId
         }
     }).then((response) => {
         cy.waitUntil(() => response && response.body === `Autocomplete was ${enable ? 'enabled' : 'disabled'}`);
@@ -84,13 +84,13 @@ let toggleAutocomplete = (repositoryId, enable) => {
     waitAutocomplete(repositoryId);
 };
-let waitAutocomplete = function (repositoryId) {
+const waitAutocomplete = function (repositoryId) {
     cy.waitUntil(() =>
         cy.request({
             method: 'GET',
             url: AUTOCOMPLETE_URL + 'status',
             headers: {
                 'X-GraphDB-Repository': repositoryId
-            },
-        }).then(response => response.status === 200 && (response.body === 'READY' || response.body === 'NONE')));
+            }
+        }).then((response) => response.status === 200 && (response.body === 'READY' || response.body === 'NONE')));
 };