graphdb-workbench-tests 2.2.1-TR1 → 2.2.1-TR3

package/integration/monitor/monitor.resources.spec.js

@@ -1,4 +1,6 @@
-describe('Monitor Resources', () => {
+// Skipped because cluster health throws an error as there is no cluster.
+// TODO Unskip this either when cluster is available for cypress tests or when proper error handling in the monitor view is implemented
+describe.skip('Monitor Resources', () => {
 
     let repositoryId;
 
@@ -18,7 +20,7 @@ describe('Monitor Resources', () => {
         cy.get('.ot-loader').should('not.be.visible');
 
         // Ensure the chart on the default active tab is rendered
-        getActiveTabContent().find('svg').should('be.visible');
+        getActiveTabContent().should('be.visible');
     });
 
     after(() => {
@@ -29,33 +31,100 @@ describe('Monitor Resources', () => {
         return cy.get('.graphics');
     }
 
+    function getTabButtons() {
+        return getTabsPanel().find('.nav-item');
+    }
+
     function getActiveTab() {
-        return getTabsPanel().find('.nav-link.active');
+        return getTabButtons().find('.nav-link.active');
     }
 
     function getTabContent() {
-        return cy.get('.tab-content');
+        return cy.get('.tabs');
     }
 
     function getActiveTabContent() {
-        return getTabContent().find('.tab-pane.active');
+        return getTabContent().find('.tab-pane');
+    }
+
+    function getChart(id) {
+        return getTabContent().find(`#${id}`);
     }
 
-    function getMemoryUsageChart() {
-        return getTabContent().find('.nv-stackedAreaChart');
+    function verifyCharts(charts) {
+        charts.forEach((chart) => {
+            getChart(chart.id).scrollIntoView().find('.chart-header').should('contain', chart.label);
+            getChart(chart.id).scrollIntoView().find(`.${chart.type}`).should('be.visible');
+        });
     }
 
-    it('Initial state ', () => {
+    it('Should display monitor tabs ', () => {
+        const tabs = ['Resource monitoring', 'Performance', 'Cluster health'];
+
         // Graphics container should be present
         getTabsPanel().should('be.visible');
         // All tabs should be visible
-        let tabs = ['Memory', 'Threads', 'CPU', 'Classes'];
-        getTabsPanel().find('.nav-item').should('have.length', 4).each(($tab, index) => {
+        getTabButtons().should('have.length', tabs.length).each(($tab, index) => {
             cy.wrap($tab).should('be.visible').contains(tabs[index]);
         });
-        // And "Memory" tab should be opened by default
-        getActiveTab().contains('Memory');
-        getMemoryUsageChart().should('be.visible');
-        getActiveTabContent().find('h2').contains('Heap Memory Usage');
+        // Default tap should be Resource monitoring
+        getActiveTab().should('contain', 'Resource monitoring');
+    });
+
+    it('Resource monitoring tab should show cpu, file, storage and memory charts', () => {
+        const charts = [{
+            id: 'CPUUsageGraphic',
+            label: 'System CPU Load',
+            type: 'nv-lineChart'
+        }, {
+            id: 'openFileDescriptors',
+            label: 'File descriptors',
+            type: 'nv-lineChart'
+        }, {
+            id: 'heapMemoryGraphic',
+            label: 'Heap memory usage',
+            type: 'nv-lineChart'
+        }, {
+            id: 'offHeapMemoryGraphic',
+            label: 'Off-heap memory usage',
+            type: 'nv-lineChart'
+        }, {
+            id: 'diskStorage',
+            label: 'Disk Storage',
+            type: 'nv-multiBarHorizontalChart'
+        }];
+        verifyCharts(charts);
+    });
+
+    it('Performance monitoring tab should show charts', () => {
+        getTabButtons().eq(1).click();
+        const charts = [{
+            id: 'activeQueries',
+            label: 'Queries',
+            type: 'nv-lineChart'
+        }, {
+            id: 'globalCache',
+            label: 'Global cache',
+            type: 'nv-lineChart'
+        }, {
+            id: 'epool',
+            label: 'Entity pool',
+            type: 'multiChart'
+        }, {
+            id: 'connections',
+            label: 'Transactions and Connections',
+            type: 'nv-lineChart'
+        }];
+        verifyCharts(charts);
+    });
+
+    it('Cluster health monitoring tab should show charts', () => {
+        getTabButtons().eq(2).click();
+        const charts = [{
+            id: 'clusterHealth',
+            label: 'Cluster health',
+            type: 'nv-stackedarea'
+        }];
+        verifyCharts(charts);
     });
 });

package/integration/repository/repositories.spec.js

@@ -41,7 +41,8 @@ describe('Repositories', () => {
 
     beforeEach(() => {
         repositoryId = 'repo-' + Date.now();
-        cy.intercept('/rest/locations').as('getLocations');
+        cy.intercept('/rest/locations?filterClusterLocations=true').as('getLocations');
+        cy.intercept('/rest/repositories/all').as('getRepositories');
 
         cy.visit('/repository');
         waitLoader();
@@ -89,7 +90,7 @@ describe('Repositories', () => {
         cy.url().should('include', '/repository/create/');
 
         // Create a repository by supplying only an identifier
-        getRepositoryCreateForm().should('be.visible');
+        getRepositoryCreateForm();
         getRepositoryIdField()
             .should('have.value', '')
             .type(repositoryId)
@@ -160,7 +161,7 @@ describe('Repositories', () => {
 
         saveRepository();
 
-        getRepositoryCreateForm().should('be.visible');
+        getRepositoryCreateForm();
         getRepositoryIdField().should('have.attr', 'placeholder', 'This field is required');
 
         getToast()
@@ -208,7 +209,7 @@ describe('Repositories', () => {
 
         cy.url().should('include', '/repository/edit/' + repositoryId);
 
-        getRepositoryCreateForm().should('be.visible');
+        getRepositoryCreateForm();
         getRepositoryIdField().should('have.value', repositoryId);
         getRepositoryTitleField().should('have.value', repoTitle);
         // OWL-Horst (Optimized) has become 4
@@ -228,7 +229,6 @@ describe('Repositories', () => {
 
         typeRepositoryId(repositoryId);
         saveRepository();
-        cy.wait('@getLocations');
 
         createRepository();
         chooseRepositoryType(GDB_REPOSITORY_TYPE);
@@ -236,6 +236,11 @@ describe('Repositories', () => {
 
         typeRepositoryId(secondRepoId);
         saveRepository();
+        cy.wait('@getRepositories');
+
+        // Wait for redirection to previous '/repository'
+        cy.waitUntil(() =>
+                cy.url().then(url => url === (Cypress.config('baseUrl') + '/repository')));
 
         // Connect to the first repo via the connection icon
         // Note: Not using within() because the whole row will be re-rendered & detached
@@ -304,7 +309,6 @@ describe('Repositories', () => {
         typeRepositoryId(repositoryId);
         typeRepositoryTitle('Title');
         saveRepository();
-        cy.wait('@getLocations');
         editRepository(repositoryId);
 
         // Some fields should be disabled
@@ -344,7 +348,6 @@ describe('Repositories', () => {
 
         typeRepositoryId(repositoryId);
         saveRepository();
-        cy.wait('@getLocations');
         selectRepoFromDropdown(repositoryId);
 
         getRepositoryFromList(repositoryId)
@@ -356,8 +359,6 @@ describe('Repositories', () => {
 
         confirmModal();
 
-        getRepositoriesList().should('not.exist');
-
         // Check the repo has been deselected and is not present in the repo dropdown menu
         getRepositoriesDropdown().click().within(() => {
             cy.get('#btnReposGroup').should('not.contain', repositoryId);
@@ -519,7 +520,7 @@ describe('Repositories', () => {
         cy.url().should('include', '/repository/create/ontop');
 
         // Create a repository by supplying only an identifier
-        getRepositoryCreateForm().should('be.visible');
+        getRepositoryCreateForm();
         getRepositoryIdField()
             .should('have.value', '')
             .type(repositoryId)
@@ -629,7 +630,7 @@ describe('Repositories', () => {
         cy.url().should('include', '/repository/create');
 
         // Create a repository by supplying only an identifier
-        getRepositoryCreateForm().should('be.visible');
+        getRepositoryCreateForm();
         getRepositoryIdField()
             .should('have.value', '')
             .type(repositoryId)
@@ -807,7 +808,7 @@ describe('Repositories', () => {
     }
 
     function getRepositoryCreateForm() {
-        return cy.get('#newRepoForm');
+        return cy.get('#newRepoForm').should('be.visible');
     }
 
     function getRepositoryIdField() {

package/package.json

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