diff --git a/packages/react-charting/UnitTests/AreaChartUT.test.tsx b/packages/react-charting/UnitTests/AreaChartUT.test.tsx index d0f3e3f6ec24c7..570ce6ff76f4f2 100644 --- a/packages/react-charting/UnitTests/AreaChartUT.test.tsx +++ b/packages/react-charting/UnitTests/AreaChartUT.test.tsx @@ -1,6 +1,6 @@ import { screen, fireEvent } from '@testing-library/react'; import { AreaChart } from '../src/components/AreaChart/index'; -import { getById, testWithoutWait, isTimezoneSet, forEachTimezone } from '../src/utilities/TestUtility.test'; +import { getById, testWithoutWait, isTimezoneSet, forEachTimezone, isTestEnv } from '../src/utilities/TestUtility.test'; import { resetIds } from '@fluentui/react'; import { DarkTheme } from '@fluentui/theme-samples'; @@ -605,7 +605,7 @@ runTest('_getAriaLabel', () => { }, undefined, undefined, - !(isTimezoneSet(tzIdentifier) && env === 'TEST'), + !(isTimezoneSet(tzIdentifier) && isTestEnv()), ); testWithoutWait( @@ -635,7 +635,7 @@ runTest('_getAriaLabel', () => { }, undefined, undefined, - !(isTimezoneSet(tzIdentifier) && env === 'TEST'), + !(isTimezoneSet(tzIdentifier) && isTestEnv()), ); testWithoutWait( @@ -665,7 +665,7 @@ runTest('_getAriaLabel', () => { }, undefined, undefined, - !(isTimezoneSet(tzIdentifier) && env === 'TEST'), + !(isTimezoneSet(tzIdentifier) && isTestEnv()), ); }); diff --git a/packages/react-charting/UnitTests/HeatMapChartUT.test.tsx b/packages/react-charting/UnitTests/HeatMapChartUT.test.tsx index 8bc5f774d4af6b..c76ba90d7507c9 100644 --- a/packages/react-charting/UnitTests/HeatMapChartUT.test.tsx +++ b/packages/react-charting/UnitTests/HeatMapChartUT.test.tsx @@ -6,7 +6,7 @@ import { IHeatMapChartData, IHeatMapChartDataPoint } from '../src/HorizontalBarC import { render } from '@testing-library/react'; import { dataToBuffer } from 'memfs/lib/volume'; import { XAxisTypes, YAxisType } from '../src/utilities/index'; -import { conditionalTest, isTimezoneSet, forEachTimezone } from '../src/utilities/TestUtility.test'; +import { conditionalTest, isTimezoneSet, forEachTimezone, isTestEnv } from '../src/utilities/TestUtility.test'; import { resetIds } from '@fluentui/react'; const env = require('../config/tests'); @@ -546,7 +546,7 @@ runTest('_createNewDataSet', () => { runTest('Timezone related test cases', () => { forEachTimezone((tzName, tzIdentifier) => { - conditionalTest(isTimezoneSet(tzIdentifier) && env === 'TEST')( + conditionalTest(isTimezoneSet(tzIdentifier) && isTestEnv())( `Should return proper data set for date axis with default axis type in ${tzName} timezone`, () => { const instance = new HeatMapChartBase({ @@ -563,7 +563,7 @@ runTest('Timezone related test cases', () => { }, ); - conditionalTest(isTimezoneSet(tzIdentifier) && env === 'TEST')( + conditionalTest(isTimezoneSet(tzIdentifier) && isTestEnv())( `Should return proper aria-label for date xPoint and yPoint in ${tzName} timezone`, () => { const p1 = { @@ -583,7 +583,7 @@ runTest('Timezone related test cases', () => { }, ); - conditionalTest(isTimezoneSet(tzIdentifier) && env === 'TEST')( + conditionalTest(isTimezoneSet(tzIdentifier) && isTestEnv())( `Should return proper aria-label for date xPoint and yPoint without legend in ${tzName} timezone`, () => { const p1 = { @@ -603,7 +603,7 @@ runTest('Timezone related test cases', () => { }, ); - conditionalTest(isTimezoneSet(tzIdentifier) && env === 'TEST')( + conditionalTest(isTimezoneSet(tzIdentifier) && isTestEnv())( `Should return proper aria-label for numeric xPoint and date yPoint in ${tzName} timezone`, () => { const p1 = { @@ -623,7 +623,7 @@ runTest('Timezone related test cases', () => { }, ); - conditionalTest(isTimezoneSet(tzIdentifier) && env === 'TEST')( + conditionalTest(isTimezoneSet(tzIdentifier) && isTestEnv())( `Should return proper X and Y values for date xPoint and yPoint in ${tzName} timezone`, () => { const instance = new HeatMapChartBase({ @@ -639,7 +639,7 @@ runTest('Timezone related test cases', () => { }, ); - conditionalTest(isTimezoneSet(tzIdentifier) && env === 'TEST')( + conditionalTest(isTimezoneSet(tzIdentifier) && isTestEnv())( `Should return proper xIndex for date xPoint in ${tzName} timezone`, () => { const instance = new HeatMapChartBase({ @@ -654,7 +654,7 @@ runTest('Timezone related test cases', () => { }, ); - conditionalTest(isTimezoneSet(tzIdentifier) && env === 'TEST')( + conditionalTest(isTimezoneSet(tzIdentifier) && isTestEnv())( `Should return proper yIndex for date xPoint in ${tzName} timezone`, () => { const instance = new HeatMapChartBase({ @@ -669,7 +669,7 @@ runTest('Timezone related test cases', () => { }, ); - conditionalTest(isTimezoneSet(tzIdentifier) && env === 'TEST')( + conditionalTest(isTimezoneSet(tzIdentifier) && isTestEnv())( `Should return proper string formatted date for date point in ${tzName} timezone`, () => { const instance = new HeatMapChartBase({ @@ -683,7 +683,7 @@ runTest('Timezone related test cases', () => { }, ); - conditionalTest(isTimezoneSet(tzIdentifier) && env === 'TEST')( + conditionalTest(isTimezoneSet(tzIdentifier) && isTestEnv())( `Should return proper string formatted date for empty point in ${tzName} timezone`, () => { const instance = new HeatMapChartBase({ @@ -697,7 +697,7 @@ runTest('Timezone related test cases', () => { }, ); - conditionalTest(isTimezoneSet(tzIdentifier) && env === 'TEST')( + conditionalTest(isTimezoneSet(tzIdentifier) && isTestEnv())( `Should return proper string formatted date for date point in ${tzName} timezone`, () => { const instance = new HeatMapChartBase({ @@ -711,7 +711,7 @@ runTest('Timezone related test cases', () => { }, ); - conditionalTest(isTimezoneSet(tzIdentifier) && env === 'TEST')( + conditionalTest(isTimezoneSet(tzIdentifier) && isTestEnv())( `Should return proper xAxis data points for date points in ${tzName} timezone`, () => { const instance = new HeatMapChartBase({ @@ -726,7 +726,7 @@ runTest('Timezone related test cases', () => { }, ); - conditionalTest(isTimezoneSet(tzIdentifier) && env === 'TEST')( + conditionalTest(isTimezoneSet(tzIdentifier) && isTestEnv())( `Should return proper yAxis data points for date points in ${tzName} timezone`, () => { const instance = new HeatMapChartBase({ diff --git a/packages/react-charting/src/components/HeatMapChart/HeatMapChart.test.tsx b/packages/react-charting/src/components/HeatMapChart/HeatMapChart.test.tsx index d6ee738f53f7ce..9fef13a859c7a3 100644 --- a/packages/react-charting/src/components/HeatMapChart/HeatMapChart.test.tsx +++ b/packages/react-charting/src/components/HeatMapChart/HeatMapChart.test.tsx @@ -9,9 +9,8 @@ import { IHeatMapChartState, HeatMapChartBase } from './HeatMapChart.base'; import { ThemeProvider } from '@fluentui/react'; import { DarkTheme } from '@fluentui/theme-samples'; import { act } from 'react-dom/test-utils'; -import { conditionalDescribe, conditionalTest, isTimezoneSet } from '../../utilities/TestUtility.test'; +import { conditionalDescribe, conditionalTest, isTimezoneSet, isTestEnv } from '../../utilities/TestUtility.test'; const { Timezone } = require('../../../scripts/constants'); -const env = require('../../../config/tests'); // Wrapper of the HeatMapChart to be tested. let wrapper: ReactWrapper | undefined; @@ -100,7 +99,7 @@ const HeatMapStringDateData: IHeatMapChartProps['data'] = [ }, ]; -conditionalDescribe(isTimezoneSet(Timezone.UTC) && env === 'TEST')('HeatMapChart snapShot testing', () => { +conditionalDescribe(isTimezoneSet(Timezone.UTC) && isTestEnv())('HeatMapChart snapShot testing', () => { beforeEach(() => { resetIds(); }); @@ -333,7 +332,7 @@ describe('HeatMapChart - mouse events', () => { beforeEach(sharedBeforeEach); afterEach(sharedAfterEach); - conditionalTest(isTimezoneSet(Timezone.UTC) && env === 'TEST')( + conditionalTest(isTimezoneSet(Timezone.UTC) && isTestEnv())( 'Should render callout correctly on mouseover', async () => { await act(async () => { diff --git a/packages/react-charting/src/components/HeatMapChart/HeatMapChartRTL.test.tsx b/packages/react-charting/src/components/HeatMapChart/HeatMapChartRTL.test.tsx index b153526a7a62c5..cd596d35fcbbc3 100644 --- a/packages/react-charting/src/components/HeatMapChart/HeatMapChartRTL.test.tsx +++ b/packages/react-charting/src/components/HeatMapChart/HeatMapChartRTL.test.tsx @@ -2,11 +2,10 @@ import * as React from 'react'; import { act, queryAllByAttribute, render, waitFor, screen, fireEvent } from '@testing-library/react'; import { HeatMapChart, IHeatMapChartProps } from './index'; import { axe, toHaveNoViolations } from 'jest-axe'; -import { conditionalTest, getByClass, isTimezoneSet } from '../../utilities/TestUtility.test'; +import { conditionalTest, getByClass, isTimezoneSet, isTestEnv } from '../../utilities/TestUtility.test'; import { HeatMapChartBase } from './HeatMapChart.base'; import { resetIds } from '@fluentui/react'; const { Timezone } = require('../../../scripts/constants'); -const env = require('../../../config/tests'); expect.extend(toHaveNoViolations); @@ -170,7 +169,7 @@ describe('HeatMap chart rendering', () => { beforeEach(updateChartWidthAndHeight); afterEach(sharedAfterEach); - conditionalTest(isTimezoneSet(Timezone.UTC) && env === 'TEST')( + conditionalTest(isTimezoneSet(Timezone.UTC) && isTestEnv())( 'Should re-render the HeatMap chart with data', async () => { // Arrange diff --git a/packages/react-charting/src/components/VerticalBarChart/VerticalBarChartRTL.test.tsx b/packages/react-charting/src/components/VerticalBarChart/VerticalBarChartRTL.test.tsx index c313d4ca22dba3..ddeb3f717bb0d1 100644 --- a/packages/react-charting/src/components/VerticalBarChart/VerticalBarChartRTL.test.tsx +++ b/packages/react-charting/src/components/VerticalBarChart/VerticalBarChartRTL.test.tsx @@ -14,13 +14,13 @@ import { testScreenResolutionChanges, testWithWait, testWithoutWait, + isTestEnv, } from '../../utilities/TestUtility.test'; import { IVerticalBarChartProps } from './VerticalBarChart.types'; import { IVerticalBarChartDataPoint } from '../../index'; import { chartPointsVBC } from '../../utilities/test-data'; import { axe, toHaveNoViolations } from 'jest-axe'; const { Timezone } = require('../../../scripts/constants'); -const env = require('../../../config/tests'); expect.extend(toHaveNoViolations); @@ -312,7 +312,7 @@ describe('Vertical bar chart rendering', () => { }, undefined, undefined, - !(isTimezoneSet(tzIdentifier) && env === 'TEST'), + !(isTimezoneSet(tzIdentifier) && isTestEnv()), ); }); @@ -330,7 +330,7 @@ describe('Vertical bar chart rendering', () => { }, undefined, undefined, - !(isTimezoneSet(Timezone.UTC) && env === 'TEST'), + !(isTimezoneSet(Timezone.UTC) && isTestEnv()), ); testWithoutWait( @@ -346,7 +346,7 @@ describe('Vertical bar chart rendering', () => { }, undefined, undefined, - !(isTimezoneSet(Timezone.UTC) && env === 'TEST'), + !(isTimezoneSet(Timezone.UTC) && isTestEnv()), ); testWithoutWait( @@ -362,7 +362,7 @@ describe('Vertical bar chart rendering', () => { }, undefined, undefined, - !(isTimezoneSet(Timezone.UTC) && env === 'TEST'), + !(isTimezoneSet(Timezone.UTC) && isTestEnv()), ); testWithoutWait( @@ -377,7 +377,7 @@ describe('Vertical bar chart rendering', () => { }, undefined, undefined, - !(isTimezoneSet(Timezone.UTC) && env === 'TEST'), + !(isTimezoneSet(Timezone.UTC) && isTestEnv()), ); }); diff --git a/packages/react-charting/src/components/VerticalStackedBarChart/VerticalStackedBarChartRTL.test.tsx b/packages/react-charting/src/components/VerticalStackedBarChart/VerticalStackedBarChartRTL.test.tsx index c20ea982966558..56bb5bb76cbea0 100644 --- a/packages/react-charting/src/components/VerticalStackedBarChart/VerticalStackedBarChartRTL.test.tsx +++ b/packages/react-charting/src/components/VerticalStackedBarChart/VerticalStackedBarChartRTL.test.tsx @@ -12,13 +12,13 @@ import { isTimezoneSet, testWithWait, testWithoutWait, + isTestEnv, } from '../../utilities/TestUtility.test'; import { VerticalStackedBarChartBase } from './VerticalStackedBarChart.base'; import * as utils from '@fluentui/react/lib/Utilities'; import { chartPoints2VSBC, chartPointsVSBC } from '../../utilities/test-data'; import { axe, toHaveNoViolations } from 'jest-axe'; const { Timezone } = require('../../../scripts/constants'); -const env = require('../../../config/tests'); expect.extend(toHaveNoViolations); @@ -158,7 +158,7 @@ describe('Vertical stacked bar chart rendering', () => { }, undefined, undefined, - !(isTimezoneSet(Timezone.UTC) && env === 'TEST'), + !(isTimezoneSet(Timezone.UTC) && isTestEnv()), ); testWithoutWait( @@ -174,7 +174,7 @@ describe('Vertical stacked bar chart rendering', () => { }, undefined, undefined, - !(isTimezoneSet(Timezone.UTC) && env === 'TEST'), + !(isTimezoneSet(Timezone.UTC) && isTestEnv()), ); testWithoutWait( @@ -190,7 +190,7 @@ describe('Vertical stacked bar chart rendering', () => { }, undefined, undefined, - !(isTimezoneSet(Timezone.UTC) && env === 'TEST'), + !(isTimezoneSet(Timezone.UTC) && isTestEnv()), ); forEachTimezone((tzName, tzIdentifier) => { @@ -208,7 +208,7 @@ describe('Vertical stacked bar chart rendering', () => { }, undefined, undefined, - !(isTimezoneSet(tzIdentifier) && env === 'TEST'), + !(isTimezoneSet(tzIdentifier) && isTestEnv()), ); }); });