graphdb-workbench-tests 2.7.0-TR6 → 2.7.0-TR8

package/fixtures/graphdb-import/more-files/jsonld-file.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/rdfxml.rdf

@@ -0,0 +1,15 @@
+<?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:fullName="Dave Beckett">
+				<ex:homePage rdf:resource="http://purl.org/net/dajobe/" />
+			</rdf:Description>
+		</ex:editor>
+	</rdf:Description>
+
+</rdf:RDF>

package/fixtures/locale-en.json

@@ -900,14 +900,11 @@
         "restore.defaults.btn": "Restore defaults",
         "abort.btn": "Abort",
         "no.files.found": "No files found",
-        "rdf.from.snippet": "Import RDF data from a text snippet",
-        "rdf.data.here": "Put your RDF data here and select its format.",
         "enable.for.auto.start": "Enable this option to start the import when you click the Import button. If it is disabled the import will be added to the list but not started automatically.",
         "auto.start": "Start import automatically",
         "data.from.url": "Import RDF data from URL",
         "supported.url.with.rdf": "URL with RDF data. Supported formats are",
         "invalid.url": "Not valid url!",
-        "format": "Format",
         "gz.zip": ", as well as their .gz versions and .zip archives",
         "error.could.not.get.files": "Could not get files; {{data}}",
         "error.could.not.stop": "Could not stop import; {{data}}",
@@ -927,19 +924,35 @@
         "show.files.only": "Show files only",
         "show.files.directories": "Show both files and directories",
         "show.directories.only": "Show directories only",
-        "type.to.filter": "Type to filter",
+        "type.to.filter": "Type to filter by name",
         "selected.items": "Import the selected items",
         "without.changing.settings": "Import without changing settings",
         "reset.last.imported": "Reset the last imported status of the selected items",
         "reset.status": "Reset status",
         "remove.selected": "Remove the selected items from the list",
         "remove.btn": "Remove",
-        "remove.confirm.msg": "Are you sure you want to remove selected files: '{{name}}'?",
+        "import.btn": "Import",
+        "remove.confirm.msg": "Are you sure you want to remove selected files: {{name}}",
         "mode.not.supported.constraint": "This mode is not supported when importing multiple items.",
         "enable.replace.option": "Enable this to replace the data in one or more graphs with the imported data.",
         "context.link": "JSON-LD context",
         "context.link.info": "Specifies external JSON-LD context as a URL. Only whitelisted URLs can be used.",
         "file.upload.progress": "{{progress}} % uploaded",
+        "text_snippet_dialog": {
+            "title": "Import RDF data from a text snippet",
+            "text_snippet": {
+                "label": "Insert your RDF data here and select its format below.",
+                "placeholder": "# Example: rdf:predicate a rdf:Property .",
+                "validation_message": "Maximum length of {{limit}} characters exceeded."
+            },
+            "auto_start": {
+                "tooltip": "Enable this option to start the import when you click the Import button. If it is disabled the import will be added to the list but not started automatically.",
+                "label": "Start import automatically"
+            },
+            "import_format_menu": {
+                "label": "Format"
+            }
+        },
         "user_data": {
             "duplicates_confirmation": {
                 "title": "Confirm files overwrite",
@@ -979,7 +992,7 @@
                 "the_property": "property"
             },
             "on_file_size_limit": {
-                "file_size_limit_info": "To import larger than {{fileSizeLimit}} MB, use the ",
+                "file_size_limit_info": "To import larger than {{fileSizeLimit}} MB files, use the ",
                 "server_files_link": "Server files",
                 "import_or_use": "import or use the",
                 "api_link": "API"
@@ -1003,7 +1016,8 @@
                 "interrupt_import": "Interrupt import",
                 "abort": "Abort"
             }
-        },"status-info": {
+        },
+        "status-info": {
             "last_import_settings": "Last import settings",
             "context": "Context",
             "replaced_graphs": "Replaced graphs",
@@ -1013,7 +1027,6 @@
             "parser_settings": "Parser settings"
         }
     },
-    "text.snippet.text.aria.placeholder": "# Example: rdf:predicate a rdf:Property .",
     "url.import.input.placeholder": "Data URL",
     "filesTable.interrupt.import": "Interrupt import",
     "core.errors.no.connected.repository.warning.msg": "Some functionalities are not available because you are not connected to any repository.",

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

@@ -1,107 +1,78 @@
-import ImportSteps from "../../steps/import/import-steps";
+import {ImportUserDataSteps} from "../../steps/import/import-user-data-steps";
+import {ImportServerFilesSteps} from "../../steps/import/import-server-files-steps";
 
-// the suite will be fixed with the next MR
-describe.skip('Import server files', () => {
+describe('Import server files', () => {
 
     let repositoryId;
 
-    const BASE_URI = 'http://purl.org/dc/elements/1.1/';
-    const CONTEXT = 'http://example.org/context';
-    const SUCCESS_MESSAGE = 'Imported successfully';
-    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();
         cy.createRepository({id: repositoryId});
-        ImportSteps.visitServerImport(repositoryId);
+        ImportServerFilesSteps.visitServerImport(repositoryId);
+        ImportServerFilesSteps.getResources().should('have.length', 14);
     });
 
     afterEach(() => {
         cy.deleteRepository(repositoryId);
     });
 
-    it('Test import Server files successfully without changing settings', () => {
-        ImportSteps.selectServerFile(FILE_FOR_IMPORT);
-        ImportSteps.importServerFiles();
-        ImportSteps.verifyImportStatus(FILE_FOR_IMPORT, SUCCESS_MESSAGE);
-        ImportSteps.verifyImportStatusDetails(FILE_FOR_IMPORT, '"preserveBNodeIds": false,');
+    it('Should be able to open the server files tab through a click on the tab', () => {
+        // Given I have visited the import page
+        ImportUserDataSteps.visit();
+        ImportUserDataSteps.getActiveTab().should('have.text', 'User data');
+        // When I switch to the server files tab
+        ImportUserDataSteps.openServerFilesTab();
+        // Then Server files tab should be active
+        cy.url().should('include', '/import#server');
+        ImportServerFilesSteps.getActiveTab().should('have.text', 'Server files');
+        ImportServerFilesSteps.getResourcesTable().should('be.visible');
     });
 
-    it('Test import Server files successfully with changing settings', () => {
-        ImportSteps.selectServerFile(FILE_FOR_IMPORT);
-        ImportSteps.importServerFiles(true);
-        ImportSteps.expandAdvancedSettings();
-        ImportSteps.fillBaseURI(BASE_URI);
-        ImportSteps.selectNamedGraph();
-        ImportSteps.fillNamedGraph(CONTEXT);
-        ImportSteps.enablePreserveBNodes();
-        ImportSteps.importFromSettingsDialog();
-        ImportSteps.verifyImportStatus(FILE_FOR_IMPORT, SUCCESS_MESSAGE);
-        ImportSteps.verifyImportStatusDetails(FILE_FOR_IMPORT, [CONTEXT, BASE_URI, '"preserveBNodeIds": true,']);
+    it('Should be able to open the server files tab through a link', () => {
+        // When I visit the import page through a direct link to the server files tab
+        cy.visit('/import#server');
+        // Then Server files tab should be active
+        cy.url().should('include', '/import#server');
+        ImportServerFilesSteps.getActiveTab().should('have.text', 'Server files');
+        ImportServerFilesSteps.getResourcesTable().should('be.visible');
     });
 
-    // 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);
-        ImportSteps.importServerFiles(true);
-        ImportSteps.expandAdvancedSettings();
-        ImportSteps.fillBaseURI(BASE_URI);
-        ImportSteps.fillContextLink(JSONLD_CONTEXT);
-        ImportSteps.selectNamedGraph();
-        ImportSteps.fillNamedGraph(CONTEXT);
-        ImportSteps.enablePreserveBNodes();
-        ImportSteps.importFromSettingsDialog();
-        ImportSteps.verifyImportStatus(JSONLD_FILE_FOR_IMPORT, SUCCESS_MESSAGE);
-        ImportSteps.verifyImportStatusDetails(JSONLD_FILE_FOR_IMPORT, [CONTEXT, BASE_URI, '"preserveBNodeIds": true,', JSONLD_CONTEXT]);
+    it('Should be able to toggle the server file import help', () => {
+        // When the page is loaded
+        // Then I should see the server files import help
+        ImportServerFilesSteps.getHelpMessage().should('be.visible');
+        // When I close the help
+        ImportServerFilesSteps.closeHelpMessage();
+        // Then the help should disappear
+        ImportServerFilesSteps.getHelpMessage().should('not.exist');
     });
 
-    it('Test import Server files successfully with JSONLD default settings', () => {
-        ImportSteps.selectServerFile(JSONLD_FILE_FOR_IMPORT);
-        ImportSteps.importServerFiles(true);
-        ImportSteps.expandAdvancedSettings();
-        ImportSteps.fillBaseURI(BASE_URI);
-        ImportSteps.selectNamedGraph();
-        ImportSteps.fillNamedGraph(CONTEXT);
-        ImportSteps.setContextLinkToBeVisible();
-        ImportSteps.enablePreserveBNodes();
-        ImportSteps.importFromSettingsDialog();
-        ImportSteps.verifyImportStatus(JSONLD_FILE_FOR_IMPORT, SUCCESS_MESSAGE);
-        ImportSteps.verifyImportStatusDetails(JSONLD_FILE_FOR_IMPORT, [CONTEXT, BASE_URI, '"preserveBNodeIds": true,']);
+    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
+        ImportServerFilesSteps.getResources().should('have.length', 1);
+        ImportServerFilesSteps.getResourceByName(JSONLD_FILE_FOR_IMPORT).should('be.visible');
     });
 
-    it('Test import Server file successfully with JSONLD, button on row, with settings', () => {
-        ImportSteps.clickImportOnRow(0);
-        ImportSteps.expandAdvancedSettings();
-        ImportSteps.fillBaseURI(BASE_URI);
-        ImportSteps.fillContextLink(JSONLD_CONTEXT);
-        ImportSteps.importFromSettingsDialog();
-        ImportSteps.verifyImportStatus(JSONLD_FILE_FOR_IMPORT, SUCCESS_MESSAGE);
-        ImportSteps.verifyImportStatusDetails(JSONLD_FILE_FOR_IMPORT, [BASE_URI, '"preserveBNodeIds": false,', JSONLD_CONTEXT]);
-    });
-
-    it('Test import with resetting status of imported file', () => {
-        ImportSteps.selectServerFile(FILE_FOR_IMPORT);
-        ImportSteps.importServerFiles();
-        ImportSteps.verifyImportStatus(FILE_FOR_IMPORT, SUCCESS_MESSAGE);
-        ImportSteps.resetStatusOfUploadedFile(FILE_FOR_IMPORT);
-        ImportSteps.verifyNoImportStatus(FILE_FOR_IMPORT);
-    });
-
-    it('Test import turtlestar from Server files successfully without changing settings', () => {
-        ImportSteps.selectServerFile(TTLS_FOR_IMPORT);
-        ImportSteps.importServerFiles();
-        ImportSteps.verifyImportStatus(TTLS_FOR_IMPORT, SUCCESS_MESSAGE);
-        ImportSteps.verifyImportStatusDetails(TTLS_FOR_IMPORT, '"preserveBNodeIds": false,');
-    });
-
-    it('Test import trigstar from Server files successfully without changing settings', () => {
-        ImportSteps.selectServerFile(TRIGS_FOR_IMPORT);
-        ImportSteps.importServerFiles();
-        ImportSteps.verifyImportStatus(TRIGS_FOR_IMPORT, SUCCESS_MESSAGE);
-        ImportSteps.verifyImportStatusDetails(TRIGS_FOR_IMPORT, '"preserveBNodeIds": false,');
+    it('Should be able to switch between files, folders and mixed list', () => {
+        // 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);
+        // 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);
+        // When I select the files only filter
+        ImportServerFilesSteps.selectFilesOnlyFilter();
+        // Then I should see only the files
+        ImportServerFilesSteps.getResources().should('have.length', 13);
     });
 });

package/integration/import/import-user-data-file-upload.spec.js

@@ -1,7 +1,7 @@
-import ImportSteps from "../../steps/import/import-steps";
 import {ModalDialogSteps} from "../../steps/modal-dialog-steps";
 import {ImportSettingsDialogSteps} from "../../steps/import/import-settings-dialog-steps";
 import {MainMenuSteps} from "../../steps/main-menu-steps";
+import {ImportUserDataSteps} from "../../steps/import/import-user-data-steps";
 
 const bnodes = `_:node0 <http://purl.org/dc/elements/1.1/title> "A new book" ;
                     \t<http://purl.org/dc/elements/1.1/creator> "A.N.Other" .`;
@@ -27,7 +27,7 @@ describe('Import user data: File upload', () => {
         repositoryId = 'user-import-' + Date.now();
         cy.createRepository({id: repositoryId});
         cy.presetRepository(repositoryId);
-        ImportSteps.visitImport('user', repositoryId);
+        ImportUserDataSteps.visitImport('user', repositoryId);
     });
 
     afterEach(() => {
@@ -37,94 +37,105 @@ describe('Import user data: File upload', () => {
 
     it('Should be able to upload and import a single unique file', () => {
         // Given there are no files uploaded yet
-        ImportSteps.getUserDataUploadedFilesTable().should('be.hidden');
+        ImportUserDataSteps.getResourcesTable().should('be.hidden');
         // When I start to upload a file
-        ImportSteps.selectFile(ImportSteps.createFile(testFiles[0], bnodes));
+        ImportUserDataSteps.selectFile(ImportUserDataSteps.createFile(testFiles[0], bnodes));
         // Then the import settings dialog should open automatically
         ImportSettingsDialogSteps.getDialog().should('be.visible');
         ImportSettingsDialogSteps.import();
         ImportSettingsDialogSteps.getDialog().should('not.exist');
         // Then I should see the uploaded file
-        ImportSteps.getUserDataUploadedFiles().should('have.length', 1);
-        ImportSteps.checkUserDataImportedResource(0, 'bnodes.ttl');
+        ImportUserDataSteps.getResources().should('have.length', 1);
+        ImportUserDataSteps.checkImportedResource(0, 'bnodes.ttl');
+    });
+
+    it('Should allow replacing graph when uploading and importing single file', () => {
+        // Given there are no files uploaded yet
+        ImportUserDataSteps.getResourcesTable().should('be.hidden');
+        // When I start to upload a file
+        ImportUserDataSteps.selectFile(ImportUserDataSteps.createFile(testFiles[0], bnodes));
+        // Then the import settings dialog should open automatically
+        ImportSettingsDialogSteps.getDialog().should('be.visible');
+        // And the option for replace graph should be active
+        ImportSettingsDialogSteps.getReplaceExistingDataCheckbox().should('be.enabled').and('not.be.checked');
     });
 
     it('Should be able to upload and import files one after the other and then override them', () => {
         // Given there are no files uploaded yet
-        ImportSteps.getUserDataUploadedFilesTable().should('be.hidden');
+        ImportUserDataSteps.getResourcesTable().should('be.hidden');
         // When I upload a file
-        ImportSteps.selectFile(ImportSteps.createFile(testFiles[0], bnodes));
+        ImportUserDataSteps.selectFile(ImportUserDataSteps.createFile(testFiles[0], bnodes));
         ImportSettingsDialogSteps.import();
         // Then I should see the uploaded file
-        ImportSteps.checkUserDataImportedResource(0, 'bnodes.ttl');
+        ImportUserDataSteps.checkImportedResource(0, 'bnodes.ttl');
         // When I upload another file
-        ImportSteps.selectFile(ImportSteps.createFile(testFiles[1], jsonld));
+        ImportUserDataSteps.selectFile(ImportUserDataSteps.createFile(testFiles[1], jsonld));
         ImportSettingsDialogSteps.import();
         // Then I should see the uploaded file - it becomes first in the list
-        ImportSteps.checkUserDataImportedResource(0, 'jsonld.jsonld');
-        ImportSteps.checkUserDataImportedResource(1, 'bnodes.ttl');
+        ImportUserDataSteps.checkImportedResource(0, 'jsonld.jsonld');
+        ImportUserDataSteps.checkImportedResource(1, 'bnodes.ttl');
         // When I override the first file
-        ImportSteps.selectFile(ImportSteps.createFile(testFiles[0], bnodes));
+        ImportUserDataSteps.selectFile(ImportUserDataSteps.createFile(testFiles[0], bnodes));
         ModalDialogSteps.clickOnConfirmButton();
         ImportSettingsDialogSteps.import();
         // Then I should see the uploaded file - it becomes first in the list
         // TODO: timestamps currently seems to not be changed on reimport
-        ImportSteps.checkUserDataImportedResource(0, 'jsonld.jsonld');
-        ImportSteps.checkUserDataImportedResource(1, 'bnodes.ttl');
+        ImportUserDataSteps.checkImportedResource(0, 'jsonld.jsonld');
+        ImportUserDataSteps.checkImportedResource(1, 'bnodes.ttl');
         // When I override the second file
-        ImportSteps.selectFile(ImportSteps.createFile(testFiles[1], jsonld));
+        ImportUserDataSteps.selectFile(ImportUserDataSteps.createFile(testFiles[1], jsonld));
         ModalDialogSteps.clickOnConfirmButton();
         ImportSettingsDialogSteps.import();
         // Then I should see the uploaded file - it becomes first in the list
-        ImportSteps.checkUserDataImportedResource(0, 'jsonld.jsonld');
-        ImportSteps.checkUserDataImportedResource(1, 'bnodes.ttl');
+        ImportUserDataSteps.checkImportedResource(0, 'jsonld.jsonld');
+        ImportUserDataSteps.checkImportedResource(1, 'bnodes.ttl');
     });
 
     it('should be able to only upload a single file without importing it', () => {
         // Given there are no files uploaded yet
-        ImportSteps.getUserDataUploadedFilesTable().should('be.hidden');
+        ImportUserDataSteps.getResourcesTable().should('be.hidden');
         // When I start to upload a file
-        ImportSteps.selectFile(ImportSteps.createFile(testFiles[0], bnodes));
+        ImportUserDataSteps.selectFile(ImportUserDataSteps.createFile(testFiles[0], bnodes));
         // Then the import settings dialog should open automatically
         ImportSettingsDialogSteps.cancelImport();
         // Then I should see the uploaded file
-        ImportSteps.getUserDataUploadedFiles().should('have.length', 1);
-        ImportSteps.checkUserDataUploadedResource(0, 'bnodes.ttl');
+        ImportUserDataSteps.getResources().should('have.length', 1);
+        ImportUserDataSteps.checkUserDataUploadedResource(0, 'bnodes.ttl');
         // And the file should really be there
         MainMenuSteps.openHomePage();
-        ImportSteps.visit();
-        ImportSteps.getUserDataUploadedFiles().should('have.length', 1);
+        ImportUserDataSteps.visit();
+        ImportUserDataSteps.getResources().should('have.length', 1);
     });
 
     it('Should be able to upload multiple unique files', () => {
         // Given there are no files uploaded yet
-        ImportSteps.getUserDataUploadedFilesTable().should('be.hidden');
+        ImportUserDataSteps.getResourcesTable().should('be.hidden');
         // When I upload a file
-        const file1 = ImportSteps.createFile(testFiles[0], bnodes);
-        const file2 = ImportSteps.createFile(testFiles[1], jsonld);
-        ImportSteps.selectFile([file1, file2]);
+        const file1 = ImportUserDataSteps.createFile(testFiles[0], bnodes);
+        const file2 = ImportUserDataSteps.createFile(testFiles[1], jsonld);
+        ImportUserDataSteps.selectFile([file1, file2]);
         // Then the import settings dialog should open automatically
         ImportSettingsDialogSteps.import();
         // Then I should see the uploaded file
-        ImportSteps.getUserDataUploadedFiles().should('have.length', 2);
-        ImportSteps.checkUserDataImportedResource(0, 'jsonld.jsonld');
-        ImportSteps.checkUserDataImportedResource(1, 'bnodes.ttl');
+        ImportUserDataSteps.getResources().should('have.length', 2);
+        ImportUserDataSteps.checkImportedResource(0, 'jsonld.jsonld');
+        ImportUserDataSteps.checkImportedResource(1, 'bnodes.ttl');
         // And the files should really be there
         MainMenuSteps.openHomePage();
-        ImportSteps.visit();
-        ImportSteps.getUserDataUploadedFiles().should('have.length', 2);
+        ImportUserDataSteps.visit();
+        ImportUserDataSteps.getResources().should('have.length', 2);
     });
 
     it('Should be able to override a single file', () => {
         // Given I have uploaded a file
-        ImportSteps.getUserDataUploadedFilesTable().should('be.hidden');
-        const file1 = ImportSteps.createFile(testFiles[0], bnodes);
-        ImportSteps.selectFile(file1);
+        ImportUserDataSteps.getResourcesTable().should('be.hidden');
+        const file1 = ImportUserDataSteps.createFile(testFiles[0], bnodes);
+        ImportUserDataSteps.selectFile(file1);
         ImportSettingsDialogSteps.import();
-        ImportSteps.getUserDataUploadedFiles().should('have.length', 1);
-        ImportSteps.checkUserDataImportedResource(0, 'bnodes.ttl');
+        ImportUserDataSteps.getResources().should('have.length', 1);
+        ImportUserDataSteps.checkImportedResource(0, 'bnodes.ttl');
         // When I upload a file with the same name
-        ImportSteps.selectFile(file1);
+        ImportUserDataSteps.selectFile(file1);
         // Then I should see a file override confirmation dialog
         ModalDialogSteps.getDialog().should('be.visible');
         // When I confirm the file override
@@ -132,52 +143,52 @@ describe('Import user data: File upload', () => {
         // Then the import settings dialog should open automatically
         ImportSettingsDialogSteps.import();
         // Then The file should be overridden
-        ImportSteps.getUserDataUploadedFiles().should('have.length', 1);
-        ImportSteps.checkUserDataImportedResource(0, 'bnodes.ttl');
+        ImportUserDataSteps.getResources().should('have.length', 1);
+        ImportUserDataSteps.checkImportedResource(0, 'bnodes.ttl');
     });
 
     it('Should be able to upload file with same name and preserve the existing file', () => {
         // Given I have uploaded a file
-        ImportSteps.getUserDataUploadedFilesTable().should('be.hidden');
-        const file1 = ImportSteps.createFile(testFiles[0], bnodes);
-        ImportSteps.selectFile(file1);
+        ImportUserDataSteps.getResourcesTable().should('be.hidden');
+        const file1 = ImportUserDataSteps.createFile(testFiles[0], bnodes);
+        ImportUserDataSteps.selectFile(file1);
         ImportSettingsDialogSteps.import();
-        ImportSteps.getUserDataUploadedFiles().should('have.length', 1);
-        ImportSteps.checkUserDataImportedResource(0, 'bnodes.ttl');
+        ImportUserDataSteps.getResources().should('have.length', 1);
+        ImportUserDataSteps.checkImportedResource(0, 'bnodes.ttl');
         // When I upload a file with the same name
-        ImportSteps.selectFile(file1);
+        ImportUserDataSteps.selectFile(file1);
         // Then I should see a file override confirmation dialog
         ModalDialogSteps.getDialog().should('be.visible');
         // When I cancel the file override
         ModalDialogSteps.clickOnCancelButton();
         ImportSettingsDialogSteps.import();
         // Then The file should not be overridden but prefixed instead
-        ImportSteps.getUserDataUploadedFiles().should('have.length', 2);
-        ImportSteps.checkUserDataImportedResource(0, 'bnodes-0.ttl');
-        ImportSteps.checkUserDataImportedResource(1, 'bnodes.ttl');
+        ImportUserDataSteps.getResources().should('have.length', 2);
+        ImportUserDataSteps.checkImportedResource(0, 'bnodes-0.ttl');
+        ImportUserDataSteps.checkImportedResource(1, 'bnodes.ttl');
         // When I upload two files, one with the same name and second new one
-        const file2 = ImportSteps.createFile(testFiles[1], jsonld);
-        ImportSteps.selectFile([file1, file2]);
+        const file2 = ImportUserDataSteps.createFile(testFiles[1], jsonld);
+        ImportUserDataSteps.selectFile([file1, file2]);
         ModalDialogSteps.getDialog().should('be.visible');
         ModalDialogSteps.clickOnCancelButton();
         ImportSettingsDialogSteps.import();
         // Then The file should not be overridden but prefixed with increased index instead
-        ImportSteps.getUserDataUploadedFiles().should('have.length', 4);
-        ImportSteps.checkUserDataImportedResource(0, 'jsonld.jsonld');
-        ImportSteps.checkUserDataImportedResource(1, 'bnodes-1.ttl');
-        ImportSteps.checkUserDataImportedResource(2, 'bnodes-0.ttl');
-        ImportSteps.checkUserDataImportedResource(3, 'bnodes.ttl');
+        ImportUserDataSteps.getResources().should('have.length', 4);
+        ImportUserDataSteps.checkImportedResource(0, 'jsonld.jsonld');
+        ImportUserDataSteps.checkImportedResource(1, 'bnodes-1.ttl');
+        ImportUserDataSteps.checkImportedResource(2, 'bnodes-0.ttl');
+        ImportUserDataSteps.checkImportedResource(3, 'bnodes.ttl');
     });
 
     it('should see error message when uploaded file has invalid format', () => {
         // Given I don't have any files uploaded yet
 
         // When I upload a file with invalid format
-        const file1 = ImportSteps.createFile(testFiles[2], jsonld);
-        ImportSteps.selectFile(file1);
+        const file1 = ImportUserDataSteps.createFile(testFiles[2], jsonld);
+        ImportUserDataSteps.selectFile(file1);
         ImportSettingsDialogSteps.import();
         // Then I should see an error message
-        ImportSteps.getUserDataUploadedFiles().should('have.length', 1);
-        ImportSteps.checkUserDataImportedResource(0, 'invalid-format.json', 'RDF Parse Error: Invalid file format');
+        ImportUserDataSteps.getResources().should('have.length', 1);
+        ImportUserDataSteps.checkImportedResource(0, 'invalid-format.json', 'RDF Parse Error: Invalid file format');
     });
 });

package/integration/import/import-user-data-settings-dialog.spec.js

@@ -1,5 +1,4 @@
-import ImportSteps from "../../steps/import/import-steps";
-import {ModalDialogSteps} from "../../steps/modal-dialog-steps";
+import {ImportUserDataSteps} from "../../steps/import/import-user-data-steps";
 
 const bnodes = `_:node0 <http://purl.org/dc/elements/1.1/title> "A new book" ;
                     \t<http://purl.org/dc/elements/1.1/creator> "A.N.Other" .`;
@@ -24,7 +23,7 @@ describe('Import user data: Import settings dialog', () => {
         repositoryId = 'user-import-' + Date.now();
         cy.createRepository({id: repositoryId});
         cy.presetRepository(repositoryId);
-        ImportSteps.visitImport('user', repositoryId);
+        ImportUserDataSteps.visitImport('user', repositoryId);
     });
 
     afterEach(() => {