graphdb-workbench-tests 2.6.0-TR8 → 2.6.0

package/fixtures/locale-en.json

@@ -179,22 +179,30 @@
                 "apply_rule": "Confirm rule editing",
                 "cancel_rule_editing": "Cancel rule editing",
                 "save_acl": "Save ACL",
-                "cancel_acl_saving": "Cancel"
+                "cancel_acl_saving": "Cancel",
+                "create_rule": "Create rule"
             },
             "messages": {
-                "no_data": "There are no rules defined in current repository",
+                "no_data": "There are no rules defined in current scope",
                 "invalid_form": "Fill in valid data in all fields before saving rule",
                 "delete_rule_confirmation": "Are you sure you want to delete the selected rule #{{index}}?",
                 "revert_acl_list": "This operation will revert all the changes done in the ACL. Are you sure you want to proceed?",
                 "rules_updated": "ACL was updated successfully",
                 "rules_reverted": "ACL was reverted successfully",
-                "unsaved_changes_confirmation": "You have unsaved changes. Are you sure that you want to exit?"
+                "unsaved_changes_confirmation": "You have unsaved changes. Are you sure that you want to exit?",
+                "save_acl_to_apply_rules": "Rules are not applied until saved"
             }
         },
         "errors": {
             "loading_rules": "Error during ACL rules",
             "updating_rules": "Error during ACL rules update",
             "duplicated_rules": "Every ACL rule should be unique."
+        },
+        "defaults": {
+            "asterisk": "* - Any RDF value",
+            "default": "default - The default graph",
+            "named": "named - Any named graph",
+            "all": "all - CLEAR ALL graphs"
         }
     },
     "config.name.label": "Config name",

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

@@ -52,6 +52,7 @@ describe('ACL Management: rule scopes', () => {
         // I select Clear graph tab
         AclManagementSteps.selectTab(1);
         AclManagementSteps.getActiveTab().should('have.text', 'Clear graph');
+        AclManagementSteps.getActiveTabDirtyIcon().should('not.exist');
         // I can create rule
         AclManagementSteps.addRuleInBeginning();
         // I fill the policy
@@ -59,15 +60,16 @@ describe('ACL Management: rule scopes', () => {
         // I fill in the role field
         AclManagementSteps.fillRole(0, 'ROLE1');
         // I fill in the context field
-        AclManagementSteps.fillContext(0, '*');
+        AclManagementSteps.fillContext(0, 'all');
         // I save the rule
         AclManagementSteps.saveRule(0);
         // Then the tab label is changed
-        AclManagementSteps.getActiveTab().should('contain', '*');
+        AclManagementSteps.getActiveTabDirtyIcon().should('be.visible');
 
         // I select Plugin tab
         AclManagementSteps.selectTab(2);
         AclManagementSteps.getActiveTab().should('have.text', 'Plugin');
+        AclManagementSteps.getActiveTabDirtyIcon().should('not.exist');
         // I can create rule
         AclManagementSteps.addRuleInBeginning();
         // I fill the policy
@@ -81,11 +83,12 @@ describe('ACL Management: rule scopes', () => {
         // I save the rule
         AclManagementSteps.saveRule(0);
         // Then the tab label is changed
-        AclManagementSteps.getActiveTab().should('contain', '*');
+        AclManagementSteps.getActiveTabDirtyIcon().should('be.visible');
 
         // I select System tab
         AclManagementSteps.selectTab(3);
         AclManagementSteps.getActiveTab().should('have.text', 'System');
+        AclManagementSteps.getActiveTabDirtyIcon().should('not.exist');
         // I can create rule
         AclManagementSteps.addRuleInBeginning();
         // I fill the policy
@@ -97,11 +100,12 @@ describe('ACL Management: rule scopes', () => {
         // I save the rule
         AclManagementSteps.saveRule(0);
         // Then the tab label is changed
-        AclManagementSteps.getActiveTab().should('contain', '*');
+        AclManagementSteps.getActiveTabDirtyIcon().should('be.visible');
 
         // I select Statement tab
         AclManagementSteps.selectTab(0);
         AclManagementSteps.getActiveTab().should('have.text', 'Statement');
+        AclManagementSteps.getActiveTabDirtyIcon().should('not.exist');
         // I can create rule
         AclManagementSteps.addRuleInBeginning();
         // I fill the policy
@@ -121,7 +125,7 @@ describe('ACL Management: rule scopes', () => {
         // I save the rule
         AclManagementSteps.saveRule(0);
         // Then the tab label is changed
-        AclManagementSteps.getActiveTab().should('contain', '*');
+        AclManagementSteps.getActiveTabDirtyIcon().should('be.visible');
 
         cy.intercept('PUT', '/rest/repositories/acl-management-*/acl').as('putCall');
 
@@ -134,7 +138,7 @@ describe('ACL Management: rule scopes', () => {
                     "scope": "clear_graph",
                     "policy": "deny",
                     "role": "CUSTOM_ROLE1",
-                    "context": "*"
+                    "context": "all"
                 },
                 {
                     "scope": "plugin",
@@ -169,6 +173,7 @@ describe('ACL Management: rule scopes', () => {
 
         // I expect to be on Statement tab
         AclManagementSteps.getActiveTab().should('have.text', 'Statement');
+        AclManagementSteps.getActiveTabDirtyIcon().should('not.exist');
         // I expect to have one statement rule
         AclManagementSteps.getAclRules().should('have.length', 1);
         const expectedStatementRule = {
@@ -186,17 +191,19 @@ describe('ACL Management: rule scopes', () => {
         // I visit Clear graph tab
         AclManagementSteps.selectTab(1);
         AclManagementSteps.getActiveTab().should('have.text', 'Clear graph');
+        AclManagementSteps.getActiveTabDirtyIcon().should('not.exist');
         const expectedClearGraphRule = {
             "scope": "clear_graph",
             "policy": "deny",
             "role": "ROLE1",
-            "context": "*"
+            "context": "all"
         };
         AclManagementSteps.checkClearGraphRules([expectedClearGraphRule]);
 
         // I visit Plugin tab
         AclManagementSteps.selectTab(2);
         AclManagementSteps.getActiveTab().should('have.text', 'Plugin');
+        AclManagementSteps.getActiveTabDirtyIcon().should('not.exist');
         const expectedPluginRule = {
             "scope": "plugin",
             "policy": "deny",
@@ -209,6 +216,7 @@ describe('ACL Management: rule scopes', () => {
         // I visit System tab
         AclManagementSteps.selectTab(3);
         AclManagementSteps.getActiveTab().should('have.text', 'System');
+        AclManagementSteps.getActiveTabDirtyIcon().should('not.exist');
         const expectedSystemRule = {
             "scope": "system",
             "policy": "allow",

package/package.json

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

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

@@ -69,6 +69,10 @@ export class AclManagementSteps {
         return this.getAclTabs().eq(index).click();
     }
 
+    static getActiveTabDirtyIcon() {
+        return this.getActiveTab().find('.icon-exclamation');
+    }
+
     static addRuleInBeginning() {
         this.getAddFirstRuleButton().click();
     }
@@ -122,7 +126,7 @@ export class AclManagementSteps {
     }
 
     static fillSubject(index, value) {
-        this.getSubjectField(index).clear().type(value);
+        this.getSubjectField(index).clear({force: true}).scrollIntoView().type(value);
     }
 
     static getPredicateField(index) {
@@ -130,7 +134,7 @@ export class AclManagementSteps {
     }
 
     static fillPredicate(index, value) {
-        this.getPredicateField(index).clear().type(value);
+        this.getPredicateField(index).clear({force: true}).scrollIntoView().type(value);
     }
 
     static getObjectField(index) {
@@ -138,7 +142,7 @@ export class AclManagementSteps {
     }
 
     static fillObject(index, value) {
-        this.getObjectField(index).clear().type(value);
+        this.getObjectField(index).clear({force: true}).scrollIntoView().type(value);
     }
 
     static getContextField(index) {
@@ -146,7 +150,7 @@ export class AclManagementSteps {
     }
 
     static fillContext(index, value) {
-        this.getContextField(index).clear().type(value);
+        this.getContextField(index).clear({force: true}).scrollIntoView().type(value);
     }
 
     static getRoleField(index) {