From 6c9b620689f0540ef987723d0daa17955e4ca201 Mon Sep 17 00:00:00 2001
From: Bernd Hufmann <bernd.hufmann@ericsson.com>
Date: Tue, 4 Apr 2023 09:50:14 -0400
Subject: [PATCH] Re-enable and fix skipped test in
 time-axis-component.test.tsx

It was skipped after moving to React 18 which enzyme doesn't support.

Signed-off-by: Bernd Hufmann <bernd.hufmann@ericsson.com>
---
 .../time-axis-component.test.tsx.snap         | 16 +++++++++
 .../__tests__/time-axis-component.test.tsx    | 36 ++++++++++++-------
 2 files changed, 39 insertions(+), 13 deletions(-)
 create mode 100644 packages/react-components/src/components/utils/__tests__/__snapshots__/time-axis-component.test.tsx.snap

diff --git a/packages/react-components/src/components/utils/__tests__/__snapshots__/time-axis-component.test.tsx.snap b/packages/react-components/src/components/utils/__tests__/__snapshots__/time-axis-component.test.tsx.snap
new file mode 100644
index 000000000..04571f1c9
--- /dev/null
+++ b/packages/react-components/src/components/utils/__tests__/__snapshots__/time-axis-component.test.tsx.snap
@@ -0,0 +1,16 @@
+// Jest Snapshot v1, https://goo.gl/fbAQLP
+
+exports[`Time axis component creates canvas 1`] = `
+<div>
+  <div>
+    <canvas
+      class="time-graph-canvas horizontal-canvas"
+      height="30"
+      id="timegraph-axis"
+      style="width: 600px; height: 30px;"
+      tabindex="0"
+      width="600"
+    />
+  </div>
+</div>
+`;
diff --git a/packages/react-components/src/components/utils/__tests__/time-axis-component.test.tsx b/packages/react-components/src/components/utils/__tests__/time-axis-component.test.tsx
index a0d146ccd..a4f49aa5d 100644
--- a/packages/react-components/src/components/utils/__tests__/time-axis-component.test.tsx
+++ b/packages/react-components/src/components/utils/__tests__/time-axis-component.test.tsx
@@ -1,15 +1,26 @@
 import * as React from 'react';
-import { cleanup } from '@testing-library/react';
-import { mount } from 'enzyme';
+import { cleanup, render, renderHook } from '@testing-library/react';
 import { TimeAxisComponent } from '../time-axis-component';
 import { TimeGraphUnitController } from 'timeline-chart/lib/time-graph-unit-controller';
 import { OutputComponentStyle } from '../output-component-style';
 
-afterEach(cleanup);
-
 describe('Time axis component', () => {
-  // Skip until a replacement for Enzyme that works with React 18 is found
-  it.skip('renders with provided style', () => {
+
+  let axisComponent: any;
+    const ref = (el: TimeAxisComponent | undefined | null): void => {
+      axisComponent = el;
+    };
+
+  beforeEach(() => {
+    axisComponent = null;
+  });
+
+  afterEach(() => {
+    cleanup();
+    jest.clearAllMocks();
+  });
+
+  it('renders with provided style', () => {
     const unitController: TimeGraphUnitController = new TimeGraphUnitController(BigInt(10), { start: BigInt(0), end: BigInt(10)});
     const style: OutputComponentStyle = {
       width: 600,
@@ -22,13 +33,12 @@ describe('Time axis component', () => {
       cursorColor: 0x259fd8,
       lineColor: 0x757575,
     }
-
-    const wrapper = mount(<TimeAxisComponent unitController={unitController} style={{...style, verticalAlign: 'bottom' }} addWidgetResizeHandler={() => null} removeWidgetResizeHandler={() => null}/>);
-    expect(wrapper.contains(<TimeAxisComponent unitController={unitController} style={{...style, verticalAlign: 'bottom' }} addWidgetResizeHandler={() => null} removeWidgetResizeHandler={() => null}/>));
+    render(<div><TimeAxisComponent unitController={unitController} style={{...style, verticalAlign: 'bottom' }} addWidgetResizeHandler={() => null} removeWidgetResizeHandler={() => null} ref={ref}/></div>);
+    expect(axisComponent).toBeTruthy();
+    expect(axisComponent instanceof TimeAxisComponent).toBe(true);
   });
 
-  // Skip until a replacement for Enzyme that works with React 18 is found
-  it.skip('creates canvas', () => {
+  it('creates canvas', () => {
     const unitController: TimeGraphUnitController = new TimeGraphUnitController(BigInt(10), { start: BigInt(0), end: BigInt(10)});
     const style: OutputComponentStyle = {
       width: 600,
@@ -42,7 +52,7 @@ describe('Time axis component', () => {
       lineColor: 0x757575
     }
 
-    const wrapper = mount(<TimeAxisComponent unitController={unitController} style={{...style, verticalAlign: 'bottom' }} addWidgetResizeHandler={() => null} removeWidgetResizeHandler={() => null}/>);
-    expect(wrapper.find('canvas')).toHaveLength(1);
+    const { container } = render(<div><TimeAxisComponent unitController={unitController} style={{...style, verticalAlign: 'bottom' }} addWidgetResizeHandler={() => null} removeWidgetResizeHandler={() => null}/></div>);
+    expect(container).toMatchSnapshot();
   });
 });