chore: update tests to work with new version of enzyme/enzyme adapter

Author: alexdriaguine

src/index.test.tsx

@@ -5,15 +5,16 @@ import {mount, shallow} from 'enzyme'
 import toJson from 'enzyme-to-json'
 import * as React from 'react'
 import compose from 'recompose/compose'
+import defaultProps from 'recompose/defaultProps'
 import {withSpinner} from './index'
 
 const Loading = () => <span>Loading...</span>
 jest.useFakeTimers()
 
 describe('withSpinner', () => {
   it('should render spinner if loading is true', () => {
-    const Component = compose(
-      WrappedComponent => props => <WrappedComponent {...props} data={{loading: true}} />,
+    const Component = compose<any, {}>(
+      defaultProps({data: {loading: true}}),
       withSpinner({spinnerComponent: Loading}),
     )(() => <div></div>)
 
@@ -29,8 +30,8 @@ describe('withSpinner', () => {
   })
 
   it('should not render spinner if loading is false', () => {
-    const Component = compose(
-      WrappedComponent => props => <WrappedComponent {...props} data={{loading: false}} />,
+    const Component = compose<any, {}>(
+      defaultProps({data: {loading: false}}),
       withSpinner({spinnerComponent: Loading}),
     )(({data}) => <div>loading: {data.loading.toString()}</div>)
 
@@ -43,7 +44,7 @@ describe('withSpinner', () => {
   it('should render spinner in 100 ms and after render component', () => {
     const DisplayComponent = ({data}) => <div>loading: {data.loading.toString()}, item: {data.item.id}</div>
 
-    const Component = compose(
+    const Component = compose<any, {}>(
       WrappedComponent => class extends React.Component<any, any> {
         state = {loading: true, item: null}
 
@@ -61,19 +62,21 @@ describe('withSpinner', () => {
       withSpinner({spinnerComponent: Loading}),
     )(DisplayComponent)
 
-    const wrapper = mount(<Component />)
+    let wrapper = mount(<Component />)
 
     // Should not display a Spinner
     expect(wrapper.html()).toBeNull()
 
     // Run timer to 100 ms since withSpinner timeout defaults to 100 ms
     jest.runTimersToTime(100)
     // ProgressBar should now be found
+    wrapper = wrapper.update()
     expect(wrapper.find(Loading)).toHaveLength(1)
     expect(wrapper.find(DisplayComponent)).toHaveLength(0)
 
     // Run timer to 1000 ms for our own timeout
     jest.runTimersToTime(1000)
+    wrapper = wrapper.update()
     // DisplayComponent should be found
     expect(wrapper.find(DisplayComponent)).toHaveLength(1)
     expect(wrapper.find(Loading)).toHaveLength(0)
@@ -85,22 +88,21 @@ describe('withSpinner', () => {
     const Loading = () => <span>Loading...</span>
 
     const Component = compose(
-      WrappedComponent => props => <WrappedComponent {...props} data={{loading: true}} />,
+      defaultProps({data: {loading: true}}),
       withSpinner({spinnerComponent: Loading}),
     )(null)
 
     const wrapper = shallow(<Component />).first().shallow()
     jest.runTimersToTime(100)
-    wrapper.update()
 
     expect(toJson(wrapper)).toMatchSnapshot()
   })
 
   it('should ignore errors if handleError is false', () => {
     const DisplayComponent = ({data}) => <div>loading: {data.loading.toString()}, item: {data.item.id}</div>
 
-    const Component = compose(
-      WrappedComponent => props => <WrappedComponent {...props} data={{loading: false, error: true}} />,
+    const Component = compose<any, {}>(
+      defaultProps({data: {loading: false, error: true}}),
       withSpinner({spinnerComponent: Loading, handleError: false}),
     )(DisplayComponent)
 
@@ -114,7 +116,7 @@ describe('withSpinner', () => {
     const ErrorComponent = () => <span>An unknown error occured...</span>
 
     const Component = compose(
-      WrappedComponent => props => <WrappedComponent {...props} data={{loading: false, error: true}} />,
+      defaultProps({data: {loading: false, error: true}}),
       withSpinner({spinnerComponent: Loading, errorComponent: ErrorComponent}),
     )(null)
 
@@ -128,8 +130,8 @@ describe('withSpinner', () => {
   it('should delay rendering of spinnerComponent the timeout that is passed', () => {
     const DisplayComponent = ({data}) => <div>loading: {data.loading.toString()}, item: {data.item.id}</div>
 
-    const Component = compose(
-      WrappedComponent => props => <WrappedComponent {...props} data={{loading: true}} />,
+    const Component = compose<any, {}>(
+      defaultProps({data: {loading: true}}),
       withSpinner({spinnerComponent: Loading, timeout: 500}),
     )(DisplayComponent)
 
@@ -141,7 +143,7 @@ describe('withSpinner', () => {
 
     // Run timer over our timeout
     jest.runTimersToTime(600)
-    expect(wrapper.first().shallow().node).toEqual(Loading())
+    expect(wrapper.first().shallow().getElement()).toEqual(Loading())
   })
 
   it('should not render errorComponent if skipErrors returns true', () => {
@@ -151,8 +153,8 @@ describe('withSpinner', () => {
       Validation error occured on field: {error.validationError.field} with message: {error.validationError.message}
     </div>
 
-    const Component = compose(
-      WrappedComponent => props => <WrappedComponent {...props} data={{loading: false, error: validationError}} />,
+    const Component = compose<any, {}>(
+      defaultProps({data: {loading: false, error: validationError}}),
       withSpinner(({spinnerComponent: Loading,
         errorComponent: ErrorComponent,
         skipErrors: data => data.error.validationError && data.error.validationError.field === 'password'
@@ -169,7 +171,7 @@ describe('withSpinner', () => {
   it('should support custom loading property', () => {
     const DisplayComponent = ({result}) => <div>loading: {result.loading.toString()}, item: {result.item.id}</div>
 
-    const Component = compose(
+    const Component = compose<any, {}>(
       WrappedComponent => class extends React.Component<any, any> {
         state = {loading: true, item: null}
 
@@ -187,19 +189,21 @@ describe('withSpinner', () => {
       withSpinner({spinnerComponent: Loading, prop: 'result'}),
     )(DisplayComponent)
 
-    const wrapper = mount(<Component />)
+    let wrapper = mount(<Component />)
 
     // Should not display a Spinner
     expect(wrapper.html()).toBeNull()
 
     // Run timer to 100 ms since withSpinner timeout defaults to 100 ms
     jest.runTimersToTime(100)
+    wrapper = wrapper.update()
     // ProgressBar should now be found
     expect(wrapper.find(Loading)).toHaveLength(1)
     expect(wrapper.find(DisplayComponent)).toHaveLength(0)
 
     // Run timer to 1000 ms for our own timeout
     jest.runTimersToTime(1000)
+    wrapper = wrapper.update()
     // DisplayComponent should be found
     expect(wrapper.find(DisplayComponent)).toHaveLength(1)
     expect(wrapper.find(Loading)).toHaveLength(0)
@@ -208,7 +212,7 @@ describe('withSpinner', () => {
   it('should support custom nested loading property', () => {
     const DisplayComponent = ({result}) => <div>loading: {result.nested.loading.toString()}, item: {result.nested.item && result.nested.item.id}</div>
 
-    const Component = compose(
+    const Component = compose<any, {}>(
       WrappedComponent => class extends React.Component<any, any> {
         state = {loading: true, item: null}
 
@@ -228,19 +232,21 @@ describe('withSpinner', () => {
       // withSpinner(),
     )(DisplayComponent)
 
-    const wrapper = mount(<Component />)
+    let wrapper = mount(<Component />)
 
     // Should not display a Spinner
     expect(wrapper.html()).toBeNull()
 
     // Run timer to 100 ms since withSpinner timeout defaults to 100 ms
     jest.runTimersToTime(100)
+    wrapper = wrapper.update()
     // ProgressBar should now be found
     expect(wrapper.find(Loading)).toHaveLength(1)
     expect(wrapper.find(DisplayComponent)).toHaveLength(0)
 
     // Run timer to 1000 ms for our own timeout
     jest.runTimersToTime(1000)
+    wrapper = wrapper.update()
     // DisplayComponent should be found
     expect(wrapper.find(DisplayComponent)).toHaveLength(1)
     expect(wrapper.find(Loading)).toHaveLength(0)
@@ -251,7 +257,7 @@ describe('withSpinner', () => {
     const EmptyComponent = () => <span>No data...</span>
 
     const Component = compose(
-      WrappedComponent => props => <WrappedComponent {...props} data={{loading: false, value: {}}} />,
+      defaultProps({data: {loading: false, value: {}}}),
       withSpinner({spinnerComponent: Loading, emptyComponent: EmptyComponent, prop: ['data', 'value']}),
     )(null)