graphdb-workbench-tests 3.0.1 → 3.0.2-RC1

package/fixtures/locale-en.json

@@ -194,7 +194,8 @@
             "actions": {
                 "replace_node": "Replace node",
                 "delete_node": "Delete node",
-                "cannot_delete_node": "You cannot remove more than half of the healthy nodes at the same time",
+                "cannot_delete_node": "The current node cannot be removed",
+                "cannot_replace_node": "You cannot replace this node",
                 "add_node": "Add node",
                 "add_node_tooltip": "Add node to current cluster",
                 "cancel": "Cancel",
@@ -208,6 +209,11 @@
             },
             "field_placeholders": {
                 "location": "http://my-hostname:7200"
+            },
+            "copy_to_clipboard": {
+                "copied": {
+                    "tooltip": "IRI copied"
+                }
             }
         }
     },
@@ -2467,6 +2473,9 @@
         "dates": {
             "today": "Today",
             "yesterday": "Yesterday"
+        },
+        "messages": {
+            "copied_to_clipboard": "Copied to clipboard"
         }
     },
     "common.confirm.delete": "Confirm delete",
@@ -2505,6 +2514,7 @@
     "common.show_all": "Show all",
     "common.hide": "Hide",
     "common.learn_more_in_documentation": "Learn more in the GraphDB documentation",
+    "click.to": "Click to",
     "paginator.first.page.label": "First",
     "paginator.last.page.label": "Last",
     "deactivate": "deactivate",

package/integration/graphql/edit-graphql-enpoint.spec.js

@@ -102,7 +102,7 @@ describe('Graphql: edit endpoint settings', () => {
                     "langValidate": null,
                     "langImplicit": null,
                     "langDefaultNameFetch": "NONE",
-                    "langAppendDefaultNameFetch": "true",
+                    "langAppendDefaultNameFetch": true,
                     "includeInferred": true,
                     "expandOwlSameAs": true,
                     "enableMutations": null,

package/integration/setup/autocomplete.spec.js

@@ -66,4 +66,28 @@ describe('Autocomplete ', () => {
             .should('be.visible')
             .and('not.be.disabled');
     });
+
+    it('should allow add and edit of autocomplete label', () => {
+        // Given I'm on the Autocomplete page
+        AutocompleteSteps.visit();
+        cy.wait('@get-license');
+        AutocompleteSteps.waitUntilAutocompletePageIsLoaded();
+        // The table should not contain this label
+        AutocompleteSteps.getAutocompleteLabels().should('not.contain.text', 'http://xmlns.com/foaf/0.1/name');
+
+        // When I add a label
+        AutocompleteSteps.addLabelAndLanguage('http://xmlns.com/foaf/0.1/name', 'fr');
+        // Then the list should have my new label
+        AutocompleteSteps.getAutocompleteLabels().should('contain.text', 'http://xmlns.com/foaf/0.1/name');
+
+        // When I edit the new label
+        AutocompleteSteps.editLabelOnRow(0);
+        AutocompleteSteps.typeLabelIri('http://purl.org/dc/elements/1.1/title');
+        AutocompleteSteps.saveLabel();
+        // Then the list should no longer have the old label
+        AutocompleteSteps.getAutocompleteLabels().should('not.contain.text', 'http://xmlns.com/foaf/0.1/name');
+        // And instead have the edited label
+        AutocompleteSteps.getAutocompleteLabels().should('contain.text', 'http://purl.org/dc/elements/1.1/title');
+        AutocompleteSteps.getAutocompleteLabels().should('contain.text', 'fr');
+    });
 });

package/integration/sparql-editor/saved-query/edit-query.spec.js

@@ -8,9 +8,11 @@ import {SaveQueryDialog} from "../../../steps/yasgui/save-query-dialog";
 describe('Edit saved queries', () => {
 
     let repositoryId;
+    let savedQueryName;
 
     beforeEach(() => {
         repositoryId = 'sparql-editor-' + Date.now();
+        savedQueryName = SavedQuery.generateQueryName();
         QueryStubs.stubQueryCountResponse();
         cy.createRepository({id: repositoryId});
         cy.presetRepository(repositoryId);
@@ -21,12 +23,12 @@ describe('Edit saved queries', () => {
     });
 
     afterEach(() => {
+        cy.deleteSavedQuery(savedQueryName);
         cy.deleteRepository(repositoryId);
     });
 
     it('Should prevent saving query with duplicated name', () => {
         // Given I have created a query
-        const savedQueryName = SavedQuery.generateQueryName();
         SavedQuery.create(savedQueryName);
         // When I open the saved queries popup
         YasguiSteps.showSavedQueries();
@@ -48,21 +50,35 @@ describe('Edit saved queries', () => {
         YasguiSteps.showSavedQueries();
         SavedQueriesDialog.editQueryByName(savedQueryName);
         SaveQueryDialog.getQueryField().should('have.value', 'select $s $p $o');
+        // Then I close the dialog
+        SaveQueryDialog.closeSaveQueryDialog();
+    });
+
+    // TODO skipped until .env can be updated with BE version, which includes the API changes
+    it.skip('should allow renaming saved query', () => {
+        // Given I have created a query
+        SavedQuery.create(savedQueryName);
+        // When I open the saved queries popup
+        YasguiSteps.showSavedQueries();
+        // And I edit the saved query
+        SavedQueriesDialog.editQueryByName(savedQueryName);
+        // Then the save query dialog should be opened
+        SaveQueryDialog.getQueryNameField().should('have.value', savedQueryName);
+        SaveQueryDialog.getQueryField().should('have.value', 'select *');
+        SaveQueryDialog.getIsPublicField().should('be.checked');
         // When I change the query name
-        // TODO: This currently won't work. The legacy implementation in the WB does the following:
-        // * First POST to create a new query with the new name
-        // * Then DELETE the query with the old name
-        // This is quite hackish and would require maintaining some state in the WB which is awkward.
-        // Better approach would be to think of a way to delegate this to the backend api for the edit.
-        // YasguiSteps.clearQueryNameField();
-        // savedQueryName = generateQueryName();
-        // YasguiSteps.writeQueryName(savedQueryName);
-        // YasguiSteps.saveQuery();
-        // // Then a new query should be created
-        // YasguiSteps.getSaveQueryDialog().should('not.exist');
-        // YasguiSteps.showSavedQueries();
-        // YasguiSteps.editQueryByName(savedQueryName);
-        // YasguiSteps.getQueryNameField().should('have.value', savedQueryName);
-        // YasguiSteps.getQueryField().should('have.value', 'select $s $p $o');
+        SaveQueryDialog.clearQueryNameField();
+        savedQueryName = SavedQuery.generateQueryName();
+        SaveQueryDialog.writeQueryName(savedQueryName);
+        // And try to save the query
+        SaveQueryDialog.saveQuery();
+        // Then the query should be updated
+        SaveQueryDialog.getSaveQueryDialog().should('not.exist');
+        YasguiSteps.showSavedQueries();
+        SavedQueriesDialog.editQueryByName(savedQueryName);
+        SaveQueryDialog.getQueryNameField().should('have.value', savedQueryName);
+        SaveQueryDialog.getQueryField().should('have.value', 'select *');
+        // Then I close the dialog
+        SaveQueryDialog.closeSaveQueryDialog();
     });
 });

package/npm-shrinkwrap.json

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

package/package.json

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

package/steps/setup/autocomplete-steps.js

@@ -57,11 +57,42 @@ export class AutocompleteSteps {
         return this.getAutocompletePage().find('#wb-autocomplete-addLabel');
     }
 
+    static addLabelAndLanguage(label, language) {
+        this.getAddLabelButton().click();
+        this.typeLabelIri(label);
+        this.typeLabelLanguages(language);
+        this.saveLabel();
+    }
+
+    static typeLabelIri(iri) {
+        this.getAddLabelForm().find('#wb-autocomplete-iri').click().clear().type(iri);
+    }
+
+    static typeLabelLanguages(languages) {
+        this.getAddLabelForm().find('#wb-autocomplete-languages').click().type(languages);
+    }
+
     static getAutocompleteLabels() {
         return this.getAutocompletePage().find('#wb-autocomplete-labels');
     }
 
+    static getTableRows() {
+        return cy.get('.wb-autocomplete-labels-row');
+    }
+
     static getSuccessStatusElement() {
         return cy.get('.autocomplete-status').find('.tag.tag-success.ng-binding');
     }
+
+    static getAddLabelForm() {
+        return cy.get('#addLabelForm');
+    }
+
+    static saveLabel() {
+        cy.get('#wb-autocomplete-savegraph-submit').click();
+    }
+
+    static editLabelOnRow(rowIndex) {
+        this.getTableRows().eq(rowIndex).find('.actions-bar .icon-edit').click();
+    }
 }

package/support/sparql-commands.js

@@ -1,3 +1,5 @@
+const DELETE_SAVED_QUERY_URL = '/rest/sparql/saved-queries';
+
 Cypress.Commands.add('pasteQuery', (query) => {
     // Setting the textarea and the calling setValue seems to work
     // more reliably then other strategies (see history)
@@ -12,6 +14,24 @@ Cypress.Commands.add('executeQuery', () => {
     getLoader().should('not.exist');
 });
 
+Cypress.Commands.add('deleteSavedQuery', (savedQueryName, secured = false) => {
+    const url = DELETE_SAVED_QUERY_URL + '?name=' + savedQueryName;
+    let headers = {'Content-Type': 'application/json'};
+    if (secured) {
+        const authHeader = Cypress.env('adminToken');
+        headers = {...headers,
+            'Authorization': authHeader
+        }
+    }
+    return cy.request({
+        method: 'DELETE',
+        url: url,
+        headers,
+        // Prevent Cypress from failing the test on non-2xx status codes
+        failOnStatusCode: false
+    });
+});
+
 Cypress.Commands.add('verifyResultsPageLength', (resultLength) => {
     getResultsWrapper().should('be.visible');
     getTableResultRows()