PR Feedback

src/components/Frame/components/Toast/tests/Toast.test.tsx

@@ -111,26 +111,40 @@ describe('<Toast />', () => {
       expect(spy).toHaveBeenCalled();
     });
 
-    it('is called when the escape key is pressed', () => {
+    describe('events', () => {
       const listenerMap: HandlerMap = {};
-      jest
-        .spyOn(document, 'addEventListener')
-        .mockImplementation((event, cb) => {
-          listenerMap[event] = cb;
-        });
 
-      const spy = jest.fn();
-      mountWithAppProvider(<Toast content="Image uploaded" onDismiss={spy} />);
-
-      listenerMap.keyup({keyCode: Key.Escape});
-
-      jest
-        .spyOn(document, 'removeEventListener')
-        .mockImplementation((event) => {
-          listenerMap[event] = noop;
-        });
-
-      expect(spy).toHaveBeenCalled();
+      beforeEach(() => {
+        jest
+          .spyOn(document, 'addEventListener')
+          .mockImplementation((evt, cb) => {
+            listenerMap[evt] = cb;
+          });
+
+        jest
+          .spyOn(document, 'removeEventListener')
+          .mockImplementation((event) => {
+            listenerMap[event] = noop;
+          });
+      });
+
+      afterEach(() => {
+        (document.addEventListener as jest.Mock).mockRestore();
+        (document.removeEventListener as jest.Mock).mockRestore();
+
+        Object.keys(listenerMap).forEach((key) => delete listenerMap[key]);
+      });
+
+      it('is called when the escape key is pressed', () => {
+        const spy = jest.fn();
+        mountWithAppProvider(
+          <Toast content="Image uploaded" onDismiss={spy} />,
+        );
+
+        listenerMap.keyup({keyCode: Key.Escape});
+
+        expect(spy).toHaveBeenCalled();
+      });
     });
 
     it('is called after the duration is reached', () => {

src/components/KeypressListener/tests/KeypressListener.test.tsx

@@ -8,8 +8,6 @@ interface HandlerMap {
   [eventName: string]: (event: any) => void;
 }
 
-const originalAddEventListener = document.addEventListener;
-const originalRemoveEventListener = document.removeEventListener;
 const listenerMap: HandlerMap = {};
 
 describe('<KeypressListener />', () => {
@@ -24,8 +22,8 @@ describe('<KeypressListener />', () => {
   });
 
   afterEach(() => {
-    document.addEventListener = originalAddEventListener;
-    document.removeEventListener = originalRemoveEventListener;
+    (document.addEventListener as jest.Mock).mockRestore();
+    (document.removeEventListener as jest.Mock).mockRestore();
   });
 
   it('attaches a listener for the given key on mount', () => {

src/components/Tabs/tests/Tabs.test.tsx

@@ -141,18 +141,16 @@ describe('<Tabs />', () => {
 
   describe('selected', () => {
     let panelStub: {focus: jest.Mock<any>};
-    let originalGetElementByID: (typeof document)['getElementById'];
 
     beforeEach(() => {
-      originalGetElementByID = document.getElementById;
       panelStub = {focus: jest.fn()};
       jest
         .spyOn(document, 'getElementById')
         .mockImplementation(() => panelStub);
     });
 
     afterEach(() => {
-      document.getElementById = originalGetElementByID;
+      (document.getElementById as jest.Mock).mockRestore();
     });
 
     it('focuses the panel when a tab becomes selected', () => {

src/components/TextField/tests/TextField.test.tsx

@@ -691,7 +691,6 @@ describe('<TextField />', () => {
         type EventCallback = (mockEventData?: {[key: string]: any}) => void;
 
         const documentEvent: {[eventType: string]: EventCallback} = {};
-        const origialAddEventListener = document.addEventListener;
 
         beforeAll(() => {
           jest
@@ -704,7 +703,7 @@ describe('<TextField />', () => {
         });
 
         afterAll(() => {
-          document.addEventListener = origialAddEventListener;
+          (document.addEventListener as jest.Mock).mockRestore();
         });
 
         it('stops decrementing on mouse up anywhere in document', () => {

src/components/TopBar/components/UserMenu/context/Modifier.tsx

@@ -22,7 +22,7 @@ class Modifier extends React.Component<ComposedProps, {}> {
     return null;
   }
 
-  state: any = {};
+  state: {} = {};
 
   render() {
     return null;