diff --git a/e2e-playwright/dashboards-suite/dashboard-time-zone.spec.ts b/e2e-playwright/dashboards-suite/dashboard-time-zone.spec.ts index 271e2f42b1f..6d4b589b79c 100644 --- a/e2e-playwright/dashboards-suite/dashboard-time-zone.spec.ts +++ b/e2e-playwright/dashboards-suite/dashboard-time-zone.spec.ts @@ -17,7 +17,7 @@ test.describe( tag: ['@dashboards'], }, () => { - test.fixme('Tests dashboard time zone scenarios', async ({ page, gotoDashboardPage, selectors }) => { + test('Tests dashboard time zone scenarios', async ({ page, gotoDashboardPage, selectors }) => { const dashboardPage = await gotoDashboardPage({ uid: TIMEZONE_DASHBOARD_UID }); const fromTimeZone = 'UTC'; @@ -106,12 +106,18 @@ test.describe( zone: 'Browser', }); - await expect( - dashboardPage - .getByGrafanaSelector(selectors.components.Panels.Panel.title('Panel with relative time override')) - .locator('[role="row"]') - .filter({ hasText: '00:00:00' }) - ).toBeVisible(); + const relativeTimeRow = dashboardPage + .getByGrafanaSelector(selectors.components.Panels.Panel.title('Panel with relative time override')) + .locator('[role="row"]') + .filter({ hasText: '00:00:00' }) + .first(); + const timezoneRow = dashboardPage + .getByGrafanaSelector(selectors.components.Panels.Panel.title('Panel in timezone')) + .locator('[role="row"]') + .filter({ hasText: '00:00:00' }) + .first(); + + await expect(relativeTimeRow).toBeVisible(); // Today so far, still in Browser timezone await setTimeRange(page, dashboardPage, selectors, { @@ -119,19 +125,8 @@ test.describe( to: 'now', }); - await expect( - dashboardPage - .getByGrafanaSelector(selectors.components.Panels.Panel.title('Panel with relative time override')) - .locator('[role="row"]') - .filter({ hasText: '00:00:00' }) - ).toBeVisible(); - - await expect( - dashboardPage - .getByGrafanaSelector(selectors.components.Panels.Panel.title('Panel in timezone')) - .locator('[role="row"]') - .filter({ hasText: '00:00:00' }) - ).toBeVisible(); + await expect(relativeTimeRow).toBeVisible(); + await expect(timezoneRow).toBeVisible(); // Test UTC timezone await setTimeRange(page, dashboardPage, selectors, { @@ -140,12 +135,7 @@ test.describe( zone: 'Coordinated Universal Time', }); - await expect( - dashboardPage - .getByGrafanaSelector(selectors.components.Panels.Panel.title('Panel with relative time override')) - .locator('[role="row"]') - .filter({ hasText: '00:00:00' }) - ).toBeVisible(); + await expect(relativeTimeRow).toBeVisible(); // Today so far, still in UTC timezone await setTimeRange(page, dashboardPage, selectors, { @@ -153,19 +143,8 @@ test.describe( to: 'now', }); - await expect( - dashboardPage - .getByGrafanaSelector(selectors.components.Panels.Panel.title('Panel with relative time override')) - .locator('[role="row"]') - .filter({ hasText: '00:00:00' }) - ).toBeVisible(); - - await expect( - dashboardPage - .getByGrafanaSelector(selectors.components.Panels.Panel.title('Panel in timezone')) - .locator('[role="row"]') - .filter({ hasText: '00:00:00' }) - ).toBeVisible(); + await expect(relativeTimeRow).toBeVisible(); + await expect(timezoneRow).toBeVisible(); // Test Tokyo timezone await setTimeRange(page, dashboardPage, selectors, { @@ -174,12 +153,7 @@ test.describe( zone: 'Asia/Tokyo', }); - await expect( - dashboardPage - .getByGrafanaSelector(selectors.components.Panels.Panel.title('Panel with relative time override')) - .locator('[role="row"]') - .filter({ hasText: '00:00:00' }) - ).toBeVisible(); + await expect(relativeTimeRow).toBeVisible(); // Today so far, still in Tokyo timezone await setTimeRange(page, dashboardPage, selectors, { @@ -187,19 +161,8 @@ test.describe( to: 'now', }); - await expect( - dashboardPage - .getByGrafanaSelector(selectors.components.Panels.Panel.title('Panel with relative time override')) - .locator('[role="row"]') - .filter({ hasText: '00:00:00' }) - ).toBeVisible(); - - await expect( - dashboardPage - .getByGrafanaSelector(selectors.components.Panels.Panel.title('Panel in timezone')) - .locator('[role="row"]') - .filter({ hasText: '00:00:00' }) - ).toBeVisible(); + await expect(relativeTimeRow).toBeVisible(); + await expect(timezoneRow).toBeVisible(); // Test LA timezone await setTimeRange(page, dashboardPage, selectors, { @@ -208,12 +171,7 @@ test.describe( zone: 'America/Los Angeles', }); - await expect( - dashboardPage - .getByGrafanaSelector(selectors.components.Panels.Panel.title('Panel with relative time override')) - .locator('[role="row"]') - .filter({ hasText: '00:00:00' }) - ).toBeVisible(); + await expect(relativeTimeRow).toBeVisible(); // Today so far, still in LA timezone await setTimeRange(page, dashboardPage, selectors, { @@ -221,19 +179,8 @@ test.describe( to: 'now', }); - await expect( - dashboardPage - .getByGrafanaSelector(selectors.components.Panels.Panel.title('Panel with relative time override')) - .locator('[role="row"]') - .filter({ hasText: '00:00:00' }) - ).toBeVisible(); - - await expect( - dashboardPage - .getByGrafanaSelector(selectors.components.Panels.Panel.title('Panel in timezone')) - .locator('[role="row"]') - .filter({ hasText: '00:00:00' }) - ).toBeVisible(); + await expect(relativeTimeRow).toBeVisible(); + await expect(timezoneRow).toBeVisible(); }); } );