Skip to content

Commit 1e0ad89

Browse files
committed
convert more tests to rtl
1 parent 0e2e194 commit 1e0ad89

File tree

1 file changed

+28
-23
lines changed

1 file changed

+28
-23
lines changed

test/components/connect.spec.js

Lines changed: 28 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -1225,7 +1225,7 @@ describe('React', () => {
12251225
function AwesomeMap() { }
12261226

12271227
let spy = jest.spyOn(console, 'error').mockImplementation(() => {})
1228-
enzyme.mount(
1228+
rtl.render(
12291229
<ProviderMock store={store}>
12301230
{makeContainer(() => 1, () => ({}), () => ({}))}
12311231
</ProviderMock>
@@ -1235,9 +1235,10 @@ describe('React', () => {
12351235
/mapStateToProps\(\) in Connect\(Container\) must return a plain object/
12361236
)
12371237
spy.mockRestore()
1238+
rtl.cleanup()
12381239

12391240
spy = jest.spyOn(console, 'error').mockImplementation(() => {})
1240-
enzyme.mount(
1241+
rtl.render(
12411242
<ProviderMock store={store}>
12421243
{makeContainer(() => 'hey', () => ({}), () => ({}))}
12431244
</ProviderMock>
@@ -1247,9 +1248,10 @@ describe('React', () => {
12471248
/mapStateToProps\(\) in Connect\(Container\) must return a plain object/
12481249
)
12491250
spy.mockRestore()
1251+
rtl.cleanup()
12501252

12511253
spy = jest.spyOn(console, 'error').mockImplementation(() => {})
1252-
enzyme.mount(
1254+
rtl.render(
12531255
<ProviderMock store={store}>
12541256
{makeContainer(() => new AwesomeMap(), () => ({}), () => ({}))}
12551257
</ProviderMock>
@@ -1259,9 +1261,10 @@ describe('React', () => {
12591261
/mapStateToProps\(\) in Connect\(Container\) must return a plain object/
12601262
)
12611263
spy.mockRestore()
1264+
rtl.cleanup()
12621265

12631266
spy = jest.spyOn(console, 'error').mockImplementation(() => {})
1264-
enzyme.mount(
1267+
rtl.render(
12651268
<ProviderMock store={store}>
12661269
{makeContainer(() => ({}), () => 1, () => ({}))}
12671270
</ProviderMock>
@@ -1271,9 +1274,10 @@ describe('React', () => {
12711274
/mapDispatchToProps\(\) in Connect\(Container\) must return a plain object/
12721275
)
12731276
spy.mockRestore()
1277+
rtl.cleanup()
12741278

12751279
spy = jest.spyOn(console, 'error').mockImplementation(() => {})
1276-
enzyme.mount(
1280+
rtl.render(
12771281
<ProviderMock store={store}>
12781282
{makeContainer(() => ({}), () => 'hey', () => ({}))}
12791283
</ProviderMock>
@@ -1283,9 +1287,10 @@ describe('React', () => {
12831287
/mapDispatchToProps\(\) in Connect\(Container\) must return a plain object/
12841288
)
12851289
spy.mockRestore()
1290+
rtl.cleanup()
12861291

12871292
spy = jest.spyOn(console, 'error').mockImplementation(() => {})
1288-
enzyme.mount(
1293+
rtl.render(
12891294
<ProviderMock store={store}>
12901295
{makeContainer(() => ({}), () => new AwesomeMap(), () => ({}))}
12911296
</ProviderMock>
@@ -1295,9 +1300,10 @@ describe('React', () => {
12951300
/mapDispatchToProps\(\) in Connect\(Container\) must return a plain object/
12961301
)
12971302
spy.mockRestore()
1303+
rtl.cleanup()
12981304

12991305
spy = jest.spyOn(console, 'error').mockImplementation(() => {})
1300-
enzyme.mount(
1306+
rtl.render(
13011307
<ProviderMock store={store}>
13021308
{makeContainer(() => ({}), () => ({}), () => 1)}
13031309
</ProviderMock>
@@ -1307,9 +1313,10 @@ describe('React', () => {
13071313
/mergeProps\(\) in Connect\(Container\) must return a plain object/
13081314
)
13091315
spy.mockRestore()
1316+
rtl.cleanup()
13101317

13111318
spy = jest.spyOn(console, 'error').mockImplementation(() => {})
1312-
enzyme.mount(
1319+
rtl.render(
13131320
<ProviderMock store={store}>
13141321
{makeContainer(() => ({}), () => ({}), () => 'hey')}
13151322
</ProviderMock>
@@ -1319,9 +1326,10 @@ describe('React', () => {
13191326
/mergeProps\(\) in Connect\(Container\) must return a plain object/
13201327
)
13211328
spy.mockRestore()
1329+
rtl.cleanup()
13221330

13231331
spy = jest.spyOn(console, 'error').mockImplementation(() => {})
1324-
enzyme.mount(
1332+
rtl.render(
13251333
<ProviderMock store={store}>
13261334
{makeContainer(() => ({}), () => ({}), () => new AwesomeMap())}
13271335
</ProviderMock>
@@ -1373,23 +1381,21 @@ describe('React', () => {
13731381
}
13741382

13751383
let container
1376-
const testRenderer = enzyme.mount(
1384+
const tester = rtl.render(
13771385
<ProviderMock store={store}>
13781386
<ContainerBefore ref={instance => container = instance} />
13791387
</ProviderMock>
13801388
)
1381-
expect(testRenderer.find(Passthrough).prop('foo')).toEqual(undefined)
1382-
expect(testRenderer.find(Passthrough).prop('scooby')).toEqual('doo')
1389+
expect(tester.queryByTestId('foo')).toBe(null)
1390+
expect(tester.getByTestId('scooby')).toHaveTextContent('doo')
13831391

13841392
imitateHotReloading(ContainerBefore, ContainerAfter, container)
1385-
testRenderer.update()
1386-
expect(testRenderer.find(Passthrough).prop('foo')).toEqual('baz')
1387-
expect(testRenderer.find(Passthrough).prop('scooby')).toEqual('foo')
1393+
expect(tester.getByTestId('foo')).toHaveTextContent('baz')
1394+
expect(tester.getByTestId('scooby')).toHaveTextContent('foo')
13881395

13891396
imitateHotReloading(ContainerBefore, ContainerNext, container)
1390-
testRenderer.update()
1391-
expect(testRenderer.find(Passthrough).prop('foo')).toEqual('bar')
1392-
expect(testRenderer.find(Passthrough).prop('scooby')).toEqual('boo')
1397+
expect(tester.getByTestId('foo')).toHaveTextContent('bar')
1398+
expect(tester.getByTestId('scooby')).toHaveTextContent('boo')
13931399
})
13941400

13951401
it('should persist listeners through hot update', () => {
@@ -1438,7 +1444,7 @@ describe('React', () => {
14381444
}
14391445

14401446
let container
1441-
const testRenderer = enzyme.mount(
1447+
const tester = rtl.render(
14421448
<ProviderMock store={store}>
14431449
<ParentBefore ref={instance => container = instance}/>
14441450
</ProviderMock>
@@ -1447,9 +1453,8 @@ describe('React', () => {
14471453
imitateHotReloading(ParentBefore, ParentAfter, container)
14481454

14491455
store.dispatch({type: ACTION_TYPE})
1450-
testRenderer.update()
14511456

1452-
expect(testRenderer.find(Passthrough).prop('actions')).toEqual(1)
1457+
expect(tester.getByTestId('actions')).toHaveTextContent('1')
14531458
})
14541459

14551460
it('should set the displayName correctly', () => {
@@ -1535,7 +1540,7 @@ describe('React', () => {
15351540
getState: () => expectedState
15361541
}
15371542

1538-
enzyme.mount(<Decorated store={mockStore} />)
1543+
rtl.render(<Decorated store={mockStore} />)
15391544

15401545
expect(actualState).toEqual(expectedState)
15411546
})
@@ -1553,7 +1558,7 @@ describe('React', () => {
15531558
const Decorated = decorator(Container)
15541559

15551560
expect(() =>
1556-
enzyme.mount(<Decorated />)
1561+
rtl.render(<Decorated />)
15571562
).toThrow(
15581563
/Could not find "store"/
15591564
)

0 commit comments

Comments
 (0)