Fixed code review comments.

elastic · Sep 23, 2020 · 7d5d26c · 7d5d26c
1 parent 3a4730f
commit 7d5d26c
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 6 deletions.
diff --git a/...k/plugins/security_solution/public/management/pages/trusted_apps/store/middleware.test.ts b/...k/plugins/security_solution/public/management/pages/trusted_apps/store/middleware.test.ts
@@ -60,11 +60,11 @@ const createStoreSetup = (trustedAppsService: TrustedAppsService) => {
   };
 };
 
-beforeEach(() => {
-  dateNowMock.mockReturnValue(initialNow);
-});
-
 describe('middleware', () => {
+  beforeEach(() => {
+    dateNowMock.mockReturnValue(initialNow);
+  });
+
   describe('initial state', () => {
     it('sets initial state properly', async () => {
       expect(createStoreSetup(createTrustedAppsServiceMock()).store.getState()).toStrictEqual(

diff --git a/...ns/security_solution/public/management/pages/trusted_apps/view/trusted_apps_page.test.tsx b/...ns/security_solution/public/management/pages/trusted_apps/view/trusted_apps_page.test.tsx
@@ -16,13 +16,20 @@ jest.mock('@elastic/eui/lib/services/accessibility/html_id_generator', () => ({
   htmlIdGenerator: () => () => 'mockId',
 }));
 
-window.scrollTo = () => {};
-
 describe('TrustedAppsPage', () => {
   let history: AppContextTestRender['history'];
   let coreStart: AppContextTestRender['coreStart'];
   let waitForAction: MiddlewareActionSpyHelper['waitForAction'];
   let render: () => ReturnType<AppContextTestRender['render']>;
+  const originalScrollTo = window.scrollTo;
+
+  beforeAll(() => {
+    window.scrollTo = () => {};
+  });
+
+  afterAll(() => {
+    window.scrollTo = originalScrollTo;
+  });
 
   beforeEach(() => {
     const mockedContext = createAppRootMockRenderer();