This is an automated email from the ASF dual-hosted git repository.
riemer pushed a commit to branch dev
in repository https://gitbox.apache.org/repos/asf/streampipes.git
The following commit(s) were added to refs/heads/dev by this push:
new 60bdb97f87 fix: Modify selectors of cypress tests (#3520)
60bdb97f87 is described below
commit 60bdb97f8760009ef94eeed5f7e49913fcfff0f4
Author: Dominik Riemer <[email protected]>
AuthorDate: Sun Mar 9 21:08:15 2025 +0100
fix: Modify selectors of cypress tests (#3520)
* fix: Modify selectors of cypress tests
* Fix widget type
---
ui/cypress/support/model/DataExplorerWidget.ts | 4 ++--
ui/cypress/support/utils/connect/ConnectUtils.ts | 2 +-
ui/cypress/support/utils/datalake/DataLakeUtils.ts | 5 ++---
ui/cypress/tests/datalake/filterNumericalStringProperties.spec.ts | 3 ++-
ui/cypress/tests/datalake/timeOrderDataView.spec.ts | 5 +++--
ui/cypress/tests/datalake/widgets/heatmap.spec.ts | 2 +-
ui/cypress/tests/datalake/widgets/histogram.spec.ts | 6 +++++-
ui/cypress/tests/datalake/widgets/indicator.spec.ts | 6 +++++-
ui/cypress/tests/datalake/widgets/map.spec.ts | 2 +-
ui/cypress/tests/datalake/widgets/scatter.smoke.spec.ts | 2 +-
ui/cypress/tests/datalake/widgets/table.spec.ts | 7 ++++++-
.../data-explorer-visualisation-settings.component.html | 1 +
12 files changed, 30 insertions(+), 15 deletions(-)
diff --git a/ui/cypress/support/model/DataExplorerWidget.ts
b/ui/cypress/support/model/DataExplorerWidget.ts
index 02594ac963..9d66c550df 100644
--- a/ui/cypress/support/model/DataExplorerWidget.ts
+++ b/ui/cypress/support/model/DataExplorerWidget.ts
@@ -19,6 +19,6 @@
import { TableConfig } from
'../../../src/app/dashboard/components/widgets/table/table-config';
export class DataExplorerWidget {
- public static TABLE = 'Table';
- public static TIME_SERIES = 'Time Series';
+ public static TABLE = 'table';
+ public static TIME_SERIES = 'time-series-chart';
}
diff --git a/ui/cypress/support/utils/connect/ConnectUtils.ts
b/ui/cypress/support/utils/connect/ConnectUtils.ts
index 44f432fb47..7b04699455 100644
--- a/ui/cypress/support/utils/connect/ConnectUtils.ts
+++ b/ui/cypress/support/utils/connect/ConnectUtils.ts
@@ -386,7 +386,7 @@ export class ConnectUtils {
amountOfProperties,
);
- cy.dataCy('live-preview-table-no-data', { timout: 10000 }).should(
+ cy.dataCy('live-preview-table-no-data', { timeout: 30000 }).should(
'not.exist',
);
}
diff --git a/ui/cypress/support/utils/datalake/DataLakeUtils.ts
b/ui/cypress/support/utils/datalake/DataLakeUtils.ts
index 5ad599ad42..53fa31a777 100644
--- a/ui/cypress/support/utils/datalake/DataLakeUtils.ts
+++ b/ui/cypress/support/utils/datalake/DataLakeUtils.ts
@@ -375,12 +375,11 @@ export class DataLakeUtils {
/**
* Select visualization type
*/
- public static selectVisualizationType(type: string | 'Table') {
+ public static selectVisualizationType(type: string | 'table') {
// Select visualization type
cy.dataCy('data-explorer-select-visualization-type', { timeout: 10000
})
.click()
- .get('mat-option')
- .contains(type)
+ .dataCy(`select-widget-${type}`)
.click();
}
diff --git a/ui/cypress/tests/datalake/filterNumericalStringProperties.spec.ts
b/ui/cypress/tests/datalake/filterNumericalStringProperties.spec.ts
index 003e5c23c0..3a699d348d 100644
--- a/ui/cypress/tests/datalake/filterNumericalStringProperties.spec.ts
+++ b/ui/cypress/tests/datalake/filterNumericalStringProperties.spec.ts
@@ -23,6 +23,7 @@ import { AdapterBuilder } from
'../../support/builder/AdapterBuilder';
import { ConnectBtns } from '../../support/utils/connect/ConnectBtns';
import { ConnectUtils } from '../../support/utils/connect/ConnectUtils';
import { FileManagementUtils } from '../../support/utils/FileManagementUtils';
+import { DataExplorerWidget } from '../../support/model/DataExplorerWidget';
describe('Validate that filter works for numerical dimension property', () => {
beforeEach('Setup Test', () => {
@@ -54,7 +55,7 @@ describe('Validate that filter works for numerical dimension
property', () => {
DataLakeUtils.clickOrderBy('descending');
DataLakeUtils.openVisualizationConfig();
- DataLakeUtils.selectVisualizationType('Table');
+ DataLakeUtils.selectVisualizationType(DataExplorerWidget.TABLE);
DataLakeUtils.selectTimeRange(startDate, endDate);
cy.wait(1000);
diff --git a/ui/cypress/tests/datalake/timeOrderDataView.spec.ts
b/ui/cypress/tests/datalake/timeOrderDataView.spec.ts
index 4948be6ad1..28ec6d97ef 100644
--- a/ui/cypress/tests/datalake/timeOrderDataView.spec.ts
+++ b/ui/cypress/tests/datalake/timeOrderDataView.spec.ts
@@ -18,6 +18,7 @@
import { DataLakeUtils } from '../../support/utils/datalake/DataLakeUtils';
import { DataLakeBtns } from '../../support/utils/datalake/DataLakeBtns';
+import { DataExplorerWidget } from '../../support/model/DataExplorerWidget';
describe('Test Time Order in Data Explorer', () => {
beforeEach('Setup Test', () => {
@@ -34,7 +35,7 @@ describe('Test Time Order in Data Explorer', () => {
DataLakeUtils.clickOrderBy('descending');
DataLakeUtils.openVisualizationConfig();
- DataLakeUtils.selectVisualizationType('Table');
+ DataLakeUtils.selectVisualizationType(DataExplorerWidget.TABLE);
DataLakeUtils.selectTimeRange(startDate, endDate);
cy.wait(1000);
@@ -55,7 +56,7 @@ describe('Test Time Order in Data Explorer', () => {
DataLakeBtns.editDataViewButton('Newchart');
DataLakeUtils.clickOrderBy('ascending');
DataLakeUtils.openVisualizationConfig();
- DataLakeUtils.selectVisualizationType('Table');
+ DataLakeUtils.selectVisualizationType(DataExplorerWidget.TABLE);
DataLakeUtils.selectTimeRange(startDate, endDate);
cy.wait(1000);
diff --git a/ui/cypress/tests/datalake/widgets/heatmap.spec.ts
b/ui/cypress/tests/datalake/widgets/heatmap.spec.ts
index 1f0866bd9b..ac463a9647 100644
--- a/ui/cypress/tests/datalake/widgets/heatmap.spec.ts
+++ b/ui/cypress/tests/datalake/widgets/heatmap.spec.ts
@@ -24,7 +24,7 @@ describe('Test Heatmap View in Data Explorer', () => {
});
it('Perform Test', () => {
- DataLakeUtils.addDataViewAndWidget('view', 'Persist', 'Heatmap');
+ DataLakeUtils.addDataViewAndWidget('view', 'Persist', 'heatmap');
// Check checkbox
DataLakeUtils.openVisualizationConfig();
diff --git a/ui/cypress/tests/datalake/widgets/histogram.spec.ts
b/ui/cypress/tests/datalake/widgets/histogram.spec.ts
index 5a143eff1c..eb31c64a10 100644
--- a/ui/cypress/tests/datalake/widgets/histogram.spec.ts
+++ b/ui/cypress/tests/datalake/widgets/histogram.spec.ts
@@ -24,7 +24,11 @@ describe('Test Histogram View in Data Explorer', () => {
});
it('Perform Test', () => {
- DataLakeUtils.addDataViewAndWidget('view', 'Persist', 'Histogram');
+ DataLakeUtils.addDataViewAndWidget(
+ 'view',
+ 'Persist',
+ 'histogram-chart',
+ );
// Change field for histogram
DataLakeUtils.openVisualizationConfig();
diff --git a/ui/cypress/tests/datalake/widgets/indicator.spec.ts
b/ui/cypress/tests/datalake/widgets/indicator.spec.ts
index 9d3de3b617..0fb0bfc00c 100644
--- a/ui/cypress/tests/datalake/widgets/indicator.spec.ts
+++ b/ui/cypress/tests/datalake/widgets/indicator.spec.ts
@@ -24,7 +24,11 @@ describe('Test Indicator View in Data Explorer', () => {
});
it('Perform Test', () => {
- DataLakeUtils.addDataViewAndWidget('view', 'Persist', 'Indicator');
+ DataLakeUtils.addDataViewAndWidget(
+ 'view',
+ 'Persist',
+ 'indicator-chart',
+ );
// Check checkbox
DataLakeUtils.openVisualizationConfig();
diff --git a/ui/cypress/tests/datalake/widgets/map.spec.ts
b/ui/cypress/tests/datalake/widgets/map.spec.ts
index 256137e6c0..e5e13c2b4a 100644
--- a/ui/cypress/tests/datalake/widgets/map.spec.ts
+++ b/ui/cypress/tests/datalake/widgets/map.spec.ts
@@ -24,7 +24,7 @@ describe('Test Map View in Data Explorer', () => {
});
it('Perform Test', () => {
- DataLakeUtils.addDataViewAndWidget('view', 'Persist', 'Map');
+ DataLakeUtils.addDataViewAndWidget('view', 'Persist', 'map');
// Change marker positions
DataLakeUtils.openVisualizationConfig();
diff --git a/ui/cypress/tests/datalake/widgets/scatter.smoke.spec.ts
b/ui/cypress/tests/datalake/widgets/scatter.smoke.spec.ts
index 25df917bad..e92dbe872a 100644
--- a/ui/cypress/tests/datalake/widgets/scatter.smoke.spec.ts
+++ b/ui/cypress/tests/datalake/widgets/scatter.smoke.spec.ts
@@ -24,7 +24,7 @@ describe('Test Scatter View in Data Explorer', () => {
});
it('Perform Test', () => {
- DataLakeUtils.addDataViewAndWidget('view', 'Persist', 'Scatter');
+ DataLakeUtils.addDataViewAndWidget('view', 'Persist', 'scatter-chart');
// Check if scatter plot is displayed
cy.dataCy('scatter-chart').should('be.visible');
diff --git a/ui/cypress/tests/datalake/widgets/table.spec.ts
b/ui/cypress/tests/datalake/widgets/table.spec.ts
index 62c820f7b9..3a501efa68 100644
--- a/ui/cypress/tests/datalake/widgets/table.spec.ts
+++ b/ui/cypress/tests/datalake/widgets/table.spec.ts
@@ -18,6 +18,7 @@
import { DataLakeUtils } from '../../../support/utils/datalake/DataLakeUtils';
import { DataLakeWidgetTableUtils } from
'../../../support/utils/datalake/DataLakeWidgetTableUtils';
+import { DataExplorerWidget } from '../../../support/model/DataExplorerWidget';
describe('Test Table View in Data Explorer', () => {
beforeEach('Setup Test', () => {
@@ -25,7 +26,11 @@ describe('Test Table View in Data Explorer', () => {
});
it('Perform Test', () => {
- DataLakeUtils.addDataViewAndWidget('view', 'Persist', 'Table');
+ DataLakeUtils.addDataViewAndWidget(
+ 'view',
+ 'Persist',
+ DataExplorerWidget.TABLE,
+ );
// Check if table is displayed correctly
DataLakeWidgetTableUtils.checkAmountOfRows(10);
diff --git
a/ui/src/app/data-explorer/components/chart-view/designer-panel/visualisation-settings/data-explorer-visualisation-settings.component.html
b/ui/src/app/data-explorer/components/chart-view/designer-panel/visualisation-settings/data-explorer-visualisation-settings.component.html
index 3719c9ae05..7c3080bc65 100644
---
a/ui/src/app/data-explorer/components/chart-view/designer-panel/visualisation-settings/data-explorer-visualisation-settings.component.html
+++
b/ui/src/app/data-explorer/components/chart-view/designer-panel/visualisation-settings/data-explorer-visualisation-settings.component.html
@@ -31,6 +31,7 @@
>
<mat-option
[value]="widget.id"
+ [attr.data-cy]="'select-widget-' + widget.id"
*ngFor="let widget of availableWidgets"
>
<span class="pipeline-name">{{ widget.label }}</span>
