graphdb-workbench-tests 2.4.2-TR2 → 2.4.2

package/integration/setup/jdbc.spec.js

@@ -33,7 +33,12 @@ describe('JDBC configuration', () => {
     let repositoryId;
 
     beforeEach(() => {
-        initRepositoryAndVisitJdbcView();
+        repositoryId = 'jdbc-repo-' + Date.now();
+        cy.createRepository({id: repositoryId});
+        cy.presetRepository(repositoryId);
+        cy.importServerFile(repositoryId, FILE_TO_IMPORT);
+        cy.visit('/jdbc');
+        cy.window();
     });
 
     afterEach(() => {
@@ -41,33 +46,34 @@ describe('JDBC configuration', () => {
     });
 
     it('Configuration table preview', () => {
-        //cy.visit('/jdbc');
         // SQL configuration table should be visible
         getConfigurationList().should('be.visible');
     });
 
-    //TODO Fix falling test
-    it.skip('Should create a new JDBC configuration, edit, preview, then delete', () => {
+    it('Should create a new JDBC configuration, edit, preview, then delete', () => {
         getCreateNewJDBCConfigurationButon().click();
         cy.pasteQuery(QUERY);
         getJDBCConfigNameField().type(JDBC_CONFIG_NAME);
-        getColumnTypesTab().click(); //switch to SQL columns config tab
 
-        //verify columns length and content
+        // switch to SQL columns config tab
+        getColumnTypesTab().click();
+        // verify columns length and content
         getSQLTableRows().should('have.length', 4);
         getSQLTableConfig()
             .should('be.visible')
             .and('contain', 'sentiment_score');
 
         getSaveButton().click();
-        getConfigurationList().should('contain', JDBC_CONFIG_NAME); //verify config is created
+        // verify config is created
+        getConfigurationList().should('contain', JDBC_CONFIG_NAME);
         getEditButton().click();
+        // used to verify that the input field is active
+        typeQuery("{downarrow}");
 
-        typeQuery("{downarrow}"); //used to verify that the input field is active
-        getPreviewButton().click({force:true}); //click preview button
+        getPreviewButton().click();
         getLoader().should('not.exist');
 
-        //verify results content
+        // verify results content
         getPreviewTable()
             .should('be.visible')
             .and('contain', 'SENTIMENT_SCORE')
@@ -75,135 +81,126 @@ describe('JDBC configuration', () => {
             .and('contain', 'ID')
             .and('contain', 'FRAUD_SCORE');
 
-        //clear current query and paste the edited one, to test the suggest functionality
+        // clear current query and paste the edited one, to test the suggest functionality
         clearQuery();
         cy.pasteQuery(EDIT_QUERY);
         getColumnTypesTab().click();
-        getSuggestButton().click({force:true}); //click suggest button to update the changes from the second query
+        // click suggest button to update the changes from the second query
+        getSuggestButton().click();
         getConfirmSuggestButton().click();
-
-        //verify columns length and content
+        // verify columns length and content
         getSQLTableRows().should('have.length', 3);
         getSQLTableConfig()
             .should('be.visible')
             .and('not.contain', 'sentiment_score');
         getSaveButton().click();
-        getEditButton().click();
 
-        //Verify that changes have been applied upon saving
-        typeQuery("{downarrow}"); //used to verify that the input field is active
-        getPreviewButton().click({force:true}); //click preview button
+        getEditButton().click();
+        // Verify that changes have been applied upon saving
+        // used to verify that the input field is active
+        typeQuery("{downarrow}");
+        getPreviewButton().click();
         getLoader().should('not.exist');
 
-        //verify results content
+        // verify results content
         getPreviewTable()
             .should('be.visible')
-            .and('not.contain', 'SENTIMENT_SCORE')
-            .and('contain', 'CUSTOMER_LOYALTY')
             .and('contain', 'ID')
-            .and('contain', 'FRAUD_SCORE');
-        getCancelButton().click();
+            .and('contain', 'FRAUD_SCORE')
+            .and('contain', 'CUSTOMER_LOYALTY');
 
-        //Delete jdbc configuration
+        getCancelButton().click();
+        // Delete jdbc configuration
         cy.get('.jdbc-list-configurations').should('be.visible');
         getDeleteButton().click();
         getConfirmDialogButton().click();
-        getConfigurationList().should('contain', 'No Indexes');
+        getConfigurationList().should('contain', 'No tables are defined');
     });
-
-    function initRepositoryAndVisitJdbcView() {
-        repositoryId = 'jdbc-repo-' + Date.now();
-        cy.createRepository({id: repositoryId});
-        cy.presetRepository(repositoryId);
-        cy.importServerFile(repositoryId, FILE_TO_IMPORT);
-        cy.visit('/jdbc');
-        cy.window();
-    }
-
-    function getCreateNewJDBCConfigurationButon() {
-        return cy.get('.create-sql-table-configuration');
-    }
-
-    function getJDBCConfigNameField() {
-        return cy.get('.sql-table-name');
-    }
-
-    function getQueryArea() {
-        return cy.get('.CodeMirror');
-    }
-
-    function getQueryTextArea() {
-        return getQueryArea().find('textarea');
-    }
-
-    function typeQuery(query) {
-        // getQueryTextArea().invoke('val', query).trigger('change', {force: true});
-        getQueryTextArea().type(query, {force: true});
-        cy.waitUntilQueryIsVisible();
-    }
-
-    function clearQuery() {
-        // Using force because the textarea is not visible
-        getQueryTextArea().type(Cypress.env('modifierKey') + 'a{backspace}', {force: true});
-    }
-
-    function getColumnTypesTab() {
-        return cy.get('.nav-tabs').contains("Column types");
-    }
-
-    function getDataQueryTab() {
-        return cy.get('.nav-tabs').contains("Data query");
-    }
-
-    function getSaveButton() {
-        return cy.get('.save-query-btn');
-    }
-
-    function getDeleteButton() {
-        return cy.get('.icon-trash');
-    }
-
-    function getCancelButton() {
-        return cy.get('.cancel-query-btn');
-    }
-
-    function getConfirmDialogButton() {
-        return cy.get('.btn-primary');
-    }
-
-    function getConfigurationList() {
-        return cy.get('.jdbc-list-configurations');
-    }
-
-    function getEditButton() {
-        return cy.get('.icon-edit');
-    }
-
-    function getSQLTableRows() {
-        return cy.get('div.form-group.row.pt-1.ng-scope');
-    }
-
-    function getPreviewButton() {
-        return cy.get('.preview-btn');
-    }
-
-    function getSuggestButton(){
-        return cy.get('.sql-table-config .preview-btn');
-    }
-
-    function getConfirmSuggestButton() {
-        return cy.get('.confirm-btn');
-    }
-
-    function getLoader() {
-        return cy.get('.ot-loader-new-content');
-    }
-
-    function getPreviewTable() {
-        return cy.get('.resultsTable');
-    }
-
-    function getSQLTableConfig() {
-        return cy.get('.sql-table-config');
-    }
 });
+
+function getCreateNewJDBCConfigurationButon() {
+    return cy.get('.create-sql-table-configuration');
+}
+
+function getJDBCConfigNameField() {
+    return cy.get('.sql-table-name');
+}
+
+function getQueryArea() {
+    return cy.get('.CodeMirror');
+}
+
+function getQueryTextArea() {
+    return getQueryArea().find('textarea');
+}
+
+function typeQuery(query) {
+    // getQueryTextArea().invoke('val', query).trigger('change', {force: true});
+    getQueryTextArea().type(query, {force: true});
+    cy.waitUntilQueryIsVisible();
+}
+
+function clearQuery() {
+    // Using force because the textarea is not visible
+    getQueryTextArea().type(Cypress.env('modifierKey') + 'a{backspace}', {force: true});
+}
+
+function getColumnTypesTab() {
+    return cy.get('.nav-tabs').contains("Column types");
+}
+
+function getDataQueryTab() {
+    return cy.get('.nav-tabs').contains("Data query");
+}
+
+function getSaveButton() {
+    return cy.get('.save-query-btn');
+}
+
+function getDeleteButton() {
+    return cy.get('.icon-trash');
+}
+
+function getCancelButton() {
+    return cy.get('.cancel-query-btn');
+}
+
+function getConfirmDialogButton() {
+    return cy.get('.btn-primary');
+}
+
+function getConfigurationList() {
+    return cy.get('.jdbc-list-configurations');
+}
+
+function getEditButton() {
+    return cy.get('.icon-edit');
+}
+
+function getSQLTableRows() {
+    return cy.get('div.form-group.row.pt-1.ng-scope');
+}
+
+function getPreviewButton() {
+    return cy.get('.preview-btn');
+}
+
+function getSuggestButton() {
+    return cy.get('.sql-table-config .preview-btn');
+}
+
+function getConfirmSuggestButton() {
+    return cy.get('.confirm-btn');
+}
+
+function getLoader() {
+    return cy.get('.ot-loader-new-content');
+}
+
+function getPreviewTable() {
+    return cy.get('.resultsTable');
+}
+
+function getSQLTableConfig() {
+    return cy.get('.sql-table-config');
+}

package/package.json

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