graphdb-workbench-tests 2.5.1 → 2.6.0-RC1

package/integration/setup/jdbc-create.spec.js

@@ -0,0 +1,330 @@
+import {JdbcSteps} from "../../steps/setup/jdbc-steps";
+import {JdbcCreateSteps} from "../../steps/setup/jdbc-create-steps";
+import {ToasterSteps} from "../../steps/toaster-steps";
+import {YasrSteps} from "../../steps/yasgui/yasr-steps";
+import {ModalDialogSteps, VerifyConfirmationDialogOptions} from "../../steps/modal-dialog-steps";
+import {YasqeSteps} from "../../steps/yasgui/yasqe-steps";
+import {MainMenuSteps} from "../../steps/main-menu-steps";
+import {RepositorySelectorSteps} from "../../steps/repository-selector-steps";
+import {YasguiLoader} from "../../steps/yasgui/yasgui-loader";
+
+const FILE_TO_IMPORT = '200-row-allianz.ttl';
+const DEFAULT_QUERY = 'PREFIX rdfs: <http://www.w3.org/2000/01/rdf-schema#>\n' +
+    '\n' +
+    '# Selects two variables to use as columns\n' +
+    'SELECT ?id ?label {\n' +
+    '    ?id rdfs:label ?label\n' +
+    '    # The following placeholder must be present in the query\n' +
+    '    #!filter\n' +
+    '}';
+
+describe('JDBC configuration', () => {
+
+    let repositoryId;
+    let secondRepositoryId;
+
+    beforeEach(() => {
+        repositoryId = 'jdbc-repo-' + Date.now();
+        secondRepositoryId = repositoryId + '-second';
+        cy.createRepository({id: repositoryId});
+        cy.createRepository({id: secondRepositoryId});
+        cy.presetRepository(repositoryId);
+        cy.importServerFile(repositoryId, FILE_TO_IMPORT);
+        JdbcCreateSteps.visit();
+    });
+
+    afterEach(() => {
+        cy.deleteRepository(repositoryId);
+        cy.deleteRepository(secondRepositoryId);
+    });
+
+    it('Should open saved jdbc configs catalog when repository is changed', () => {
+        // Given I have opened the jdbc configurations page
+        // When I change the repository
+        RepositorySelectorSteps.selectRepository(secondRepositoryId);
+        // Then I expect to see the jdbc config catalog page
+        JdbcSteps.verifyUrl();
+        // And the jdbc config catalog should be empty
+        JdbcSteps.getJDBCConfigurations().should('be.visible');
+    });
+
+    it('should not allow preview if query is invalid or column are not selected', () => {
+        // When I open the create JDBC configuration page,
+        // and click on "Preview" button.
+        JdbcCreateSteps.clickOnPreviewButton();
+
+        // Then I expect to see error notification,
+        ToasterSteps.verifyError('Please define at least one column');
+        // and "Column type" tab to be opened,
+        JdbcCreateSteps.getActiveTab().contains('Column types');
+        // and two columns to be suggested.
+        JdbcCreateSteps.getColumnSuggestionRows().should('have.length', 2);
+
+        // When I click "Preview" again.
+        JdbcCreateSteps.clickOnPreviewButton();
+
+        // Then I expect to see loader,
+        YasguiLoader.verifyMessage('Preview of first 100 rows of table', 1);
+        // and see the generated preview.
+        YasrSteps.getResults().should('be.visible');
+    });
+
+    it('should contains exactly columns in preview than selected in Columns type tag', () => {
+        // When I open the create JDBC configuration page,
+        JdbcCreateSteps.openColumnTypesTab();
+        // waite columns to be suggested,
+        JdbcCreateSteps.getColumnSuggestionRows().should('have.length', 2);
+        // and make preview on default query.
+        JdbcCreateSteps.clickOnPreviewButton();
+
+        // Then I expect to see three columns. One for index and others are from the query.
+        YasrSteps.getResultRowCells(1).should('have.length', 3);
+
+        // When I try to remove a column.
+        JdbcCreateSteps.openColumnTypesTab();
+        JdbcCreateSteps.clickOnDeleteColumnButton();
+
+        // Then I expect to be asked to confirm deletion of the column.
+        ModalDialogSteps.verifyDialogBody('Are you sure you want to delete the column \'id\'?');
+
+        // When I click on cancel button.
+        ModalDialogSteps.clickOnCancelButton();
+
+        // Then I expect the column not be deleted.
+        JdbcCreateSteps.getColumnSuggestionRows().should('have.length', 2);
+
+        // When I try to remove a column.
+        JdbcCreateSteps.openColumnTypesTab();
+        JdbcCreateSteps.clickOnDeleteColumnButton();
+
+        // Then I expect to be asked to confirm deletion of the column.
+        ModalDialogSteps.verifyDialogBody('Are you sure you want to delete the column \'id\'?');
+
+        // When I click on close button.
+        ModalDialogSteps.clickOnCloseButton();
+
+        // Then I expect the column not be deleted.
+        JdbcCreateSteps.getColumnSuggestionRows().should('have.length', 2);
+
+        // When I remove a column.
+        JdbcCreateSteps.openColumnTypesTab();
+        JdbcCreateSteps.clickOnDeleteColumnButton();
+
+        // Then I expect to be asked to confirm deletion of the column.
+        ModalDialogSteps.verifyDialogBody('Are you sure you want to delete the column \'id\'?');
+
+        // When I click on confirm button.
+        ModalDialogSteps.clickOnConfirmButton();
+
+        // Then I expect the column be deleted.
+        JdbcCreateSteps.getColumnSuggestionRows().should('have.length', 1);
+
+        // When I click on preview button.
+        JdbcCreateSteps.clickOnPreviewButton();
+
+        // Then I expect to see two columns. One for index and one from the query.
+        YasrSteps.getResultRowCells(1).should('have.length', 2);
+    });
+
+    it('should suggests me all columns when I click on suggest button', () => {
+        // When I open the create JDBC configuration page,
+        JdbcCreateSteps.openColumnTypesTab();
+        // waite columns to be suggested,
+        JdbcCreateSteps.getColumnSuggestionRows().should('have.length', 2);
+        // When I remove all columns.
+        JdbcCreateSteps.clickOnDeleteColumnButton(0);
+        ModalDialogSteps.clickOnConfirmButton();
+        JdbcCreateSteps.clickOnDeleteColumnButton(0);
+        ModalDialogSteps.clickOnConfirmButton();
+        JdbcCreateSteps.getColumnSuggestionRows().should('have.length', 0);
+
+        // When I click on "Suggest" button.
+        JdbcCreateSteps.clickOnSuggestButton();
+        // Then I expect all columns to be suggested without confirmation.
+        JdbcCreateSteps.getColumnSuggestionRows().should('have.length', 2);
+
+        // When I click on "Suggest" button when there are selected columns.
+        JdbcCreateSteps.clickOnDeleteColumnButton(0);
+        ModalDialogSteps.clickOnConfirmButton();
+        JdbcCreateSteps.getColumnSuggestionRows().should('have.length', 1);
+        JdbcCreateSteps.clickOnSuggestButton();
+
+        // Then I expect to be asked to confirm the suggestion.
+        ModalDialogSteps.verifyDialogBody('Are you sure you want to get suggestions for all columns? This action will overwrite all column type mappings!');
+
+        // When I click on close button.
+        ModalDialogSteps.clickOnCloseButton();
+
+        // Then I expect suggestion to not be applied.
+        JdbcCreateSteps.getColumnSuggestionRows().should('have.length', 1);
+
+        // When I click on "Suggestion" button.
+        JdbcCreateSteps.clickOnSuggestButton();
+
+        // Then I expect to be asked to confirm the suggestion.
+        ModalDialogSteps.verifyDialogBody('Are you sure you want to get suggestions for all columns? This action will overwrite all column type mappings!');
+
+        // When I click on cancel button.
+        ModalDialogSteps.clickOnCancelButton();
+
+        // Then I expect suggestion to not be applied.
+        JdbcCreateSteps.getColumnSuggestionRows().should('have.length', 1);
+
+        // When I click on "Suggestion" button.
+        JdbcCreateSteps.clickOnSuggestButton();
+
+        // Then I expect to be asked to confirm the suggestion.
+        ModalDialogSteps.verifyDialogBody('Are you sure you want to get suggestions for all columns? This action will overwrite all column type mappings!');
+
+        // When I click on confirm button.
+        ModalDialogSteps.clickOnConfirmButton();
+
+        // Then I expect suggestion to not be applied.
+        JdbcCreateSteps.getColumnSuggestionRows().should('have.length', 2);
+    });
+
+    it('should not allow configuration to be saved if some of required fields are not filled', () => {
+        // When I open the create JDBC configuration page,
+        // and try to save the configuration.
+        JdbcCreateSteps.clickOnSave();
+
+        // Then I expect to see error message describes that configuration name is required.
+        JdbcCreateSteps.getJdbcConfigurationNameIsRequired().should('be.visible');
+        JdbcCreateSteps.getJdbcConfigurationNameIsRequired().contains('SQL table name is required');
+
+        // When I type the name of the configuration,
+        JdbcCreateSteps.typeTableName('Test table name');
+        // and type wrong query,
+        YasqeSteps.pasteQuery('Wrong query');
+        // and try to save configuration.
+        JdbcCreateSteps.clickOnSave();
+
+        // Then I expect to see error message described that the query must be select query.
+        JdbcCreateSteps.getInvalidQueryMode().should('be.visible');
+        JdbcCreateSteps.getInvalidQueryMode().contains('The data query must be a SELECT query');
+
+        // When I type wrong select query
+        YasqeSteps.pasteQuery('Select * where {?s ?p ?o ?g}');
+        // and try to save the configuration
+        JdbcCreateSteps.clickOnSave();
+
+        // Then I expect to see error message described that the query is not valid.
+        JdbcCreateSteps.getInvalidQuery().should('be.visible');
+        JdbcCreateSteps.getInvalidQuery().contains('Invalid query');
+
+        // When I type correct select query
+        YasqeSteps.pasteQuery(DEFAULT_QUERY);
+        // and try to save the configuration
+        JdbcCreateSteps.clickOnSave();
+
+        // Then I expect to see error message
+        ToasterSteps.verifyError('Please define at least one column');
+    });
+
+    it('should not display confirm message when if the fields of configuration are not changed', () => {
+        // When I open the create JDBC configuration page,
+        // and try to change page
+        JdbcSteps.visit();
+
+        // Then I expect the new page is loaded.
+        JdbcSteps.verifyUrl();
+    });
+
+
+    it('should display confirm message when configuration name is changed', () => {
+        // When I open the create JDBC configuration page,
+        // type configuration name,
+        JdbcCreateSteps.typeTableName('Configuration name');
+        JdbcCreateSteps.getJDBCConfigNameField().should('have.value', 'Configuration name');
+        ModalDialogSteps.verifyUrlChangedConfirmation(createVerifyConfirmationDialogOptions());
+    });
+
+    it('should display confirm message when the configuration query data is changed', () => {
+        // When I open the create JDBC configuration page,
+        // type and change the query,
+        YasqeSteps.writeInEditor("Some changes");
+        ModalDialogSteps.verifyUrlChangedConfirmation(createVerifyConfirmationDialogOptions());
+    });
+
+    it('should display confirm message when the selected columns are changed', () => {
+        // When I open the create JDBC configuration page,
+        // and change selected columns.
+        JdbcCreateSteps.openColumnTypesTab();
+        JdbcCreateSteps.clickOnDeleteColumnButton(0);
+        ModalDialogSteps.clickOnConfirmButton();
+        ModalDialogSteps.verifyUrlChangedConfirmation(createVerifyConfirmationDialogOptions());
+    });
+
+    it('should display confirm message when try to change the repository', () => {
+        const secondRepositoryId = 'jdbc-repo-second-repo' + Date.now();
+        cy.createRepository({id: secondRepositoryId});
+
+        // When I open a configuration for edit,
+        createConfigurationAndOpenInEdit('Test table');
+        // Make some changes
+        YasqeSteps.writeInEditor('Make changes');
+
+        // When I try to change the selected repository.
+        RepositorySelectorSteps.selectRepository(secondRepositoryId);
+
+        // Then I expect to be asked to confirm changing of repository.
+        ModalDialogSteps.verifyDialogBody('You have unsaved changes. Are you sure that you want to exit?');
+
+        // When I click on close button.
+        ModalDialogSteps.clickOnCloseButton();
+
+        // Then I expect to stay on same page
+        JdbcCreateSteps.verifyUrl();
+
+        // When I try to change the selected repository.
+        RepositorySelectorSteps.selectRepository(secondRepositoryId);
+
+        // Then I expect to be asked to confirm changing of repository.
+        ModalDialogSteps.verifyDialogBody('You have unsaved changes. Are you sure that you want to exit?');
+
+        // When I click on cancel button.
+        ModalDialogSteps.clickOnCancelButton();
+
+        // Then I expect to stay on same page
+        JdbcCreateSteps.verifyUrl();
+
+        // When I try to change the selected repository.
+        RepositorySelectorSteps.selectRepository(secondRepositoryId);
+
+        // Then I expect to be asked to confirm changing of repository.
+        ModalDialogSteps.verifyDialogBody('You have unsaved changes. Are you sure that you want to exit?');
+
+        // When I click on confirm button.
+        ModalDialogSteps.clickOnConfirmButton();
+
+        // Then I expect to stay on same page
+        JdbcSteps.verifyUrl();
+
+        cy.deleteRepository(secondRepositoryId);
+    });
+});
+
+function createConfigurationAndOpenInEdit(tableName) {
+    JdbcSteps.visit();
+    // Creates a configuration.
+    JdbcSteps.clickOnCreateJdbcConfigurationButton();
+    YasqeSteps.waitUntilQueryIsVisible();
+    JdbcCreateSteps.typeTableName(tableName);
+    JdbcCreateSteps.openColumnTypesTab();
+    // waite selected column to be loaded.
+    JdbcCreateSteps.getColumnSuggestionRows().should('have.length', 2);
+    JdbcCreateSteps.clickOnSave();
+
+    ToasterSteps.verifySuccess('SQL table configuration saved');
+
+    // Opens created configuration for edit.
+    JdbcSteps.clickOnEditButton(0);
+}
+
+function createVerifyConfirmationDialogOptions() {
+    return new VerifyConfirmationDialogOptions()
+        .setChangePageFunction(() => MainMenuSteps.clickOnMenuImport())
+        .setConfirmationMessage('You have unsaved changes. Are you sure that you want to exit?')
+        .setVerifyCurrentUrl(() => cy.url().should('eq', `${Cypress.config('baseUrl')}/jdbc/configuration/create`))
+        .setVerifyRedirectedUrl(() => cy.url().should('eq', `${Cypress.config('baseUrl')}/import#user`));
+}

package/integration/setup/jdbc.spec.js

@@ -1,19 +1,9 @@
+import {JdbcSteps} from "../../steps/setup/jdbc-steps";
+import {JdbcCreateSteps} from "../../steps/setup/jdbc-create-steps";
+import {ModalDialogSteps} from "../../steps/modal-dialog-steps";
+import {YasqeSteps} from "../../steps/yasgui/yasqe-steps";
+
 const FILE_TO_IMPORT = '200-row-allianz.ttl';
-const JDBC_CONFIG_NAME = 'jdbc_config';
-const QUERY = "PREFIX ex:<http://example.com/#>\n" +
-    "PREFIX base:<http://example/base/>\n" +
-    "PREFIX rdfs:<http://www.w3.org/2000/01/rdf-schema#>\n" +
-    "PREFIX rdf:<http://www.w3.org/1999/02/22-rdf-syntax-ns#>\n" +
-    "PREFIX foaf: <http://xmlns.com/foaf/0.1/>\n" +
-    "\n" +
-    "select ?id ?sentiment_score ?fraud_score ?customer_loyalty where { \n" +
-    "\t?id rdf:type ex:Customer;\n" +
-    "    \tex:sentiment ?sentiment_score;\n" +
-    "      \tex:fraudScore ?fraud_score;\n" +
-    "       \tex:customerLoyalty ?customer_loyalty_id.\n" +
-    "    ?customer_loyalty_id rdfs:label ?customer_loyalty.\n" +
-    "    # !filter\n" +
-    "}  ";
 const EDIT_QUERY = "PREFIX ex:<http://example.com/#>\n" +
     "PREFIX base:<http://example/base/>\n" +
     "PREFIX rdfs:<http://www.w3.org/2000/01/rdf-schema#>\n" +
@@ -37,170 +27,104 @@ describe('JDBC configuration', () => {
         cy.createRepository({id: repositoryId});
         cy.presetRepository(repositoryId);
         cy.importServerFile(repositoryId, FILE_TO_IMPORT);
-        cy.visit('/jdbc');
-        cy.window();
+        JdbcSteps.visit();
     });
 
     afterEach(() => {
         cy.deleteRepository(repositoryId);
     });
 
-    it('Configuration table preview', () => {
-        // SQL configuration table should be visible
-        getConfigurationList().should('be.visible');
-    });
+    it('Should not create a new JDBC configuration click on cancel button', () => {
+        // When I am on JDBC configurations page and click on create a new table configuration button.
+        JdbcSteps.clickOnCreateJdbcConfigurationButton();
 
-    it('Should create a new JDBC configuration, edit, preview, then delete', () => {
-        getCreateNewJDBCConfigurationButon().click();
-        cy.pasteQuery(QUERY);
-        getJDBCConfigNameField().type(JDBC_CONFIG_NAME);
-
-        // 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();
-        // verify config is created
-        getConfigurationList().should('contain', JDBC_CONFIG_NAME);
-        getEditButton().click();
-        // used to verify that the input field is active
-        typeQuery("{downarrow}");
-
-        getPreviewButton().click();
-        getLoader().should('not.exist');
-
-        // verify results content
-        getPreviewTable()
-            .should('be.visible')
-            .and('contain', 'SENTIMENT_SCORE')
-            .and('contain', 'CUSTOMER_LOYALTY')
-            .and('contain', 'ID')
-            .and('contain', 'FRAUD_SCORE');
-
-        // clear current query and paste the edited one, to test the suggest functionality
-        clearQuery();
-        cy.pasteQuery(EDIT_QUERY);
-        getColumnTypesTab().click();
-        // click suggest button to update the changes from the second query
-        getSuggestButton().click();
-        getConfirmSuggestButton().click();
-        // 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
-        // used to verify that the input field is active
-        typeQuery("{downarrow}");
-        getPreviewButton().click();
-        getLoader().should('not.exist');
-
-        // verify results content
-        getPreviewTable()
-            .should('be.visible')
-            .and('contain', 'ID')
-            .and('contain', 'FRAUD_SCORE')
-            .and('contain', 'CUSTOMER_LOYALTY');
-
-        getCancelButton().click();
-        // Delete jdbc configuration
-        cy.get('.jdbc-list-configurations').should('be.visible');
-        getDeleteButton().click();
-        getConfirmDialogButton().click();
-        getConfigurationList().should('contain', 'No tables are defined');
-    });
-});
+        // Then I expect to  be redirected to create JDBC configuration page.
+        JdbcCreateSteps.verifyUrl();
 
-function getCreateNewJDBCConfigurationButon() {
-    return cy.get('.create-sql-table-configuration');
-}
+        // When I fill correct data,
+        JdbcCreateSteps.typeTableName('JdbcTest');
+        JdbcCreateSteps.openColumnTypesTab();
 
-function getJDBCConfigNameField() {
-    return cy.get('.sql-table-name');
-}
+        // And click on cancel button.
+        JdbcCreateSteps.clickOnCancel();
 
-function getQueryArea() {
-    return cy.get('.CodeMirror');
-}
+        // Then, I expect to be asked to confirm the cancellation.
+        // When I confirm
+        ModalDialogSteps.clickOnConfirmButton();
 
-function getQueryTextArea() {
-    return getQueryArea().find('textarea');
-}
+        // Then I expect to be redirected to Jdbc configurations page,
+        JdbcSteps.verifyUrl();
+        // and the configuration to not be created.
+        JdbcSteps.getJDBCConfigurations().should('contain', 'No tables are defined');
+    });
 
-function typeQuery(query) {
-    // getQueryTextArea().invoke('val', query).trigger('change', {force: true});
-    getQueryTextArea().type(query, {force: true});
-    cy.waitUntilQueryIsVisible();
-}
+    it('Should create a new JDBC configuration, edit, preview, then delete', () => {
+        // When I am on JDBC configurations page and click on create a new table configuration button.
+        JdbcSteps.clickOnCreateJdbcConfigurationButton();
+
+        // Then I expect to  be redirected to create JDBC configuration page.
+        JdbcCreateSteps.verifyUrl();
 
-function clearQuery() {
-    // Using force because the textarea is not visible
-    getQueryTextArea().type(Cypress.env('modifierKey') + 'a{backspace}', {force: true});
-}
+        // When I fill correct data,
+        JdbcCreateSteps.typeTableName('JdbcTest');
+        // and columns are selected.
+        JdbcCreateSteps.openColumnTypesTab();
+        JdbcCreateSteps.getColumnSuggestionRows().should('have.length', 2);
 
-function getColumnTypesTab() {
-    return cy.get('.nav-tabs').contains("Column types");
-}
+        // And click on save button.
+        JdbcCreateSteps.clickOnSave();
 
-function getDataQueryTab() {
-    return cy.get('.nav-tabs').contains("Data query");
-}
+        // Then I expect to be redirected to Jdbc configurations page,
+        JdbcSteps.verifyUrl();
+        // and the configuration not be created.
+        JdbcSteps.getJDBCConfigurationResults().should('have.length', 1);
 
-function getSaveButton() {
-    return cy.get('.save-query-btn');
-}
+        // When I click on edit button,
+        JdbcSteps.clickOnEditButton();
+        // change the query,
+        YasqeSteps.pasteQuery(EDIT_QUERY);
+        // and click on save button.
+        JdbcCreateSteps.clickOnSave();
 
-function getDeleteButton() {
-    return cy.get('.icon-trash');
-}
+        // Then I expect to be redirected to JDBC configurations page.
+        JdbcSteps.verifyUrl();
 
-function getCancelButton() {
-    return cy.get('.cancel-query-btn');
-}
+        // When I click on delete button.
+        JdbcSteps.clickOnDeleteButton();
 
-function getConfirmDialogButton() {
-    return cy.get('.btn-primary');
-}
+        // Then I expect to be asked to confirm the deletion,
+        // and click on close dialog button.
+        ModalDialogSteps.clickOnCloseButton();
 
-function getConfigurationList() {
-    return cy.get('.jdbc-list-configurations');
-}
+        // Then I expect configuration to not be deleted.
+        JdbcSteps.getJDBCConfigurationResults().should('have.length', 1);
 
-function getEditButton() {
-    return cy.get('.icon-edit');
-}
+        // When I click on delete button.
+        JdbcSteps.clickOnDeleteButton();
 
-function getSQLTableRows() {
-    return cy.get('div.form-group.row.pt-1.ng-scope');
-}
+        // Then I expect to be asked to confirm the deletion,
+        // and click on cancel dialog button.
+        ModalDialogSteps.clickOnCancelButton();
 
-function getPreviewButton() {
-    return cy.get('.preview-btn');
-}
+        // Then I expect configuration to not be deleted.
+        JdbcSteps.getJDBCConfigurationResults().should('have.length', 1);
 
-function getSuggestButton() {
-    return cy.get('.sql-table-config .preview-btn');
-}
+        // When I click on delete button.
+        JdbcSteps.clickOnDeleteButton();
 
-function getConfirmSuggestButton() {
-    return cy.get('.confirm-btn');
-}
+        // Then I expect to be asked to confirm the deletion,
+        // and click on cancel dialog button.
+        ModalDialogSteps.clickOnCancelButton();
 
-function getLoader() {
-    return cy.get('.ot-loader-new-content');
-}
+        // When I click on delete button.
+        JdbcSteps.clickOnDeleteButton();
 
-function getPreviewTable() {
-    return cy.get('.resultsTable');
-}
+        // Then I expect to be asked to confirm the deletion,
+        // and when click on confirm dialog button.
+        ModalDialogSteps.clickOnConfirmButton();
 
-function getSQLTableConfig() {
-    return cy.get('.sql-table-config');
-}
+        // Then I expect the configuration to be deleted.
+        JdbcSteps.getJDBCConfigurations().should('contain', 'No tables are defined');
+    });
+
+});

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

@@ -1,3 +1,6 @@
+import {SparqlEditorSteps} from "../../steps/sparql-editor-steps";
+import {YasqeSteps} from "../../steps/yasgui/yasqe-steps";
+
 describe('My Settings', () => {
 
     let repositoryId;
@@ -109,44 +112,17 @@ describe('My Settings', () => {
             .then(() => {
                 verifyUserSettingsUpdated();
                 //Go to SPARQL editor and verify changes are persisted for the admin user
-                cy.visit('/sparql');
-                cy.window();
-                cy.url().should('contain', `${Cypress.config('baseUrl')}/sparql`);
-
-                waitUntilYASQUEBtnsAreVisible();
+                SparqlEditorSteps.visitSparqlEditorPage();
 
                 //verify disabled default inference, sameAs and total results count
-                cy.get('#inference')
-                    .should('be.visible')
-                    .find('.icon-2-5x.icon-inferred-off')
-                    .should('be.visible');
-
-                cy.get('#sameAs')
-                    .should('be.visible')
-                    .find('.icon-2-5x.icon-sameas-off')
-                    .should('be.visible');
+                YasqeSteps.getIncludeInferredStatementsButton().should('have.class', 'icon-inferred-off');
+                YasqeSteps.getExpandResultsOverSameAsButton().should('have.class', 'icon-same-as-off');
 
                 //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});
+                YasqeSteps.clearEditor();
+                YasqeSteps.pasteQuery(testResultCountQuery);
 
-                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')
-                    .and('not.be.disabled').click()
-                    .then(() => {
-                        // Retry until success message is shown
-                        cy.waitUntil(() =>
-                            cy.get('#yasr-inner')
-                                .should('be.visible')
-                                .find('.results-info .text-xs-right')
-                                .find('.results-description')
-                                .then(result => result && result.text().indexOf('Showing results from 1 to 1,000 of at least 1,001') > -1));
-                    });
+                YasqeSteps.executeQuery();
 
                 //return to My Settings to revert the changes
                 visitSettingsView();
@@ -269,14 +245,6 @@ describe('My Settings', () => {
         return cy.get('#wb-user-submit').scrollIntoView().should('be.visible');
     }
 
-    function waitUntilYASQUEBtnsAreVisible() {
-        cy.waitUntil(() =>
-            cy.get('#queryEditor #yasqe_buttons')
-                .find('#buttons')
-                .then(buttons =>
-                    buttons && buttons.length > 0));
-    }
-
     function verifyUserSettingsUpdated() {
         cy.waitUntil(() =>
             cy.get('#toast-container')