graphdb-workbench-tests 2.8.7 → 2.8.8-RC1

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": "2.8.7",
+    "version": "2.8.8-RC1",
     "lockfileVersion": 3,
     "requires": true,
     "packages": {
         "": {
             "name": "graphdb-workbench-tests",
-            "version": "2.8.7",
+            "version": "2.8.8-RC1",
             "license": "Apache-2.0",
             "devDependencies": {
                 "cypress": "^13.3.1",

package/package.json

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

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()