graphdb-workbench-tests 2.6.0-TR7 → 2.6.0

package/fixtures/locale-en.json

@@ -166,34 +166,43 @@
                 "predicate": "Predicate",
                 "object": "Object",
                 "context": "Context",
-                "role": "Custom role",
+                "role": "ROLE1",
                 "plugin": "Plugin"
             },
             "actions": {
                 "move_up": "Move the rule up",
                 "move_down": "Move the rule down",
                 "delete_rule": "Delete rule",
-                "add_rule": "Add new rule",
+                "add_rule_first": "Add new rule in the beginning of the list",
+                "add_rule_next": "Add new rule after current rule",
                 "edit_rule": "Edit rule",
-                "apply_rule": "Apply rule",
+                "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",
@@ -856,7 +865,6 @@
     "import.label.bnodes": "BNodes",
     "import.label.datatype": "Datatype",
     "import.popover.relative.iri": "RDF data may contain relative IRIs. In order to make sense of them, they need to be resolved against a Base IRI. Typically data does not contain relative IRIs and this field may be left empty.",
-    "import.popover.context.link": "Context link is used when importing JSONLD documents only.",
     "import.alert.not.valid.iri": "Not a valid IRI!",
     "import.target.graphs": "Target graphs",
     "import.into.graphs": "Data is imported into one or more graphs. Some RDF formats may specify graphs, while others do not support that. The latter are treated as if they specify the default graph.",
@@ -942,7 +950,6 @@
     "import.last.import.settings": "Last import settings",
     "import.mode.not.supported.constraint": "This mode is not supported when importing multiple items.",
     "import.enable.replace.option": "Enable this to replace the data in one or more graphs with the imported data.",
-    "import.context.link": "Context link",
     "text.snippet.text.aria.placeholder": "# Example: rdf:predicate a rdf:Property .",
     "url.import.input.placeholder": "Data URL",
     "filesTable.interrupt.import": "Interrupt import",
@@ -1128,7 +1135,6 @@
     "required.field": "This field is required",
     "created.repo.success.msg": "The repository {{repoId}} has been created.",
     "empty.repoid.warning": "Repository ID cannot be empty",
-    "empty.context.or.frame.link": "Link cannot be empty",
     "invalid.ruleset.file.error": "Invalid rule-set file. Please upload a valid one.",
     "wrong.repo.name.error": "Wrong repo name",
     "edit.system.repo.warning": "<b>System</b> repository can't be edited",
@@ -1649,14 +1655,6 @@
     "error": "error",
     "import.rdf.data.label": "Import RDF data",
     "export.rdf.data": "Export RDF data",
-    "export.settings": "Export settings: JSON-LD",
-    "export": "Export",
-    "jsonld.mode": "JSON-LD mode",
-    "jsonld.mode.info": "JSON-LD mode allows you to choose different data formats for export",
-    "jsonld.context.link": "Context link",
-    "jsonld.frame.link": "Frame link",
-    "jsonld.frame.uri.placeholder": "http://example.com/frame.jsonld",
-    "jsonld.context.uri.placeholder": "http://example.com/context.jsonld",
     "saved.sparql.queries.label": "Saved SPARQL queries",
     "saved.sparql.queries.tooltip": "Execute a saved SPARQL query directly",
     "common.execute": "Execute",

package/fixtures/url-import-template.json

@@ -20,8 +20,7 @@
         "normalizeLanguageTags": false,
         "verifyURISyntax": true,
         "verifyRelativeURIs": true,
-        "stopOnError": true,
-        "contextLink": null
+        "stopOnError": true
     },
     "xRequestIdHeaders": null
 }

package/integration/explore/graphs.overview.spec.js

@@ -123,13 +123,4 @@ describe('Graphs overview screen validation', () => {
         YasrSteps.getResultTableHeader().should('be.visible');
         YasrSteps.getResultTableHeaderColumns().should('have.length', 5);
     });
-
-    it('Export repository in JSONLD format', () => {
-        cy.get('.export-repository-btn').click();
-        cy.get('.export-repo-format-JSONLD').click();
-        cy.get('[id=wb-JSONLD-mode]').select(5);
-        cy.get('[id=wb-JSONLD-context]').type('https://w3c.github.io/json-ld-api/tests/compact/0007-context.jsonld');
-        cy.get('[id=wb-export-JSONLD]').click();
-        cy.get('.modal-content').should('not.exist');
-    });
 });

package/integration/import/import.server.files.spec.js

@@ -10,8 +10,6 @@ describe('Import screen validation - server files', () => {
     const FILE_FOR_IMPORT = 'italian_public_schools_links.nt.gz';
     const TTLS_FOR_IMPORT = 'test_turtlestar.ttls';
     const TRIGS_FOR_IMPORT = 'test-trigstar.trigs';
-    const JSONLD_FILE_FOR_IMPORT = '0007-import-file.jsonld';
-    const JSONLD_CONTEXT = 'https://w3c.github.io/json-ld-api/tests/compact/0007-context.jsonld';
 
     beforeEach(() => {
         repositoryId = 'server-import-' + Date.now();
@@ -44,22 +42,6 @@ describe('Import screen validation - server files', () => {
             .verifyImportStatusDetails(FILE_FOR_IMPORT, [CONTEXT, BASE_URI, '"preserveBNodeIds": true,']);
     });
 
-    // for this test it is necessary to set up a whitelist to GraphDB in this way: -Dgraphdb.jsonld.whitelist=https://w3c.github.io/json-ld-api/tests/*
-    it('Test import Server files successfully with JSONLD context link settings', () => {
-        ImportSteps.selectServerFile(JSONLD_FILE_FOR_IMPORT)
-            .importServerFiles(true)
-            .fillBaseURI(BASE_URI)
-            .selectNamedGraph()
-            .fillNamedGraph(CONTEXT)
-            .expandAdvancedSettings()
-            .setContextLinkToBeVisible()
-            .enablePreserveBNodes()
-            .fillContextLink(JSONLD_CONTEXT)
-            .importFromSettingsDialog()
-            .verifyImportStatus(JSONLD_FILE_FOR_IMPORT, SUCCESS_MESSAGE)
-            .verifyImportStatusDetails(JSONLD_FILE_FOR_IMPORT, [CONTEXT, BASE_URI, '"preserveBNodeIds": true,', JSONLD_CONTEXT]);
-    });
-
     it('Test import with resetting status of imported file', () => {
         ImportSteps
             .selectServerFile(FILE_FOR_IMPORT)

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

@@ -30,7 +30,7 @@ describe('ACL Management: delete rule', () => {
         AclManagementSteps.deleteRule(0);
         // Then I expect a confirmation dialog
         ModalDialogSteps.getDialog().should('be.visible');
-        ModalDialogSteps.getDialogBody().should('contain', 'Are you sure you want to delete the selected rule #0?');
+        ModalDialogSteps.getDialogBody().should('contain', 'Are you sure you want to delete the selected rule #1?');
         // When I cancel operation
         ModalDialogSteps.clickOnCancelButton();
         // Then I expect the rule to remain in the list
@@ -38,7 +38,7 @@ describe('ACL Management: delete rule', () => {
         AclManagementSteps.getAclRules().should('have.length', 5);
         // When I try remove it again and confirm the operation
         AclManagementSteps.deleteRule(4);
-        ModalDialogSteps.getDialogBody().should('contain', 'Are you sure you want to delete the selected rule #4?');
+        ModalDialogSteps.getDialogBody().should('contain', 'Are you sure you want to delete the selected rule #5?');
         ModalDialogSteps.clickOnConfirmButton();
         // Then I expect the rule to be removed from the list
         ModalDialogSteps.getDialog().should('not.exist');

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

@@ -27,31 +27,32 @@ describe('ACL Management: rule scopes', () => {
         AclManagementSteps.getAclTable().should('be.visible');
         AclManagementSteps.getAclTabs().should('be.visible');
         AclManagementSteps.getNoDataMessage().should('be.visible');
-        AclManagementSteps.getActiveTab().should('have.text', 'Statement ');
+        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 ');
+        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 ');
+        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 ');
+        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 ');
+        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.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.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.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",
@@ -168,7 +172,8 @@ describe('ACL Management: rule scopes', () => {
         ApplicationSteps.getSuccessNotifications().should('be.visible');
 
         // I expect to be on Statement tab
-        AclManagementSteps.getActiveTab().should('have.text', 'Statement ');
+        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 = {
@@ -185,18 +190,20 @@ describe('ACL Management: rule scopes', () => {
 
         // I visit Clear graph tab
         AclManagementSteps.selectTab(1);
-        AclManagementSteps.getActiveTab().should('have.text', 'Clear graph ');
+        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.getActiveTab().should('have.text', 'Plugin');
+        AclManagementSteps.getActiveTabDirtyIcon().should('not.exist');
         const expectedPluginRule = {
             "scope": "plugin",
             "policy": "deny",
@@ -208,7 +215,8 @@ describe('ACL Management: rule scopes', () => {
 
         // I visit System tab
         AclManagementSteps.selectTab(3);
-        AclManagementSteps.getActiveTab().should('have.text', 'System ');
+        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-TR7",
+    "version": "2.6.0",
     "description": "Cypress tests for GraphDB workbench",
     "scripts": {
         "start": "cypress open",

package/steps/import-steps.js

@@ -193,20 +193,6 @@ class ImportSteps {
         return ImportSteps;
     }
 
-    static fillContextLink(contextLink) {
-        ImportSteps.getSettingsForm().find('input[name="contextLink"]').type(contextLink).should('have.value', contextLink);
-
-        return ImportSteps;
-    }
-
-    static setContextLinkToBeVisible() {
-        ImportSteps.getSettingsForm().within(() => {
-            cy.get('.contextLinkRow').invoke('attr', 'style', 'display: block !important');
-        });
-
-        return ImportSteps;
-    }
-
     static resetStatusOfUploadedFiles() {
         // Button should disappear
         cy.get('#import-server #wb-import-clearStatuses')

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();
     }
@@ -110,7 +114,7 @@ export class AclManagementSteps {
     }
 
     static getSaveRuleDisabledButton(index) {
-        return this.getRule(index).find('.save-rule-disabled-btn');
+        return this.getRule(index).find('.save-rule-btn');
     }
 
     static saveRule(index) {
@@ -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) {
@@ -317,12 +321,12 @@ export class AclManagementSteps {
 
     static checkIfRuleSavingIsForbidden(index) {
         AclManagementSteps.getSaveRuleButton(index).should('not.exist');
-        AclManagementSteps.getSaveRuleDisabledButton(index).should('be.visible');
+        AclManagementSteps.getSaveRuleDisabledButton(index).should('be.disabled');
     }
 
     static checkIfRuleSavingIsAllowed(index) {
         AclManagementSteps.getSaveRuleButton(index).should('be.visible');
-        AclManagementSteps.getSaveRuleDisabledButton(index).should('not.exist');
+        AclManagementSteps.getSaveRuleDisabledButton(index).should('be.enabled');
     }
 }
 

package/fixtures/graphdb-import/0007-import-file.jsonld

@@ -1,27 +0,0 @@
-{
-  "@graph": [
-    {
-      "@id": "http://example.org/test#chapter",
-      "http://purl.org/dc/elements/1.1/description": ["Fun"],
-      "http://purl.org/dc/elements/1.1/title": ["Chapter One"]
-    },
-    {
-      "@id": "http://example.org/test#jane",
-      "http://example.org/vocab#authored": [{"@id": "http://example.org/test#chapter"}],
-      "http://xmlns.com/foaf/0.1/name": ["Jane"]
-    },
-    {
-      "@id": "http://example.org/test#john",
-      "http://xmlns.com/foaf/0.1/name": ["John"]
-    },
-    {
-      "@id": "http://example.org/test#library",
-      "http://example.org/vocab#contains": [{
-        "@id": "http://example.org/test#book",
-        "http://example.org/vocab#contains": [ "this-is-not-an-IRI" ],
-        "http://purl.org/dc/elements/1.1/contributor": ["Writer"],
-        "http://purl.org/dc/elements/1.1/title": ["My Book"]
-      }]
-    }
-  ]
-}