You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@streampipes.apache.org by ze...@apache.org on 2024/03/27 12:13:58 UTC
(streampipes) branch dev updated: fix: Fix the e2e tests for data explorer line charts (#2647)
This is an automated email from the ASF dual-hosted git repository.
zehnder 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 b79ffdc8df fix: Fix the e2e tests for data explorer line charts (#2647)
b79ffdc8df is described below
commit b79ffdc8dfb6946b8673a0028d82b114c05fe1c5
Author: Philipp Zehnder <te...@users.noreply.github.com>
AuthorDate: Wed Mar 27 13:13:51 2024 +0100
fix: Fix the e2e tests for data explorer line charts (#2647)
---
ui/cypress/support/utils/datalake/DataLakeUtils.ts | 5 ++---
ui/cypress/tests/datalake/widgets/heatmap.spec.ts | 2 +-
ui/cypress/tests/datalake/widgets/histogram.spec.ts | 2 +-
ui/cypress/tests/datalake/widgets/indicator.spec.ts | 2 +-
ui/cypress/tests/datalake/widgets/map.spec.ts | 4 ++--
.../tests/datalake/widgets/timeSeriesSave.spec.ts | 19 ++++++++++++++-----
.../time-series-item-config.component.html | 2 ++
7 files changed, 23 insertions(+), 13 deletions(-)
diff --git a/ui/cypress/support/utils/datalake/DataLakeUtils.ts b/ui/cypress/support/utils/datalake/DataLakeUtils.ts
index f3abd1ecd3..1788212551 100644
--- a/ui/cypress/support/utils/datalake/DataLakeUtils.ts
+++ b/ui/cypress/support/utils/datalake/DataLakeUtils.ts
@@ -99,7 +99,7 @@ export class DataLakeUtils {
// DataLakeUtils.addNewWidget();
DataLakeUtils.selectDataSet(dataSet);
DataLakeUtils.dataConfigSelectAllFields();
- DataLakeUtils.selectVisualizationConfig();
+ DataLakeUtils.openVisualizationConfig();
DataLakeUtils.selectVisualizationType(widgetType);
DataLakeUtils.clickCreateButton();
@@ -266,8 +266,7 @@ export class DataLakeUtils {
cy.get('.mdc-tab__text-label').contains('Data').parent().click();
}
- public static selectVisualizationConfig() {
- // Click Next button
+ public static openVisualizationConfig() {
cy.get('.mdc-tab__text-label')
.contains('Visualization')
.parent()
diff --git a/ui/cypress/tests/datalake/widgets/heatmap.spec.ts b/ui/cypress/tests/datalake/widgets/heatmap.spec.ts
index 45d98d2cb6..1f0866bd9b 100644
--- a/ui/cypress/tests/datalake/widgets/heatmap.spec.ts
+++ b/ui/cypress/tests/datalake/widgets/heatmap.spec.ts
@@ -27,7 +27,7 @@ describe('Test Heatmap View in Data Explorer', () => {
DataLakeUtils.addDataViewAndWidget('view', 'Persist', 'Heatmap');
// Check checkbox
- DataLakeUtils.selectVisualizationConfig();
+ DataLakeUtils.openVisualizationConfig();
cy.get('mat-checkbox input').click({ force: true });
// Check if heatmap chart is visible
diff --git a/ui/cypress/tests/datalake/widgets/histogram.spec.ts b/ui/cypress/tests/datalake/widgets/histogram.spec.ts
index 043f9f718f..5a143eff1c 100644
--- a/ui/cypress/tests/datalake/widgets/histogram.spec.ts
+++ b/ui/cypress/tests/datalake/widgets/histogram.spec.ts
@@ -27,7 +27,7 @@ describe('Test Histogram View in Data Explorer', () => {
DataLakeUtils.addDataViewAndWidget('view', 'Persist', 'Histogram');
// Change field for histogram
- DataLakeUtils.selectVisualizationConfig();
+ DataLakeUtils.openVisualizationConfig();
// Check if histogram chart is displayed
cy.dataCy('histogram-chart').should('be.visible');
diff --git a/ui/cypress/tests/datalake/widgets/indicator.spec.ts b/ui/cypress/tests/datalake/widgets/indicator.spec.ts
index b4109b1b60..9d3de3b617 100644
--- a/ui/cypress/tests/datalake/widgets/indicator.spec.ts
+++ b/ui/cypress/tests/datalake/widgets/indicator.spec.ts
@@ -27,7 +27,7 @@ describe('Test Indicator View in Data Explorer', () => {
DataLakeUtils.addDataViewAndWidget('view', 'Persist', 'Indicator');
// Check checkbox
- DataLakeUtils.selectVisualizationConfig();
+ DataLakeUtils.openVisualizationConfig();
cy.dataCy('data-explorer-select-delta-checkbox').click();
cy.dataCy('indicator-chart').should('be.visible');
diff --git a/ui/cypress/tests/datalake/widgets/map.spec.ts b/ui/cypress/tests/datalake/widgets/map.spec.ts
index 72e08da3d3..256137e6c0 100644
--- a/ui/cypress/tests/datalake/widgets/map.spec.ts
+++ b/ui/cypress/tests/datalake/widgets/map.spec.ts
@@ -27,7 +27,7 @@ describe('Test Map View in Data Explorer', () => {
DataLakeUtils.addDataViewAndWidget('view', 'Persist', 'Map');
// Change marker positions
- DataLakeUtils.selectVisualizationConfig();
+ DataLakeUtils.openVisualizationConfig();
cy.dataCy('data-view-map-select-latitude')
.click()
.get('mat-option')
@@ -48,7 +48,7 @@ describe('Test Map View in Data Explorer', () => {
);
// Change from markers to trace
- DataLakeUtils.selectVisualizationConfig();
+ DataLakeUtils.openVisualizationConfig();
cy.dataCy('data-view-map-select-marker-or-trace')
.click()
.get('mat-option')
diff --git a/ui/cypress/tests/datalake/widgets/timeSeriesSave.spec.ts b/ui/cypress/tests/datalake/widgets/timeSeriesSave.spec.ts
index 098b332b30..464b5f2ee8 100644
--- a/ui/cypress/tests/datalake/widgets/timeSeriesSave.spec.ts
+++ b/ui/cypress/tests/datalake/widgets/timeSeriesSave.spec.ts
@@ -58,16 +58,25 @@ const runTestCase = (editOption: boolean) => {
}
// Change first field from line plot to scatter plot
- DataLakeUtils.selectVisualizationConfig();
- cy.get('div').contains('Line').click();
- cy.get('div').contains('Scatter').click();
+ DataLakeUtils.openVisualizationConfig();
+
+ // select type scatter
+ cy.dataCy('time-series-item-config-toggle').first().click();
+ cy.dataCy('time-series-item-config-type')
+ .click()
+ .get('mat-option')
+ .contains('Scatter')
+ .click();
// Check if scatter plot is displayed
cy.dataCy('time-series-chart').should('be.visible');
// Change second field from line plot to bar plot
- cy.get('div').contains('Line').click();
- cy.get('div').contains('Bar').click();
+ cy.dataCy('time-series-item-config-type')
+ .click()
+ .get('mat-option')
+ .contains('Line')
+ .click();
// Check if bar plot is displayed
cy.dataCy('time-series-chart').should('be.visible');
diff --git a/ui/src/app/data-explorer/components/widgets/utils/select-color-properties/time-series-item-config/time-series-item-config.component.html b/ui/src/app/data-explorer/components/widgets/utils/select-color-properties/time-series-item-config/time-series-item-config.component.html
index 3c3ce3e51f..c2ecb55588 100644
--- a/ui/src/app/data-explorer/components/widgets/utils/select-color-properties/time-series-item-config/time-series-item-config.component.html
+++ b/ui/src/app/data-explorer/components/widgets/utils/select-color-properties/time-series-item-config/time-series-item-config.component.html
@@ -46,6 +46,7 @@
mat-icon-button
color="accent"
matTooltip="Field settings"
+ data-cy="time-series-item-config-toggle"
(click)="toggleExpand()"
[disabled]="!isSelected(field)"
>
@@ -121,6 +122,7 @@
appearance="outline"
color="accent"
class="w-100"
+ data-cy="time-series-item-config-type"
>
<mat-select
[(value)]="