graphdb-workbench-tests 2.7.0-TR16 → 2.7.0-TR18

package/fixtures/graphdb-import/more-files-with-error/import-resource-with-correct-data.jsonld

@@ -0,0 +1,8 @@
+{
+    "@context": {
+        "ab": "http://learningsparql.com/ns/addressbook#"
+    },
+    "@id": "ab:richard",
+    "ab:homeTel": "(229)276-5135",
+    "ab:email": "richard491@hotmail.com"
+}

package/fixtures/graphdb-import/more-files-with-error/import-resource-with-incorrect-data.rdf

@@ -0,0 +1,13 @@
+<?xml version="1.0"?>
+<rdf:RDF xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+	xmlns:dc="http://purl.org/dc/elements/1.1/"
+	xmlns:ex="http://example.org/stuff/1.0/">
+
+	<rdf:Description rdf:about="http://www.w3.org/TR/rdf-syntax-grammar"
+		dc:title="RDF1.1 XML Syntax">
+		<ex:editor>
+			</rdf:Description>
+		</ex:editor>
+	</rdf:Description>
+
+</rdf:RDF>

package/fixtures/graphdb-import/more-files-with-error/import-resource-with-long-error.rdf

@@ -0,0 +1,13 @@
+<?xml version="1.0"?>
+<rdf:RDF xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+	xmlns:dc="http://purl.org/dc/elements/1.1/"
+	xmlns:ex="http://example.org/stuff/1.0/">
+
+	<rdf:Description rdf:about="http://www.w3.org/TR/rdf-syntax-grammar"
+		dc:title="RDF1.1 XML Syntax">
+		<ex:looooooooooooooooooooooooooooooooongTaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaabNaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaame>
+			</rdf:Description>
+		</ex:looooooooooooooooooooooooooooooooongTaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaabNaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaame>
+	</rdf:Description>
+
+</rdf:RDF>

package/fixtures/locale-en.json

@@ -1011,9 +1011,9 @@
             },
             "on_file_size_limit": {
                 "file_import_options_info_1": "Explore other file import options - ",
-                "file_import_options_info_2": "import (opens Server files tab) or ",
+                "file_import_options_info_2": "import and the ",
                 "server_files_link": "Server files",
-                "api_link": "API"
+                "api_link": "GraphDB REST API."
             }
         },
         "import_resource_tree": {
@@ -1763,14 +1763,6 @@
     "json-ld.frame.link.info": "Specifies JSON-LD frame document as a URL. Only whitelisted URLs can be used.",
     "json-ld.frame.uri.placeholder": "http://example.com/frame.jsonld",
     "json-ld.context.uri.placeholder": "http://example.com/context.jsonld",
-    "ndjson-ld.form": "NDJSON-LD form",
-    "ndjson-ld.form.info": "Specifies the NDJSON-LD document form",
-    "ndjson-ld.context.link": "NDJSON-LD Context",
-    "ndjson-ld.context.link.info": "Specifies external NDJSON-LD context as a URL. Only whitelisted URLs can be used.",
-    "ndjson-ld.frame.link": "NDJSON-LD Frame",
-    "ndjson-ld.frame.link.info": "Specifies NDJSON-LD frame document as a URL. Only whitelisted URLs can be used.",
-    "ndjson-ld.frame.uri.placeholder": "http://example.com/frame.ndjsonld",
-    "ndjson-ld.context.uri.placeholder": "http://example.com/context.ndjsonld",
     "saved.sparql.queries.label": "Saved SPARQL queries",
     "saved.sparql.queries.tooltip": "Execute a saved SPARQL query directly",
     "common.execute": "Execute",
@@ -1865,6 +1857,19 @@
     "target.label": "Target",
     "show.blank.nodes.label": "Show Blank Nodes",
     "download.as.label": "Download as",
+    "download.as.json": "JSON",
+    "download.as.jsonld": "JSON-LD",
+    "download.as.ndjsonld": "NDJSON-LD",
+    "download.as.rdfxml": "RDF-XML",
+    "download.as.n3": "N3",
+    "download.as.ntriples": "N-Triples",
+    "download.as.nquads": "N-Quads",
+    "download.as.turtle": "Turtle",
+    "download.as.turtlestar": "Turtle*",
+    "download.as.trix": "TriX",
+    "download.as.trig": "TriG",
+    "download.as.trigstar": "TriG*",
+    "download.as.binaryrdf": "Binary RDF",
     "download.as.progress.msg": "Downloading SPARQL result",
     "visual.graph.label": "Visual graph",
     "explore.graph.visually.popover": "Click to explore the graph visually",

package/{integration-flaky → integration}/import/import-server-files-batch-operations.spec.js

@@ -11,24 +11,50 @@ describe('Import server files - Batch operations', () => {
         repositoryId = 'server-import-' + Date.now();
         cy.createRepository({id: repositoryId});
         ImportServerFilesSteps.visitServerImport(repositoryId);
-        ImportServerFilesSteps.getResources().should('have.length', 14);
+        ImportServerFilesSteps.getResources().should('have.length', 18);
     });
 
     afterEach(() => {
         cy.deleteRepository(repositoryId);
     });
 
+    it('should batch operation buttons be visible when files/directories are selected', () => {
+        // When I select a directory.
+        ImportServerFilesSteps.selectFileByName('more-files');
+
+        // Then I expect the import button be visible
+        ImportServerFilesSteps.getBatchImportButton().should('exist');
+
+        // When I deselect all files and directories
+        ImportServerFilesSteps.selectFileByName('more-files');
+
+        // Then I expect batch import button to not be visible.
+        ImportServerFilesSteps.getBatchImportButton().should('not.exist');
+
+        // When I select a file of some folder
+        ImportServerFilesSteps.selectFileByName('rdfxml.rdf');
+
+        // Then I expect batch import button to not be visible.
+        ImportServerFilesSteps.getBatchImportButton().should('exist');
+
+        // When I deselect a file of some folder
+        ImportServerFilesSteps.selectFileByName('rdfxml.rdf');
+
+        // Then I expect batch import button to not be visible.
+        ImportServerFilesSteps.getBatchImportButton().should('not.exist');
+    });
+
     it('Should be able to filter server files by status', () => {
         // When I select All files from the menu
         ImportServerFilesSteps.selectAllResources();
         // Then I should see all files selected
-        ImportServerFilesSteps.getSelectedResources().should('have.length', 14);
+        ImportServerFilesSteps.getSelectedResources().should('have.length', 18);
         // When I select None from the menu
         ImportServerFilesSteps.deselectAllResources();
         // Then I should see no files selected
         ImportServerFilesSteps.getSelectedResources().should('have.length', 0);
         // precondition for the next step
-        ImportServerFilesSteps.importFileByName(FILE_FOR_IMPORT);
+        ImportServerFilesSteps.importResourceByName(FILE_FOR_IMPORT);
         ImportSettingsDialogSteps.import();
         ImportServerFilesSteps.checkImportedResource(0, FILE_FOR_IMPORT);
         // When I select Imported from the menu
@@ -39,7 +65,7 @@ describe('Import server files - Batch operations', () => {
         // When I select Not Imported from the menu
         ImportServerFilesSteps.selectNotImportedResources();
         // Then I should see only not imported files selected
-        ImportServerFilesSteps.getSelectedResources().should('have.length', 13);
+        ImportServerFilesSteps.getSelectedResources().should('have.length', 17);
         // Deselect all for the next step
         ImportServerFilesSteps.deselectAllResources();
         ImportServerFilesSteps.getSelectedResources().should('have.length', 0);

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

@@ -1,5 +1,8 @@
 import {ImportUserDataSteps} from "../../steps/import/import-user-data-steps";
 import {ImportServerFilesSteps} from "../../steps/import/import-server-files-steps";
+import {ImportSettingsDialogSteps} from "../../steps/import/import-settings-dialog-steps";
+import {ImportResourceMessageDialog} from "../../steps/import/import-resource-message-dialog";
+import {ApplicationSteps} from "../../steps/application-steps";
 
 describe('Import server files', () => {
 
@@ -11,7 +14,7 @@ describe('Import server files', () => {
         repositoryId = 'server-import-' + Date.now();
         cy.createRepository({id: repositoryId});
         ImportServerFilesSteps.visitServerImport(repositoryId);
-        ImportServerFilesSteps.getResources().should('have.length', 14);
+        ImportServerFilesSteps.getResources().should('have.length', 18);
     });
 
     afterEach(() => {
@@ -52,7 +55,6 @@ describe('Import server files', () => {
     it('Should be able to filter the files', () => {
         // When the server files tab is loaded
         // Then I should see all the files
-        ImportServerFilesSteps.getResources().should('have.length', 14);
         // When I type in the filter filed
         ImportServerFilesSteps.typeInFilterField('007');
         // Then I should see only the files matching the filter
@@ -64,15 +66,80 @@ describe('Import server files', () => {
         // When the server files tab is loaded
         // Then I should see all the files and folders by default
         ImportServerFilesSteps.getShowAllResourceTypesButton().should('have.class', 'active');
-        ImportServerFilesSteps.getResources().should('have.length', 14);
+        ImportServerFilesSteps.getResources().should('have.length', 18);
         // When I select the folders only filter
         ImportServerFilesSteps.selectFoldersOnlyFilter();
         // Then I should see only the folders
         ImportServerFilesSteps.getShowOnlyFoldersButton().should('have.class', 'active');
-        ImportServerFilesSteps.getResources().should('have.length', 1);
+        ImportServerFilesSteps.getResources().should('have.length', 2);
         // When I select the files only filter
         ImportServerFilesSteps.selectFilesOnlyFilter();
         // Then I should see only the files
-        ImportServerFilesSteps.getResources().should('have.length', 13);
+        ImportServerFilesSteps.getResources().should('have.length', 16);
+    });
+
+    it('should be able to import the whole directory', () => {
+        // When the server files tab is loaded
+        // When I try to import a directory that contains resources with correct rdf data.
+        ImportServerFilesSteps.importResourceByName('more-files');
+        ImportSettingsDialogSteps.import();
+
+        // Then I expect all files to be successfully imported.
+        ImportServerFilesSteps.checkImportedResource(0, 'more-files', 'Imported successfully in');
+        ImportServerFilesSteps.checkImportedResource(1, 'jsonld-file.jsonld', 'Imported successfully in');
+        ImportServerFilesSteps.checkImportedResource(2, 'rdfxml.rdf', 'Imported successfully in');
+
+        // When I try to import a directory that contains resources with incorrect rdf data.
+        ImportServerFilesSteps.importResourceByName('more-files-with-error');
+        ImportSettingsDialogSteps.import();
+        // Then I expect no one file be imported.
+        ImportServerFilesSteps.checkImportedResource(0, 'more-files-with-error', 'RDF Parse Error: The element type "ex:editor" must be terminated by the matching end-ta');
+        ImportServerFilesSteps.checkImportedStatusIsEmpty('import-resource-with-correct-data.jsonld');
+        ImportServerFilesSteps.checkImportedStatusIsEmpty('import-resource-with-incorrect-data.rdf');
+
+        // When I click on a directory reset status button
+        ImportServerFilesSteps.resetResourceStatusByName('more-files');
+
+        // Then I expect all sub-resource statuses to be reset.
+        ImportServerFilesSteps.checkImportedStatusIsEmpty('more-files');
+        // TODO: When the status of a given folder is reset, all sub-folder/file statuses should be reset. This works correctly
+        // when the scenario is executed manually or if the test is run locally. For some reason, in the Jenkins environment, the status is cleared
+        // only for the folder. The next two lines are correct but are commented out to be tried again later.
+        // ImportServerFilesSteps.checkImportedStatusIsEmpty('jsonld-file.jsonld');
+        // ImportServerFilesSteps.checkImportedStatusIsEmpty('rdfxml.rdf');
+    });
+
+    it('should open error dialog', () => {
+        const importResourceName = 'import-resource-with-long-error.rdf';
+        // When I visited the server import tab,
+        // and try to import a file with wrong data that causes server to generate long error message.
+        ImportServerFilesSteps.importResourceByName(importResourceName);
+        ImportSettingsDialogSteps.import();
+
+        // I expect only part of the error be displayed,
+        ImportServerFilesSteps.checkImportedResource(0, importResourceName, 'RDF Parse Error: The element type ');
+        // and when click on that error
+        ImportServerFilesSteps.openErrorDialog(importResourceName);
+
+        // Then I expect to see dialog,
+        ImportSettingsDialogSteps.getDialog().should('be.visible');
+
+        // with full error message
+        ImportResourceMessageDialog.getMessage().should('have.value', 'RDF Parse Error: The element type "ex:looooooooooooooooooooooooooooooooongTaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaabNaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaame" must be terminated by the matching end-tag "</ex:looooooooooooooooooooooooooooooooongTaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaabNaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaame>". [line 9, column 6]');
+
+        // When I click on corner close button.
+        ImportResourceMessageDialog.clickOnCornerCloseButton();
+
+        // // Then I expect the dialog closed
+        ImportResourceMessageDialog.getDialog().should('not.exist');
+
+        // When error dialog is opened,
+        ImportServerFilesSteps.openErrorDialog(importResourceName);
+        ImportResourceMessageDialog.getDialog().should('be.visible');
+        // and I click one close button
+        ImportResourceMessageDialog.clickOnCloseButton();
+
+        // Then I expect the dialog closed
+        ImportResourceMessageDialog.getDialog().should('not.exist');
     });
 });

package/integration/import/import-view.spec.js

@@ -37,7 +37,7 @@ describe('Import view', () => {
         // When I switch to the server files tab
         ImportUserDataSteps.openServerFilesTab();
         // Then I should see the server files only
-        ImportServerFilesSteps.getResources().should('have.length', 14);
+        ImportServerFilesSteps.getResources().should('have.length', 18);
         // When I switch back to the user data tab
         ImportServerFilesSteps.openUserDataTab();
         // Then I should see the uploaded file
@@ -91,7 +91,7 @@ describe('Import view', () => {
         ImportUserDataSteps.getHelpMessage().should('exist');
 
         // When I go to server tab
-        ImportSteps.openServerFilesTab()
+        ImportSteps.openServerFilesTab();
 
         // Then help message mustn't be displayed because the resources are not empty.
         ImportServerFilesSteps.getHelpMessage().should('not.exist');

package/integration-flaky/import/import-server-files-operations.spec.js

@@ -28,7 +28,7 @@ describe('Import server files - Operations', {retries: {runMode: 2}}, () => {
     it('Should import Server files successfully without changing settings', () => {
         // Given I have opened the server files tab
         // When I select to import a file
-        ImportServerFilesSteps.importFileByName(FILE_FOR_IMPORT);
+        ImportServerFilesSteps.importResourceByName(FILE_FOR_IMPORT);
         ImportSettingsDialogSteps.import();
         // Then I should see the file imported successfully
         ImportServerFilesSteps.checkImportedResource(0, FILE_FOR_IMPORT);
@@ -39,7 +39,7 @@ describe('Import server files - Operations', {retries: {runMode: 2}}, () => {
     it('Should import files from directory successfully without changing settings', () => {
         // Given I have opened the server files tab
         // When I select to import a file
-        ImportServerFilesSteps.importFileByName(FILE_FROM_DIRECTORY_FOR_IMPORT);
+        ImportServerFilesSteps.importResourceByName(FILE_FROM_DIRECTORY_FOR_IMPORT);
         ImportSettingsDialogSteps.import();
         // Then I should see the file imported successfully
         ImportServerFilesSteps.checkImportedResource(0, FILE_FROM_DIRECTORY_FOR_IMPORT);
@@ -48,7 +48,7 @@ describe('Import server files - Operations', {retries: {runMode: 2}}, () => {
     it('Should import Server files successfully with changing settings', () => {
         // Given I have opened the server files tab
         // When I select to import a file
-        ImportServerFilesSteps.importFileByName(FILE_FOR_IMPORT);
+        ImportServerFilesSteps.importResourceByName(FILE_FOR_IMPORT);
         // And I change the settings
         ImportSettingsDialogSteps.expandAdvancedSettings();
         ImportSettingsDialogSteps.fillBaseURI(BASE_URI);
@@ -65,7 +65,7 @@ describe('Import server files - Operations', {retries: {runMode: 2}}, () => {
     it('Should import Server files successfully with JSONLD context link settings', () => {
         // Given I have opened the server files tab
         // When I select to import a file
-        ImportServerFilesSteps.importFileByName(JSONLD_FILE_FOR_IMPORT);
+        ImportServerFilesSteps.importResourceByName(JSONLD_FILE_FOR_IMPORT);
         // And I change the settings
         ImportSettingsDialogSteps.expandAdvancedSettings();
         ImportSettingsDialogSteps.fillBaseURI(BASE_URI);
@@ -82,7 +82,7 @@ describe('Import server files - Operations', {retries: {runMode: 2}}, () => {
     it('Should import Server files successfully with JSONLD default settings', () => {
         // Given I have opened the server files tab
         // When I select to import a file
-        ImportServerFilesSteps.importFileByName(JSONLD_FILE_FOR_IMPORT);
+        ImportServerFilesSteps.importResourceByName(JSONLD_FILE_FOR_IMPORT);
         // And I change the settings
         ImportSettingsDialogSteps.expandAdvancedSettings();
         ImportSettingsDialogSteps.fillBaseURI(BASE_URI);
@@ -99,11 +99,11 @@ describe('Import server files - Operations', {retries: {runMode: 2}}, () => {
     it('Should be able to reset status of imported file', () => {
         // Given I have opened the server files tab
         // And I have imported a file
-        ImportServerFilesSteps.importFileByName(FILE_FOR_IMPORT);
+        ImportServerFilesSteps.importResourceByName(FILE_FOR_IMPORT);
         ImportSettingsDialogSteps.import();
         ImportServerFilesSteps.checkImportedResource(0, FILE_FOR_IMPORT);
         // When I reset the status of the imported file
-        ImportServerFilesSteps.resetFileStatusByName(FILE_FOR_IMPORT);
+        ImportServerFilesSteps.resetResourceStatusByName(FILE_FOR_IMPORT);
         // Then Import status of the file should not be visible
         ImportServerFilesSteps.getResourceStatus(FILE_FOR_IMPORT).should('be.hidden');
     });
@@ -111,18 +111,18 @@ describe('Import server files - Operations', {retries: {runMode: 2}}, () => {
     it('Should be able to reset status of imported file from a directory', () => {
         // Given I have opened the server files tab
         // And I have imported a file
-        ImportServerFilesSteps.importFileByName(FILE_FROM_DIRECTORY_FOR_IMPORT);
+        ImportServerFilesSteps.importResourceByName(FILE_FROM_DIRECTORY_FOR_IMPORT);
         ImportSettingsDialogSteps.import();
         ImportServerFilesSteps.checkImportedResource(0, FILE_FROM_DIRECTORY_FOR_IMPORT);
         // When I reset the status of the imported file
-        ImportServerFilesSteps.resetFileStatusByName(FILE_FROM_DIRECTORY_FOR_IMPORT);
+        ImportServerFilesSteps.resetResourceStatusByName(FILE_FROM_DIRECTORY_FOR_IMPORT);
         // Then Import status of the file should not be visible
         ImportServerFilesSteps.getResourceStatus(FILE_FROM_DIRECTORY_FOR_IMPORT).should('be.hidden');
     });
 
     it('Should import turtlestar from Server files successfully without changing settings', () => {
         // Given I have opened the server files tab
-        ImportServerFilesSteps.importFileByName(TTLS_FOR_IMPORT);
+        ImportServerFilesSteps.importResourceByName(TTLS_FOR_IMPORT);
         // When I select to import a ttl file without changing settings
         ImportSettingsDialogSteps.import();
         // Then I should see the file imported successfully
@@ -132,7 +132,7 @@ describe('Import server files - Operations', {retries: {runMode: 2}}, () => {
 
     it('Should import trigstar from Server files successfully without changing settings', () => {
         // Given I have opened the server files tab
-        ImportServerFilesSteps.importFileByName(TRIGS_FOR_IMPORT);
+        ImportServerFilesSteps.importResourceByName(TRIGS_FOR_IMPORT);
         // When I select to import a trigstar file without changing settings
         ImportSettingsDialogSteps.import();
         // Then I should see the file imported successfully

package/npm-shrinkwrap.json

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

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "graphdb-workbench-tests",
-    "version": "2.7.0-TR16",
+    "version": "2.7.0-TR18",
     "description": "Cypress tests for GraphDB workbench",
     "scripts": {
         "prepack": "npm shrinkwrap",

package/steps/import/import-resource-message-dialog.js

@@ -0,0 +1,46 @@
+export class ImportResourceMessageDialog {
+
+    static getDialog() {
+        return cy.get('.import-resource-message-dialog');
+    }
+
+    static getDialogHeader() {
+        return ImportResourceMessageDialog.getDialog().find('.modal-header');
+    }
+
+    static getCornerCloseButton() {
+        return ImportResourceMessageDialog.getDialogHeader().find('.close');
+    }
+
+    static clickOnCornerCloseButton() {
+        ImportResourceMessageDialog.getCornerCloseButton().click();
+    }
+
+    static getDialogBody() {
+        return ImportResourceMessageDialog.getDialog().find('.modal-body');
+    }
+
+    static getDialogFooter() {
+        return ImportResourceMessageDialog.getDialog().find('.modal-footer');
+    }
+
+    static getCloseButton() {
+        return ImportResourceMessageDialog.getDialogFooter().find('.close-btn');
+    }
+
+    static clickOnCloseButton() {
+        ImportResourceMessageDialog.getCloseButton().click();
+    }
+
+    static getMessage() {
+        return this.getDialogBody().find('.message');
+    }
+
+    static getCopyToClipboard() {
+        return ImportResourceMessageDialog.getDialogFooter().find('.copy-to-clipboard-btn')
+    }
+
+    static copyToClipboard() {
+        ImportResourceMessageDialog.getCopyToClipboard().click();
+    }
+}

package/steps/import/import-steps.js

@@ -189,16 +189,25 @@ class ImportSteps {
         return this.getResourceByName(name).next().find('import-resource-message');
     }
 
+    static openErrorDialog(name) {
+        this.getResourceStatus(name).find('.error-message .btn').click();
+    }
+
     static getImportedResourcesStates() {
         return this.getResources().find('.import-resource-message');
     }
 
     static checkImportedResource(index, resourceName, expectedStatus) {
+        if (expectedStatus === undefined) {}
         const status = expectedStatus || 'Imported successfully';
         this.getResourceByName(resourceName).should('contain', resourceName);
         this.getResourceStatus(resourceName).should('contain', status);
     }
 
+    static checkImportedStatusIsEmpty(resourceName) {
+        this.getResourceStatus(resourceName).find('.import-resource-message').children().should('have.length', 0);
+    }
+
     static checkUserDataUploadedResource(index, resourceName) {
         // this.getResource(index).should('contain', resourceName);
         this.getResourceByName(resourceName).should('contain', resourceName);
@@ -266,7 +275,7 @@ class ImportSteps {
         this.getResource(index).find('.import-resource-action-import-btn').click();
     }
 
-    static importFileByName(name) {
+    static importResourceByName(name) {
         this.getResourceByName(name).find('.import-resource-action-import-btn').click();
     }
 
@@ -274,7 +283,7 @@ class ImportSteps {
         this.getResource(index).find('.import-resource-action-reset-btn').click();
     }
 
-    static resetFileStatusByName(name) {
+    static resetResourceStatusByName(name) {
         this.getResourceByName(name).find('.import-resource-action-reset-btn').click();
     }