graphdb-workbench-tests 1.11.0 → 1.11.1

package/fixtures/repo-template.json

@@ -103,5 +103,5 @@
         }
     },
     "title": "",
-    "type": "graphdb"
+    "type": "free"
 }

package/integration/explore/visual.graph.spec.js

@@ -537,18 +537,14 @@ describe('Visual graph screen validation', () => {
     }
 
     function searchForResource(resource) {
-        // verify that the easy graph search has occured and a valid resource was input and only
-        // after that execute the next operation
-        cy.searchEasyVisualGraph(resource)
+        cy.searchEasyVisualGraph(resource);
+        // Verify redirection to existing visual graph
+        cy.waitUntil(() =>
+            cy.get('.graph-visualization')
+                .find('.nodes-container')
+                .then(nodesContainer => nodesContainer))
             .then(() => {
-                // Verify redirection to existing visual graph
-                cy.waitUntil(() =>
-                    cy.get('.graph-visualization')
-                        .find('.nodes-container')
-                        .then(nodesContainer => nodesContainer))
-                    .then(() => {
-                        getNodes();
-                    });
+                getNodes();
             });
     }
 

package/integration/home/workbench.home.spec.js

@@ -107,18 +107,11 @@ describe('Home screen validation', () => {
             // When I click the button
             HomeSteps.openRdfSearchBox();
             // I should be able to type some text in the input
-            cy.get('.search-rdf-input search-resource-input .view-res-input')
-                .type('hasPos').then(() => {
-                // When I select option from suggestions
-                cy.get(".search-rdf-input #auto-complete-results-wrapper p")
-                    .contains('hasPos')
-                    .click()
-                    .then(() => {
-                        // Search result should be opened in new window
-                        cy.get('@window.open').should('be.calledWith', 'resource?uri=http%3A%2F%2Fwww.w3.org%2Fns%2Forg%23hasPost');
-                    });
-            });
-
+            cy.get('.search-rdf-input search-resource-input .view-res-input').type('hasPos');
+            // When I select option from suggestions
+            cy.get(".search-rdf-input #auto-complete-results-wrapper p").contains('hasPos').click();
+            // Search result should be opened in new window
+            cy.get('@window.open').should('be.calledWith', 'resource?uri=http%3A%2F%2Fwww.w3.org%2Fns%2Forg%23hasPost');
             // When I revisit the home page
             cy.visit('/graphs');
             // When I open again the search box
@@ -128,12 +121,10 @@ describe('Home screen validation', () => {
             // And dropdown should be visible
             cy.get('.search-rdf-input #auto-complete-results-wrapper').should('be.visible');
             // When I press 'escape'
-            cy.get('.search-rdf-input search-resource-input .view-res-input')
-                .type('{esc}')
-                .then(() => {
-                    // Search box should not be visible
-                    cy.get('.search-rdf-input').should('not.be.visible');
-                });
+            cy.get('.search-rdf-input search-resource-input .view-res-input').type('{esc}');
+            // Search box should not be visible
+            cy.get('.search-rdf-input').should('not.be.visible');
+
 
             cy.deleteRepository(repositoryId);
         });

package/integration/import/onto-refine.spec.js

@@ -0,0 +1,135 @@
+describe('Import/ OntoRefine', () => {
+
+    let repositoryId;
+
+    beforeEach(() => {
+        repositoryId = 'onto-refine-' + Date.now();
+        cy.createRepository({id: repositoryId});
+
+        cy.visit('/ontorefine');
+        cy.window();
+
+        cy.get('.ot-splash').should('not.exist');
+        getOntoRefineFrame().should('be.visible');
+    });
+
+    afterEach(() => {
+        cy.deleteRepository(repositoryId);
+    });
+
+    const REFINE_TABS = ['Create Project', 'Open Project', 'Import Project', 'Language Settings'];
+    const CREATE_PROJECT_TABS = ['This Computer', 'Web Addresses (URLs)', 'Clipboard'];
+
+    xit('should properly render OntoRefine transformation tool frame', () => {
+
+        // Refine should provide navigation tabs
+        getOntoRefineTabs()
+            .should('be.visible')
+            .and('have.length', 4)
+            .each(($tab, $index) => expect($tab.text()).to.equal(REFINE_TABS[$index]))
+            .eq(0)
+            // The first tab should be automatically selected
+            .should('have.class', 'selected')
+            .and('be.visible');
+
+        // -------- Create project --------
+
+        // The create project panel should be rendered by default and provide its own tabs
+        getCreateProjectPanel().should('be.visible');
+        getCreateProjectPanelTabs()
+            .should('be.visible')
+            .and('have.length', 3)
+            .each(($tab, $index) => expect($tab.text()).to.equal(CREATE_PROJECT_TABS[$index]))
+            .eq(0)
+            .should('have.class', 'selected')
+            .and('be.visible');
+
+        // The upload panel should be opened by default
+        getCreateProjectPanelBody()
+            .find('.upload-parent #upload')
+            .should('be.visible');
+
+        // Go to URL panel
+        getCreateProjectPanelTabs().eq(1).click();
+        getCreateProjectPanelBody()
+            .find('.default-importing-web-url')
+            .should('be.visible');
+
+        // Go to Clipboard panel
+        getCreateProjectPanelTabs().eq(2).click();
+        getCreateProjectPanelBody()
+            .find('#default-importing-clipboard-textarea')
+            .should('be.visible');
+
+        // -------- Open project --------
+
+        // Go to Open project and check if the panels are properly switched
+        getOntoRefineTabs().eq(1).click();
+        getCreateProjectPanel().should('not.exist');
+        getOpenProjectPanel()
+            .should('be.visible')
+            // Should have no existing projects for new repositories
+            .find('#no-project-message')
+            .should('be.visible');
+
+        // -------- Import project --------
+
+        getOntoRefineTabs().eq(2).click();
+        getOpenProjectPanel().should('not.exist');
+        getImportProjectPanel()
+            .should('be.visible')
+            .find('#import-project-button')
+            .should('be.visible');
+
+        // -------- Language Settings --------
+
+        getOntoRefineTabs().eq(3).click();
+        getImportProjectPanel().should('not.exist');
+        getLanguageSettingsPanel()
+            .should('be.visible')
+            .find('#set-lang-button')
+            .should('be.visible');
+    });
+
+    function getOntoRefineFrame() {
+        return cy.get('#ontorefine-iframe').iframe();
+    }
+
+    function getOntoRefineLeftPanel() {
+        return getOntoRefineFrame().find('#left-panel');
+    }
+
+    function getOntoRefineTabs() {
+        return getOntoRefineLeftPanel().find('#action-area-tabs .action-area-tab');
+    }
+
+    function getOntoRefineRightPanel() {
+        return getOntoRefineFrame().find('#right-panel');
+    }
+
+    function getCreateProjectPanel() {
+        return getOntoRefineRightPanel().find('#create-project-ui-source-selection-layout');
+    }
+
+    function getCreateProjectPanelTabs() {
+        return getCreateProjectPanel().find('#create-project-ui-source-selection-tabs .create-project-ui-source-selection-tab')
+    }
+
+    function getCreateProjectPanelBody() {
+        return getCreateProjectPanel().find('#create-project-ui-source-selection-tab-bodies')
+    }
+
+    function getOpenProjectPanel() {
+        return getOntoRefineRightPanel().find('#projects-container');
+    }
+
+    function getImportProjectPanel() {
+        // TODO Note: The third and fourth tab bodies have the same identifier....
+        return getOntoRefineRightPanel().find('.action-area-tab-body').eq(2);
+    }
+
+    function getLanguageSettingsPanel() {
+        return getOntoRefineRightPanel().find('.action-area-tab-body').eq(3);
+    }
+
+});

package/integration/repository/repositories.spec.js

@@ -36,9 +36,6 @@ describe('Repositories', () => {
         "  ex:age 12.1 ;\n" +
         ".";
 
-    const GDB_REPOSITORY_TYPE = 'gdb';
-    const REPO_LIST_ID = '#wb-repositories-repositoryInGetRepositories';
-
     beforeEach(() => {
         repositoryId = 'repo-' + Date.now();
 
@@ -60,21 +57,6 @@ describe('Repositories', () => {
         getCreateRepositoryButton().should('be.visible').and('not.be.disabled');
     }
 
-    it('create repository page should list available repository types options', () => {
-        let expectedRepoTypes = ['GraphDB Repository', 'Ontop Virtual SPARQL', 'FedX Virtual SPARQL'];
-        createRepository();
-        cy.url().should('include', '/repository/create');
-
-        cy.get('.create-buttons')
-            .find('.h3.repo-type')
-            .should('have.length', 3)
-            .then((repoTypes) => {
-                repoTypes.each(($index, $repoType) => {
-                    expect($repoType.innerText).to.equal(expectedRepoTypes[$index]);
-                });
-            });
-    });
-
     it('should allow creation of repositories with default settings', () => {
         // There should be a default repository location
         getLocationsList()
@@ -84,7 +66,7 @@ describe('Repositories', () => {
         createRepository();
         cy.url().should('include', '/repository/create');
 
-        chooseRepositoryType(GDB_REPOSITORY_TYPE);
+        chooseRepositoryType();
         cy.url().should('include', '/repository/create/');
 
         // Create a repository by supplying only an identifier
@@ -154,7 +136,7 @@ describe('Repositories', () => {
 
     it('should disallow creation of repositories without mandatory settings', () => {
         createRepository();
-        chooseRepositoryType(GDB_REPOSITORY_TYPE);
+        chooseRepositoryType();
         cy.url().should('include', '/repository/create/');
 
         saveRepository();
@@ -172,7 +154,7 @@ describe('Repositories', () => {
         const repoTitle = 'Repo title for ' + repositoryId;
 
         createRepository();
-        chooseRepositoryType(GDB_REPOSITORY_TYPE);
+        chooseRepositoryType();
         cy.url().should('include', '/repository/create/');
 
         getRepositoryIdField().type(repositoryId);
@@ -219,14 +201,14 @@ describe('Repositories', () => {
     it('should allow to switch between repositories', () => {
         const secondRepoId = 'second-repo-' + Date.now();
         createRepository();
-        chooseRepositoryType(GDB_REPOSITORY_TYPE);
+        chooseRepositoryType();
         cy.url().should('include', '/repository/create/');
 
         typeRepositoryId(repositoryId);
         saveRepository();
 
         createRepository();
-        chooseRepositoryType(GDB_REPOSITORY_TYPE);
+        chooseRepositoryType();
         cy.url().should('include', '/repository/create/');
 
         typeRepositoryId(secondRepoId);
@@ -292,7 +274,7 @@ describe('Repositories', () => {
         const newTitle = 'Title edit';
 
         createRepository();
-        chooseRepositoryType(GDB_REPOSITORY_TYPE);
+        chooseRepositoryType();
         cy.url().should('include', '/repository/create/');
 
         typeRepositoryId(repositoryId);
@@ -308,12 +290,9 @@ describe('Repositories', () => {
         typeRepositoryTitle(newTitle);
         getRepositoryContextIndexCheckbox().check();
 
-        getSaveRepositoryButton()
-            .click()
-            .then(() => {
-                confirmModal();
-                waitLoader();
-            });
+        getSaveRepositoryButton().click();
+        confirmModal();
+        waitLoader();
 
         // See the title is rendered in the repositories list
         getRepositoryFromList(repositoryId).should('contain', newTitle);
@@ -327,7 +306,7 @@ describe('Repositories', () => {
 
     it('should allow to delete existing repository', () => {
         createRepository();
-        chooseRepositoryType(GDB_REPOSITORY_TYPE);
+        chooseRepositoryType();
         cy.url().should('include', '/repository/create/');
 
         typeRepositoryId(repositoryId);
@@ -614,7 +593,7 @@ describe('Repositories', () => {
     it('should restart an existing repository', () => {
 
         createRepository();
-        chooseRepositoryType(GDB_REPOSITORY_TYPE);
+        chooseRepositoryType();
 
         cy.url().should('include', '/repository/create');
 
@@ -680,7 +659,7 @@ describe('Repositories', () => {
     it('should create SHACL repo and test shapes validation', () => {
         //Prepare repository by enabling SHACL
         createRepository();
-        chooseRepositoryType(GDB_REPOSITORY_TYPE);
+        chooseRepositoryType();
         cy.url().should('include', '/repository/create/');
         typeRepositoryId(repositoryId);
         getSHACLRepositoryCheckbox().check();
@@ -723,6 +702,8 @@ describe('Repositories', () => {
                 .then($el => $el && $el.text() === status));
     }
 
+    const REPO_LIST_ID = '#wb-repositories-repositoryInGetRepositories';
+
     function getRepositoriesList() {
         return cy.get(REPO_LIST_ID);
     }

package/integration/setup/connectors-lucene.spec.js

@@ -29,21 +29,18 @@ describe('Setup / Connectors - Lucene', () => {
     it('Create, copy and delete a lucene connector', () => {
         getNewLuceneConnectorButton()
             .click();
-
         getCreateLuceneConnectorPage()
-            .should('contain', 'Create new Lucene Connector')
-            .within(() => {
-                getConnectorNameField()
-                    .type(luceneConnectorName);
-                getFieldNameField()
-                    .type(fieldName, {force: true});
-                getPropertyChainField()
-                    .type(connectorPropertyChain, {force: true});
-                getUriTypes()
-                    .type(uriType);
-                confirmCreateConnector();
-            });
-
+            .should('be.visible')
+            .and('contain', 'Create new Lucene Connector');
+        getConnectorNameField()
+            .type(luceneConnectorName);
+        getFieldNameField()
+            .type(fieldName, {force:true});
+        getPropertyChainField()
+            .type(connectorPropertyChain, {force:true});
+        getUriTypes()
+            .type(uriType);
+        confirmCreateConnector();
         verifyStatusToastMessage(connectorCreateToastMessage);
         verifyConnectorExists(luceneConnectorName);
         //copy connector
@@ -52,10 +49,7 @@ describe('Setup / Connectors - Lucene', () => {
             .should('be.visible')
             .click()
             .then(() => {
-                getCreateLuceneConnectorPage()
-                    .within(() => {
-                        confirmCreateConnector();
-                    });
+                confirmCreateConnector();
                 verifyStatusToastMessage(connectorCreateToastMessage + '-copy');
                 verifyConnectorExists(luceneConnectorName + '-copy');
                 //delete connector copy
@@ -67,7 +61,7 @@ describe('Setup / Connectors - Lucene', () => {
                     .should('be.visible')
                     .click();
                 verifyStatusToastMessage(connectorDeleteToastMessage + '-copy');
-            });
+        });
     });
 
     function getConnectorsPage() {
@@ -75,36 +69,39 @@ describe('Setup / Connectors - Lucene', () => {
     }
 
     function getNewLuceneConnectorButton() {
-        return getConnectorsPage().find('.new-connector-btn').contains('Lucene');
+        return getConnectorsPage().find('.new-connector-btn');
     }
 
     function getCreateLuceneConnectorPage() {
-        return cy.get('.modal-content').scrollIntoView().should('be.visible');
+        return cy.get('.modal-content').should('be.visible');
     }
 
     function getConnectorNameField() {
-        return cy.get('.connector-name-field input');
+        return getCreateLuceneConnectorPage().find('.connector-name-field input');
     }
 
     function getFieldNameField() {
-        return cy.get('.child-property-fieldName input');
+        return getCreateLuceneConnectorPage().find('.child-property-fieldName input');
     }
 
     function getPropertyChainField() {
-        return cy.get('.child-property-propertyChain input');
+        return getCreateLuceneConnectorPage().find('.child-property-propertyChain input');
     }
 
     function getUriTypes() {
-        return cy.get('.property-types input');
+        return getCreateLuceneConnectorPage().find('.property-types input');
     }
 
     function confirmCreateConnector() {
-        cy.get('.create-connector-btn')
-            .scrollIntoView()
-            .should('be.visible')
-            .then((btn) => {
-                cy.wrap(btn).click();
-            });
+        getCreateLuceneConnectorPage()
+            .within(() => {
+                cy.get('.create-connector-btn')
+                    .scrollIntoView()
+                    .should('be.visible')
+                    .then((btn) => {
+                        cy.wrap(btn).click();
+                    });
+        });
     }
 
     function verifyConnectorExists(connectorName) {

package/integration/setup/rdf-rank.spec.js

@@ -17,7 +17,7 @@ describe('Setup / RDF Rank', () => {
 
         getRdfRankPage().find('.alert-warning').should('not.be.visible');
 
-        getFilteringSwitch().scrollIntoView().should('be.visible');
+        getFilteringSwitch().should('be.visible');
     }
 
     beforeEach(() => {

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

@@ -16,7 +16,18 @@ describe('Main menu tests', function () {
             {
                 name: 'Import',
                 visible: true,
-                redirect: '/import'
+                submenu: [
+                    {
+                        name: 'RDF',
+                        visible: false,
+                        redirect: '/import'
+                    },
+                    {
+                        name: 'Tabular (OntoRefine)',
+                        visible: false,
+                        redirect: '/ontorefine'
+                    }
+                ]
             },
             {
                 name: 'Explore',
@@ -94,16 +105,6 @@ describe('Main menu tests', function () {
                         visible: false,
                         redirect: '/connectors'
                     },
-                    {
-                        name: 'Cluster',
-                        visible: false,
-                        redirect: '/cluster'
-                    },
-                    {
-                        name: 'Plugins',
-                        visible: false,
-                        redirect: '/plugins'
-                    },
                     {
                         name: 'Namespaces',
                         visible: false,
@@ -158,8 +159,7 @@ describe('Main menu tests', function () {
             let menuVisibilityCheck = menu.visible ? 'be.visible' : 'not.be.visible';
             // Verify that main menu items are present and their visibility
             cy.get('.main-menu .menu-element-root').eq(menuIndex + 1).as('menu')
-                .should(menuVisibilityCheck).within(() =>
-                cy.get('.menu-item').contains(menu.name));
+                .should(menuVisibilityCheck).and('contain', menu.name);
 
             // Verify submenu items and their visibility when the main menu is not opened
             (menu.submenu || []).forEach((submenu, submenuIndex) => {

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

@@ -435,20 +435,11 @@ describe('SPARQL screen validation', () => {
             verifyResultsPageLength(74);
 
             // Uncheck ‘Include inferred’
-             cy.waitUntil(() =>
-                 getInferenceButton()
-                     .within(infBtn =>
-                         {   cy.get('.icon-inferred-on');
-                             console.log(infBtn);
-                             infBtn && cy.wrap(infBtn).click();
-                         }
-                     ).then(() => {
-                     getInferenceButton()
-                         .within(button => {
-                             cy.get('.icon-inferred-off')
-                             cy.wrap(button).should('be.visible')
-                         });
-                 }))
+            cy.waitUntil(() =>
+                getInferenceButton()
+                    .then(infBtn => infBtn && cy.wrap(infBtn).click()))
+                .then(() =>
+                    cy.get('.icon-inferred-off').should('be.visible'));
 
             // Confirm that only inferred statements (only 2) are available
             executeQuery();

package/package.json

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

package/support/sparql-commands.js

@@ -19,9 +19,7 @@ Cypress.Commands.add('verifyResultsPageLength', (resultLength) => {
 Cypress.Commands.add('verifyResultsMessage', (msg) => {
     cy.waitUntil(() =>
         getResultsMessage()
-            .then((resultInfo) => {
-                console.log(resultInfo.text());
-                return resultInfo && resultInfo.text().trim().indexOf(msg) > -1; }));
+            .then(resultInfo => resultInfo.text().trim().indexOf(msg) > -1));
 });
 
 Cypress.Commands.add('getResultsMessage', () => {
@@ -53,7 +51,7 @@ function getQueryTextArea() {
 }
 
 function waitUntilQueryIsVisible() {
-    return cy.waitUntil(() =>
+    cy.waitUntil(() =>
         getQueryArea()
             .then(codeMirrorEl =>
                 codeMirrorEl && codeMirrorEl[0].CodeMirror.getValue().trim().length > 0));

package/integration/setup/plugins.spec.js

@@ -1,69 +0,0 @@
-describe('Plugins', () => {
-
-    let repositoryId;
-
-    function createRepository() {
-        repositoryId = 'plugin-' + Date.now();
-        cy.createRepository({id: repositoryId});
-        cy.presetRepository(repositoryId);
-        cy.initializeRepository(repositoryId);
-    }
-
-    function waitUntilPluginsPageIsLoaded() {
-        // Workbench loading screen should not be visible
-        cy.get('.ot-splash').should('not.be.visible');
-
-        // No active loader
-        cy.get('.ot-loader').should('not.exist');
-    }
-
-    beforeEach(() => {
-        createRepository();
-        cy.visit('/plugins');
-        cy.window();
-        waitUntilPluginsPageIsLoaded();
-    });
-
-    afterEach(() => {
-        cy.visit('/plugins');
-        cy.window();
-        // re-enable historyplugin
-        getPluginsHeader()
-            .should('be.visible').parent().within(() => {
-            cy.get('.switch').then((elem) => {
-                var value = elem.val();
-                if (!value.checked) {
-                    getPluginsSwitch().click();
-                }
-            });
-        });
-        cy.deleteRepository(repositoryId);
-    });
-
-    it('should allow to enable and disable the plugins', () => {
-        // Verify initial status is ON
-        getPluginsHeader()
-            .should('be.visible').parent().within(() => {
-            cy.get('.tag-primary')
-                .contains('ON');
-
-            cy.get('.switch').should('be.checked');
-            getPluginsSwitch().click();
-        });
-        cy.visit('/plugins');
-        cy.window();
-
-        getPluginsHeader()
-            .should('be.visible').parent().within(() => {
-            cy.get('.switch').should('not.be.checked');
-        });
-    });
-
-    function getPluginsHeader() {
-        return cy.get('.plugins-header').contains("history");
-    }
-
-    function getPluginsSwitch() {
-        return cy.get('.plugins-switch');
-    }
-});