graphdb-workbench-tests 2.4.0-RC6 → 2.4.0-RC7

package/integration/explore/similarity.spec.js

@@ -269,6 +269,7 @@ describe('Similarity screen validation', () => {
 
     function disableSimilarityPlugin() {
         const disableSimilarityPluginQuery = 'INSERT DATA { <u:a> <http://www.ontotext.com/owlim/system#stopplugin> \'similarity\' . }';
+        cy.waitUntilQueryIsVisible();
         cy.pasteQuery(disableSimilarityPluginQuery);
         cy.executeQuery();
     }
@@ -411,6 +412,7 @@ describe('Similarity screen validation', () => {
         let shouldAnalogicalTabBeVisible = (isPredication ? '' : 'not.') + 'be.visible';
         getAnalogicalQueryTab().should(shouldAnalogicalTabBeVisible);
         if (isPredication) {
+            cy.waitUntilQueryIsVisible();
             cy.verifyQueryAreaContains('SELECT ?entity ?score {');
         }
     }
@@ -421,6 +423,7 @@ describe('Similarity screen validation', () => {
             'filter(isLiteral(?documentText)) \n' +
             '}order by asc(str(?documentID))';
 
+        cy.waitUntilQueryIsVisible();
         cy.pasteQuery(MODIFIED_DATA_QUERY);
         cy.get('.test-query-btn').click();
         cy.get('.sparql-loader').should('not.exist');
@@ -430,6 +433,7 @@ describe('Similarity screen validation', () => {
 
     function changeSearchQuery() {
         getSearchQueryTab().scrollIntoView().should('be.visible').click();
+        cy.waitUntilQueryIsVisible();
         cy.pasteQuery(MODIFIED_SEARCH_QUERY);
     }
 
@@ -438,6 +442,7 @@ describe('Similarity screen validation', () => {
             .scrollIntoView()
             .should('be.visible').click()
             .then(() => {
+                cy.waitUntilQueryIsVisible();
                 cy.pasteQuery(MODIFIED_ANALOGICAL_QUERY);
             });
     }
@@ -476,6 +481,7 @@ describe('Similarity screen validation', () => {
 
     function verifyQueryIsChanged() {
         const query = 'OPTIONAL { ?result <http://dbpedia.org/ontology/birthPlace> ?birthDate .';
+        cy.waitUntilQueryIsVisible();
         cy.verifyQueryAreaContains(query);
     }
 });

package/integration/setup/my-settings.spec.js

@@ -128,12 +128,12 @@ describe('My Settings', () => {
 
                 //clear default query and paste a new one that will generate more than 1000 results
                 cy.get('#queryEditor .CodeMirror').find('textarea')
-                    .type(Cypress.env('modifierKey') + 'a{backspace}', {force: true})
-                    .then(() => {
-                        cy.get('#queryEditor .CodeMirror').find('textarea')
-                            .invoke('val', testResultCountQuery).trigger('change', {force: true})
-                            .then(() => cy.verifyQueryAreaContains(testResultCountQuery));
-                    });
+                    .type(Cypress.env('modifierKey') + 'a{backspace}', {force: true});
+
+                cy.get('#queryEditor .CodeMirror').find('textarea')
+                    .invoke('val', testResultCountQuery).trigger('change', {force: true})
+                cy.waitUntilQueryIsVisible();
+                cy.verifyQueryAreaContains(testResultCountQuery);
 
                 cy.get('#wb-sparql-runQuery')
                     .should('be.visible')

package/integration/sparql/sparql.menu.spec.js

@@ -225,6 +225,7 @@ describe('SPARQL screen validation', () => {
 
             let describeQuery = 'describe ?t {bind (<<?s ?p ?o>> as ?t) .}';
 
+            cy.waitUntilQueryIsVisible();
             cy.pasteQuery(describeQuery);
 
             SparqlSteps.executeQuery();
@@ -305,6 +306,7 @@ describe('SPARQL screen validation', () => {
         it('Test execute (Describe) query', () => {
             let describeQuery = 'DESCRIBE <http://www.ontotext.com/SYSINFO> FROM <http://www.ontotext.com/SYSINFO>';
 
+            cy.waitUntilQueryIsVisible();
             cy.pasteQuery(describeQuery);
 
             SparqlSteps.executeQuery();
@@ -332,6 +334,7 @@ describe('SPARQL screen validation', () => {
         it('Test execute (ASK) query', () => {
             let askQuery = 'ASK WHERE { ?s ?p ?o .FILTER (regex(?o, "ontotext.com")) }';
 
+            cy.waitUntilQueryIsVisible();
             cy.pasteQuery(askQuery);
             SparqlSteps.executeQuery();
 
@@ -347,6 +350,7 @@ describe('SPARQL screen validation', () => {
         // This test depends on external service http://factforge.net/repositories/ff-news which can occasionally fail.
         it.skip('Test execute (CONSTRUCT) query', () => {
             cy.fixture('queries/construct-query.sparql').then(constructQuery => {
+                cy.waitUntilQueryIsVisible();
                 cy.pasteQuery(constructQuery);
             });
 
@@ -367,6 +371,7 @@ describe('SPARQL screen validation', () => {
         });
 
         it('should test text mining plugin', () => {
+            cy.waitUntilQueryIsVisible();
             cy.pasteQuery(GATE_CLIENT_CREATE_QUERY);
             cy.executeQuery();
             cy.pasteQuery(GATE_CLIENT_SEARCH_QUERY);
@@ -412,6 +417,7 @@ describe('SPARQL screen validation', () => {
                 '\t?s ?p ?o .\n' +
                 '}';
 
+            cy.waitUntilQueryIsVisible();
             cy.pasteQuery(defaultQueryWithoutLimit);
             SparqlSteps.executeQuery();
 
@@ -446,6 +452,7 @@ describe('SPARQL screen validation', () => {
                 '  :a ?p ?o .\n' +
                 '}';
 
+            cy.waitUntilQueryIsVisible();
             cy.pasteQuery(updateToExecute);
             SparqlSteps.executeQuery();
             getUpdateMessage()
@@ -687,6 +694,7 @@ describe('SPARQL screen validation', () => {
         it('Test create, edit and delete saved query', () => {
             let savedQueryName = 'Saved query - ' + Date.now();
 
+            cy.waitUntilQueryIsVisible();
             cy.pasteQuery(QUERY_FOR_SAVING);
 
             saveQuery();
@@ -885,6 +893,7 @@ describe('SPARQL screen validation', () => {
 
         it('Test URL to current query', () => {
             const query = 'SELECT ?sub ?pred ?obj WHERE {?sub ?pred ?obj .} LIMIT 100';
+            cy.waitUntilQueryIsVisible();
             cy.pasteQuery(query);
 
             // Press the link icon to generate a link for a query

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "graphdb-workbench-tests",
-    "version": "2.4.0-RC6",
+    "version": "2.4.0-RC7",
     "description": "Cypress tests for GraphDB workbench",
     "scripts": {
         "start": "cypress open",

package/support/sparql-commands.js

@@ -20,8 +20,8 @@ Cypress.Commands.add('verifyResultsPageLength', (resultLength) => {
 
 Cypress.Commands.add('verifyResultsMessage', (msg) => {
     cy.waitUntil(() =>
-        getResultsMessage()
-            .then((resultInfo) => resultInfo && resultInfo.text().trim().indexOf(msg) > -1));
+        getResultsMessage().then((resultInfo) => resultInfo && resultInfo.text().trim().length > 0));
+    getResultsMessage().should('contain', msg);
 });
 
 Cypress.Commands.add('getResultsMessage', () => {
@@ -60,10 +60,11 @@ function waitUntilQueryIsVisible() {
 }
 
 function verifyQueryAreaContains(query) {
-    // Using the CodeMirror instance because getting the value from the DOM is very cumbersome
     cy.waitUntil(() =>
         getQueryArea()
-            .then(codeMirrorEl => codeMirrorEl && codeMirrorEl[0].CodeMirror.getValue().trim().indexOf(query) > -1));
+            .then(codeMirrorEl => codeMirrorEl && typeof codeMirrorEl[0].CodeMirror.getValue() === 'string'));
+    // Using the CodeMirror instance because getting the value from the DOM is very cumbersome
+    getQueryArea().then(codeMirrorEl => codeMirrorEl && codeMirrorEl[0].CodeMirror.getValue()).should('contain', query);
 }
 
 function getRunQueryButton() {