graphdb-workbench-tests 2.0.0-M3-TR3 → 2.0.0-M3-TR5

package/fixtures/locale-en.json

@@ -1175,7 +1175,7 @@
     "my.user.placeholder": "my-user",
     "password.required": "Password*",
     "my.password.placeholder": "my-password",
-    "signature.auth.info": "Signature authentication uses the token secret, which must be the same on both GraphDB instances. For more information on configuring the token secret, please refer to ",
+    "signature.auth.info": "Signature authentication uses the token secret, which must be the same on all GraphDB instances. For more information on configuring the token secret, please refer to ",
     "signature.auth.info.last": " in the documentation.",
     "update.file.content.header": "Update file contents",
     "update.file.content.placeholder": "# Update ontop repository file content",

package/integration/help/rest-api.spec.js

@@ -35,7 +35,7 @@ describe('Help / REST API', () => {
         verifyControllerListIsCollapsed(getRDF4JAPI());
 
         // Examine the import controller
-        verifyControllerOptions('repositories', 'Repository management');
+        verifyControllerOptions('repository-management-controller', 'Repository management');
     });
 
     function getSwaggerFrame() {

package/integration/repository/repositories.spec.js

@@ -373,7 +373,7 @@ describe('Repositories', () => {
         let obdaFileUpload = '';
         let ontologyFileUpload = '';
         let propertiesFileUpload = '';
-        const url = 'http://localhost:9000/rest/repositories/uploadFile';
+        const url = 'http://localhost:9000/rest/repositories/file/upload';
         const fileType = '';
         const virtualRepoName = 'virtual-repo-' + Date.now();
 
@@ -381,7 +381,7 @@ describe('Repositories', () => {
         cy.fixture('ontop/university-complete.obda', 'binary').then((file) => {
             Cypress.Blob.binaryStringToBlob(file, fileType).then((blob) => {
                 const formData = new FormData();
-                formData.set('uploadFile', blob, 'university-complete.obda');
+                formData.set('file', blob, 'university-complete.obda');
 
                 cy.form_request(url, formData).then(response => {
                     return obdaFileUpload = response.response.body.fileLocation;
@@ -392,7 +392,7 @@ describe('Repositories', () => {
             cy.fixture('ontop/university-complete.ttl', 'binary').then((file) => {
                 Cypress.Blob.binaryStringToBlob(file, fileType).then((blob) => {
                     const formData = new FormData();
-                    formData.set('uploadFile', blob, 'university-complete.ttl');
+                    formData.set('file', blob, 'university-complete.ttl');
 
                     cy.form_request(url, formData).then(response => {
                         return ontologyFileUpload = response.response.body.fileLocation;
@@ -403,7 +403,7 @@ describe('Repositories', () => {
                 cy.fixture('ontop/university-complete.properties', 'binary').then((file) => {
                     Cypress.Blob.binaryStringToBlob(file, fileType).then((blob) => {
                         const formData = new FormData();
-                        formData.set('uploadFile', blob, 'university-complete.properties');
+                        formData.set('file', blob, 'university-complete.properties');
 
                         cy.form_request(url, formData).then(response => {
                             return propertiesFileUpload = response.response.body.fileLocation;

package/package.json

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

package/support/import-commands.js

@@ -1,7 +1,8 @@
 import snippetImportTemplate from '../fixtures/snippet-import-template.json';
 
-const UPLOAD_URL = '/rest/data/import/upload/';
-const SERVER_IMPORT_URL = '/rest/data/import/server/';
+const REPOSITORIES_URL = '/rest/repositories/';
+const UPLOAD_URL = '/import/upload/';
+const SERVER_URL = '/import/server/';
 const POLL_INTERVAL = 200;
 
 Cypress.Commands.add('importRDFTextSnippet', (repositoryId, rdf, importSettings = {}) => {
@@ -10,7 +11,8 @@ Cypress.Commands.add('importRDFTextSnippet', (repositoryId, rdf, importSettings
 
     cy.request({
         method: 'POST',
-        url: UPLOAD_URL + repositoryId + '/text',
+        //url: UPLOAD_URL + repositoryId + '/text',
+        url: REPOSITORIES_URL + repositoryId + UPLOAD_URL + '/text',
         body: importData
     }).should((response) => expect(response.status).to.equal(202));
     waitServerOperation(UPLOAD_URL, repositoryId, importData.name);
@@ -24,16 +26,16 @@ Cypress.Commands.add('importServerFile', (repositoryId, fileName, importSettings
 
     cy.request({
         method: 'POST',
-        url: SERVER_IMPORT_URL + repositoryId,
+        url: REPOSITORIES_URL + repositoryId + SERVER_URL,
         body: importData
     }).should((response) => expect(response.status).to.equal(202));
-    waitServerOperation(SERVER_IMPORT_URL, repositoryId, fileName);
+    waitServerOperation(SERVER_URL, repositoryId, fileName);
 });
 
 function waitServerOperation(url, repositoryId, fileName) {
     cy.request({
         method: 'GET',
-        url: url + repositoryId,
+        url: REPOSITORIES_URL + repositoryId + url
     }).then((response) => {
         const importStatus = Cypress._.find(response.body, (importStatus) => importStatus.name === fileName);
         if (importStatus.status === 'DONE') {

package/support/settings-commands.js

@@ -8,7 +8,7 @@ Cypress.Commands.add('setDefaultUserData', () => {
     };
     cy.request({
         method: 'PATCH',
-        url: `rest/security/user/${encodeURIComponent('admin')}`,
+        url: `rest/security/users/${encodeURIComponent('admin')}`,
         headers: {
             'X-GraphDB-Password': 'root'
         },