From 99daa4454b4f089b3ef61e92d85794156873e695 Mon Sep 17 00:00:00 2001 From: Lukas Siatka Date: Fri, 6 Mar 2020 00:28:20 +0100 Subject: [PATCH] Alerting: Fix state age test failures (#22606) - use output from relative time instead of static string to prevent clock issues --- .../features/alerting/state/reducers.test.ts | 36 +++++++++---------- 1 file changed, 18 insertions(+), 18 deletions(-) diff --git a/public/app/features/alerting/state/reducers.test.ts b/public/app/features/alerting/state/reducers.test.ts index 508b3285d2b..fe6afb79659 100644 --- a/public/app/features/alerting/state/reducers.test.ts +++ b/public/app/features/alerting/state/reducers.test.ts @@ -4,9 +4,9 @@ import { AlertRuleDTO, AlertRulesState } from 'app/types'; import { reducerTester } from '../../../../test/core/redux/reducerTester'; describe('Alert rules', () => { - const newStateDate = dateTime() - .subtract(1, 'y') - .format('YYYY-MM-DD'); + const newStateDate = dateTime().subtract(1, 'y'); + const newStateDateFormatted = newStateDate.format('YYYY-MM-DD'); + const newStateDateAge = newStateDate.fromNow(true); const payload: AlertRuleDTO[] = [ { id: 2, @@ -16,7 +16,7 @@ describe('Alert rules', () => { panelId: 4, name: 'TestData - Always Alerting', state: 'alerting', - newStateDate: `${newStateDate}T10:00:30+02:00`, + newStateDate: `${newStateDateFormatted}T10:00:30+02:00`, evalDate: '0001-01-01T00:00:00Z', evalData: { evalMatches: [{ metric: 'A-series', tags: null, value: 215 }] }, executionError: '', @@ -30,7 +30,7 @@ describe('Alert rules', () => { panelId: 3, name: 'TestData - Always OK', state: 'ok', - newStateDate: `${newStateDate}T10:01:01+02:00`, + newStateDate: `${newStateDateFormatted}T10:01:01+02:00`, evalDate: '0001-01-01T00:00:00Z', evalData: {}, executionError: '', @@ -44,7 +44,7 @@ describe('Alert rules', () => { panelId: 3, name: 'TestData - ok', state: 'ok', - newStateDate: `${newStateDate}T10:01:01+02:00`, + newStateDate: `${newStateDateFormatted}T10:01:01+02:00`, evalDate: '0001-01-01T00:00:00Z', evalData: {}, executionError: 'error', @@ -58,7 +58,7 @@ describe('Alert rules', () => { panelId: 3, name: 'TestData - Paused', state: 'paused', - newStateDate: `${newStateDate}T10:01:01+02:00`, + newStateDate: `${newStateDateFormatted}T10:01:01+02:00`, evalDate: '0001-01-01T00:00:00Z', evalData: {}, executionError: 'error', @@ -72,7 +72,7 @@ describe('Alert rules', () => { panelId: 3, name: 'TestData - Ok', state: 'ok', - newStateDate: `${newStateDate}T10:01:01+02:00`, + newStateDate: `${newStateDateFormatted}T10:01:01+02:00`, evalDate: '0001-01-01T00:00:00Z', evalData: { noData: true, @@ -126,10 +126,10 @@ describe('Alert rules', () => { executionError: '', id: 2, name: 'TestData - Always Alerting', - newStateDate: `${newStateDate}T10:00:30+02:00`, + newStateDate: `${newStateDateFormatted}T10:00:30+02:00`, panelId: 4, state: 'alerting', - stateAge: 'a year', + stateAge: newStateDateAge, stateClass: 'alert-state-critical', stateIcon: 'icon-gf icon-gf-critical', stateText: 'ALERTING', @@ -144,10 +144,10 @@ describe('Alert rules', () => { executionError: '', id: 1, name: 'TestData - Always OK', - newStateDate: `${newStateDate}T10:01:01+02:00`, + newStateDate: `${newStateDateFormatted}T10:01:01+02:00`, panelId: 3, state: 'ok', - stateAge: 'a year', + stateAge: newStateDateAge, stateClass: 'alert-state-ok', stateIcon: 'icon-gf icon-gf-online', stateText: 'OK', @@ -163,10 +163,10 @@ describe('Alert rules', () => { id: 3, info: 'Execution Error: error', name: 'TestData - ok', - newStateDate: `${newStateDate}T10:01:01+02:00`, + newStateDate: `${newStateDateFormatted}T10:01:01+02:00`, panelId: 3, state: 'ok', - stateAge: 'a year', + stateAge: newStateDateAge, stateClass: 'alert-state-ok', stateIcon: 'icon-gf icon-gf-online', stateText: 'OK', @@ -181,10 +181,10 @@ describe('Alert rules', () => { executionError: 'error', id: 4, name: 'TestData - Paused', - newStateDate: `${newStateDate}T10:01:01+02:00`, + newStateDate: `${newStateDateFormatted}T10:01:01+02:00`, panelId: 3, state: 'paused', - stateAge: 'a year', + stateAge: newStateDateAge, stateClass: 'alert-state-paused', stateIcon: 'fa fa-pause', stateText: 'PAUSED', @@ -202,10 +202,10 @@ describe('Alert rules', () => { id: 5, info: 'Query returned no data', name: 'TestData - Ok', - newStateDate: `${newStateDate}T10:01:01+02:00`, + newStateDate: `${newStateDateFormatted}T10:01:01+02:00`, panelId: 3, state: 'ok', - stateAge: 'a year', + stateAge: newStateDateAge, stateClass: 'alert-state-ok', stateIcon: 'icon-gf icon-gf-online', stateText: 'OK',