From 2beec584b294c1af7d0f23d83f6c5a7068bc1067 Mon Sep 17 00:00:00 2001 From: Pavel Zavora Date: Tue, 8 Feb 2022 10:03:56 +0100 Subject: [PATCH] chore(ui): refactor fluxPeriodFromRangeSeconds --- .../util/timeRangeWindowPeriod.test.ts | 5 ++ ui/test/tempVars/utils/replace.test.ts | 49 +------------------ 2 files changed, 6 insertions(+), 48 deletions(-) diff --git a/ui/test/shared/components/TimeMachine/fluxQueryBuilder/util/timeRangeWindowPeriod.test.ts b/ui/test/shared/components/TimeMachine/fluxQueryBuilder/util/timeRangeWindowPeriod.test.ts index 30422b6aa..de07a2c59 100644 --- a/ui/test/shared/components/TimeMachine/fluxQueryBuilder/util/timeRangeWindowPeriod.test.ts +++ b/ui/test/shared/components/TimeMachine/fluxQueryBuilder/util/timeRangeWindowPeriod.test.ts @@ -15,6 +15,11 @@ describe('fluxQueryBuilder/util/timeRangeWindowPeriod', () => { seconds: undefined, expect: '1s', }, + { + name: 'NaN', + seconds: Number.NaN, + expect: '1s', + }, { name: '1 hour', seconds: 3600, diff --git a/ui/test/tempVars/utils/replace.test.ts b/ui/test/tempVars/utils/replace.test.ts index cd788b37b..c2ecd687f 100644 --- a/ui/test/tempVars/utils/replace.test.ts +++ b/ui/test/tempVars/utils/replace.test.ts @@ -1,7 +1,4 @@ -import templateReplace, { - fluxPeriodFromRangeSeconds, - replaceInterval, -} from 'src/tempVars/utils/replace' +import templateReplace, {replaceInterval} from 'src/tempVars/utils/replace' import {TemplateType, TemplateValueType} from 'src/types/tempVars' describe('templates.utils.replace', () => { @@ -492,48 +489,4 @@ describe('templates.utils.replace', () => { expect(templateReplace(query, templates.reverse())).toEqual(expected) }) }) - describe('fluxPeriodFromRangeSeconds', () => { - ;[ - { - seconds: 0, - expected: '1s', - }, - { - seconds: Number.NaN, - expected: '1s', - }, - { - seconds: 359, - expected: '1s', - }, - { - seconds: 900, - expected: '3s', - }, - { - seconds: 6 * 3600, - expected: '1m', - }, - { - seconds: 24 * 3600, - expected: '4m', - }, - { - seconds: 7 * 24 * 3600, - expected: '28m', - }, - { - seconds: 30 * 24 * 3600, - expected: '2h', - }, - { - seconds: 37 * 24 * 3600 + 900, - expected: '2h28m3s', - }, - ].forEach(test => { - it(`returns ${test.expected} having ${test.seconds} on input`, () => { - expect(fluxPeriodFromRangeSeconds(test.seconds)).toEqual(test.expected) - }) - }) - }) })