From e7796e5e4830d03ba6473fe7efc29c404566f791 Mon Sep 17 00:00:00 2001 From: Andrew Musgrave Date: Fri, 16 Aug 2019 11:29:28 -0400 Subject: [PATCH 1/2] Removed mocks that are no longer needed --- src/components/Collapsible/tests/Collapsible.test.tsx | 11 ----------- src/components/Focus/tests/Focus.test.tsx | 11 ----------- .../components/TabMeasurer/tests/TabMeasurer.test.tsx | 11 ----------- src/components/TrapFocus/tests/TrapFocus.test.tsx | 8 -------- 4 files changed, 41 deletions(-) diff --git a/src/components/Collapsible/tests/Collapsible.test.tsx b/src/components/Collapsible/tests/Collapsible.test.tsx index 07008494f82..70f84cbb009 100644 --- a/src/components/Collapsible/tests/Collapsible.test.tsx +++ b/src/components/Collapsible/tests/Collapsible.test.tsx @@ -4,17 +4,6 @@ import Collapsible from '../Collapsible'; describe('', () => { const ariaHiddenSelector = '[aria-hidden=true]'; - let setTimeoutMock: jest.SpyInstance; - - beforeEach(() => { - setTimeoutMock = jest - .spyOn(window, 'setTimeout') - .mockImplementation((cb: Function) => cb()); - }); - - afterEach(() => { - setTimeoutMock.mockRestore(); - }); it('does not render its children and indicates hidden with aria-hidden', () => { const collapsible = mountWithAppProvider( diff --git a/src/components/Focus/tests/Focus.test.tsx b/src/components/Focus/tests/Focus.test.tsx index f4b14a0c1c9..8c89f06e292 100644 --- a/src/components/Focus/tests/Focus.test.tsx +++ b/src/components/Focus/tests/Focus.test.tsx @@ -4,17 +4,6 @@ import Focus, {Props} from '../Focus'; import {Discard} from '../../../types'; describe('', () => { - let requestAnimationFrameSpy: jest.SpyInstance; - - beforeEach(() => { - requestAnimationFrameSpy = jest.spyOn(window, 'requestAnimationFrame'); - requestAnimationFrameSpy.mockImplementation((cb) => cb()); - }); - - afterEach(() => { - requestAnimationFrameSpy.mockRestore(); - }); - it('mounts', () => { const focus = mountWithAppProvider(); diff --git a/src/components/Tabs/components/TabMeasurer/tests/TabMeasurer.test.tsx b/src/components/Tabs/components/TabMeasurer/tests/TabMeasurer.test.tsx index c0b9aaf2d66..278f1c08407 100644 --- a/src/components/Tabs/components/TabMeasurer/tests/TabMeasurer.test.tsx +++ b/src/components/Tabs/components/TabMeasurer/tests/TabMeasurer.test.tsx @@ -5,17 +5,6 @@ import Tab from '../../Tab'; import Item from '../../Item'; describe('', () => { - let requestAnimationFrameSpy: jest.SpyInstance; - - beforeEach(() => { - requestAnimationFrameSpy = jest.spyOn(window, 'requestAnimationFrame'); - requestAnimationFrameSpy.mockImplementation((cb) => cb()); - }); - - afterEach(() => { - requestAnimationFrameSpy.mockRestore(); - }); - const mockProps = { tabToFocus: 0, activator: , diff --git a/src/components/TrapFocus/tests/TrapFocus.test.tsx b/src/components/TrapFocus/tests/TrapFocus.test.tsx index 84196e69171..b557e71e9df 100644 --- a/src/components/TrapFocus/tests/TrapFocus.test.tsx +++ b/src/components/TrapFocus/tests/TrapFocus.test.tsx @@ -10,16 +10,8 @@ import { import TrapFocus from '../TrapFocus'; describe('', () => { - let requestAnimationFrameSpy: jest.SpyInstance; - - beforeEach(() => { - requestAnimationFrameSpy = jest.spyOn(window, 'requestAnimationFrame'); - requestAnimationFrameSpy.mockImplementation((cb) => cb()); - }); - afterEach(() => { (document.activeElement as HTMLElement).blur(); - requestAnimationFrameSpy.mockRestore(); }); it('mounts', () => { From 63ee0554d7c3d3e2f5507b6dfb2e9280ed97b17e Mon Sep 17 00:00:00 2001 From: Andrew Musgrave Date: Fri, 16 Aug 2019 11:44:43 -0400 Subject: [PATCH 2/2] changelog --- UNRELEASED.md | 1 + 1 file changed, 1 insertion(+) diff --git a/UNRELEASED.md b/UNRELEASED.md index aebf4c8da6e..14b42e638a6 100644 --- a/UNRELEASED.md +++ b/UNRELEASED.md @@ -72,6 +72,7 @@ Use [the changelog guidelines](https://git.io/polaris-changelog-guidelines) to f ### Code quality +- Removed mocks in various tests suites that are now redundant ([#1978](https://github.com/Shopify/polaris-react/pull/1978)) - Bumped test coverage in `Collapsible` ([#1929](https://github.com/Shopify/polaris-react/pull/1929)) - Bumped test coverage in `DropZone`, `Frame`, `Icon`, and `Loading` ([#1927](https://github.com/Shopify/polaris-react/pull/1927)) - Removed unused type definitions ([#1862](https://github.com/Shopify/polaris-react/pull/1862))