graphdb-workbench-tests 2.7.2 → 2.7.3-RC1

package/fixtures/locale-en.json

@@ -1522,6 +1522,7 @@
     "password.required": "Password*",
     "my.password.placeholder": "my-password",
     "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.cluster.auth.info": "The token secret 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.edit.content.header": "Edit \"{{fileName}}\" contents",

package/integration/cluster/cluster-management.spec.js

@@ -187,6 +187,28 @@ describe('Cluster management', () => {
         ReplaceNodesDialogSteps.getDialog().should('not.exist');
         ApplicationSteps.getSuccessNotifications().should('be.visible');
     });
+
+    it('Should not see "Authentication type" while attaching remote GDB node in cluster view', () => {
+        // Given I have opened the cluster management page
+        ClusterPageSteps.visit();
+
+        // When there is no cluster configured yet
+        ClusterStubs.stubNoClusterGroupStatus();
+        ClusterStubs.stubNoClusterNodeStatus();
+        ClusterStubs.stubNoClusterConfig();
+        RemoteLocationStubs.stubAddRemoteLocation();
+        RemoteLocationStubs.stubGetRemoteLocations(0);
+
+        // When I open the create cluster dialog
+        ClusterPageSteps.getClusterPage().should('be.visible');
+        ClusterPageSteps.createCluster();
+        CreateClusterDialogSteps.getDialog().should('be.visible');
+        // And I add a remote location
+        RemoteLocationStubs.stubRemoteLocationCheck();
+        CreateClusterDialogSteps.openAddRemoteLocationDialog();
+        AddRemoteLocationDialogSteps.getDialog().should('be.visible');
+        AddRemoteLocationDialogSteps.verifyDialogBody("The token secret must be the same on all GraphDB instances. For more information on configuring the token secret, please refer to ");
+    });
 });
 
 function addRemoteLocation(location, locationsCount) {

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

@@ -124,13 +124,13 @@ describe('Import server files', () => {
         ImportServerFilesSteps.openErrorDialog(importResourceName);
 
         // Then I expect to see dialog,
-        ImportSettingsDialogSteps.getDialog().should('be.visible');
+        ImportResourceMessageDialog.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();
+        ImportResourceMessageDialog.close();
 
         // // Then I expect the dialog closed
         ImportResourceMessageDialog.getDialog().should('not.exist');

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

@@ -47,6 +47,40 @@ describe('Import user data: File upload', () => {
         // Then I should see the uploaded file
         ImportUserDataSteps.getResources().should('have.length', 1);
         ImportUserDataSteps.checkImportedResource(0, 'bnodes.ttl');
+        // When I try to import the same file again
+        ImportUserDataSteps.importFile(0);
+        // Then I should not see the upload only option
+        ImportSettingsDialogSteps.getDialog().should('be.visible');
+        ImportSettingsDialogSteps.getUploadOnlyButton().should('not.exist');
+        ImportSettingsDialogSteps.getCancelUploadButton().should('be.visible');
+        ImportSettingsDialogSteps.import();
+        ImportSettingsDialogSteps.getDialog().should('not.exist');
+        ImportUserDataSteps.getResources().should('have.length', 1);
+        ImportUserDataSteps.checkImportedResource(0, 'bnodes.ttl');
+    });
+
+    it('Should be able to cancel the file upload', () => {
+        // Given there are no files uploaded yet
+        ImportUserDataSteps.getResourcesTable().should('be.hidden');
+        // And I have selected to upload a file
+        ImportUserDataSteps.selectFile(ImportUserDataSteps.createFile(testFiles[0], bnodes));
+        ImportSettingsDialogSteps.getDialog().should('be.visible');
+        // When I cancel the file upload via the cancel button
+        ImportSettingsDialogSteps.cancelUpload();
+        // Then the file upload dialog should close
+        ImportSettingsDialogSteps.getDialog().should('not.exist');
+        // And there should be no files uploaded
+        ImportUserDataSteps.getResourcesTable().should('be.hidden');
+        // When I select to upload a file again
+        ImportUserDataSteps.selectFile(ImportUserDataSteps.createFile(testFiles[0], bnodes));
+        // Then the import settings dialog should open
+        ImportSettingsDialogSteps.getDialog().should('be.visible');
+        // And I close the file upload dialog via the close button
+        ImportSettingsDialogSteps.close();
+        // Then the file upload dialog should close
+        ImportSettingsDialogSteps.getDialog().should('not.exist');
+        // And there should be no files uploaded
+        ImportUserDataSteps.getResourcesTable().should('be.hidden');
     });
 
     it('Should allow replacing graph when uploading and importing single file', () => {
@@ -97,7 +131,7 @@ describe('Import user data: File upload', () => {
         // When I start to upload a file
         ImportUserDataSteps.selectFile(ImportUserDataSteps.createFile(testFiles[0], bnodes));
         // Then the import settings dialog should open automatically
-        ImportSettingsDialogSteps.cancelImport();
+        ImportSettingsDialogSteps.uploadOnly();
         // Then I should see the uploaded file
         ImportUserDataSteps.getResources().should('have.length', 1);
         ImportUserDataSteps.checkUserDataUploadedResource(0, 'bnodes.ttl');

package/npm-shrinkwrap.json

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

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "graphdb-workbench-tests",
-    "version": "2.7.2",
+    "version": "2.7.3-RC1",
     "description": "Cypress tests for GraphDB workbench",
     "scripts": {
         "prepack": "npm shrinkwrap",

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

@@ -1,27 +1,8 @@
-export class ImportResourceMessageDialog {
+import {ModalDialogSteps} from "../modal-dialog-steps";
 
+export class ImportResourceMessageDialog extends ModalDialogSteps {
     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');
+        return super.getDialog('.import-resource-message-dialog');
     }
 
     static getCloseButton() {
@@ -37,7 +18,7 @@ export class ImportResourceMessageDialog {
     }
 
     static getCopyToClipboard() {
-        return ImportResourceMessageDialog.getDialogFooter().find('.copy-to-clipboard-btn')
+        return ImportResourceMessageDialog.getDialogFooter().find('.copy-to-clipboard-btn');
     }
 
     static copyToClipboard() {

package/steps/import/import-settings-dialog-steps.js

@@ -1,6 +1,10 @@
 import {ModalDialogSteps} from "../modal-dialog-steps";
 
 export class ImportSettingsDialogSteps extends ModalDialogSteps {
+    static getDialog() {
+        return super.getDialog('.import-settings-modal');
+    }
+
     static getImportButton() {
         return this.getDialog().find('.import-settings-import-button');
     }
@@ -17,6 +21,22 @@ export class ImportSettingsDialogSteps extends ModalDialogSteps {
         this.getCancelImportButton().click();
     }
 
+    static getUploadOnlyButton() {
+        return this.getDialog().find('.upload-only-button');
+    }
+
+    static uploadOnly() {
+        this.getUploadOnlyButton().click();
+    }
+
+    static getCancelUploadButton() {
+        return this.getDialog().find('.cancel-btn');
+    }
+
+    static cancelUpload() {
+        this.getCancelUploadButton().click();
+    }
+
     static getSettingsForm() {
         return this.getDialog().find('.settings-form');
     }

package/steps/modal-dialog-steps.js

@@ -1,6 +1,6 @@
 export class ModalDialogSteps {
-    static getDialog() {
-        return cy.get('.modal-dialog');
+    static getDialog(cssClass = '.modal-dialog') {
+        return cy.get(cssClass);
     }
 
     static getDialogHeader() {
@@ -15,6 +15,10 @@ export class ModalDialogSteps {
         ModalDialogSteps.getCloseButton().click();
     }
 
+    static close() {
+        this.clickOnCloseButton();
+    }
+
     static getDialogBody() {
         return ModalDialogSteps.getDialog().find('.modal-body');
     }