Skip to content

Commit b9b518e

Browse files
committed
[Shallow] Rename effect functions to match rest of react (facebook#15275)
1 parent b029466 commit b9b518e

File tree

2 files changed

+29
-29
lines changed

2 files changed

+29
-29
lines changed

packages/react-test-renderer/src/ReactShallowRenderer.js

+5-5
Original file line numberDiff line numberDiff line change
@@ -333,7 +333,7 @@ class ReactShallowRenderer {
333333
isLayoutEffect,
334334
create,
335335
inputs,
336-
cleanup: null,
336+
destroy: null,
337337
run: true,
338338
};
339339
} else {
@@ -343,7 +343,7 @@ class ReactShallowRenderer {
343343
isLayoutEffect,
344344
create,
345345
inputs,
346-
cleanup: memoizedState.cleanup,
346+
destroy: memoizedState.destroy,
347347
run:
348348
inputs == null ||
349349
!areHookInputsEqual(inputs, memoizedState.inputs),
@@ -754,10 +754,10 @@ class ReactShallowRenderer {
754754
memoizedState.isLayoutEffect === callLayoutEffects &&
755755
memoizedState.run
756756
) {
757-
if (memoizedState.cleanup) {
758-
memoizedState.cleanup();
757+
if (memoizedState.destroy) {
758+
memoizedState.destroy();
759759
}
760-
memoizedState.cleanup = memoizedState.create();
760+
memoizedState.destroy = memoizedState.create();
761761
}
762762
}
763763
}

packages/react-test-renderer/src/__tests__/ReactShallowRendererHooks-test.js

+24-24
Original file line numberDiff line numberDiff line change
@@ -258,11 +258,11 @@ describe('ReactShallowRenderer with hooks', () => {
258258

259259
function SomeComponent({defaultName}) {
260260
React.useEffect(() => {
261-
happenings.push('call effect');
261+
happenings.push('create effect');
262262
});
263263

264264
React.useLayoutEffect(() => {
265-
happenings.push('call layout effect');
265+
happenings.push('create layout effect');
266266
});
267267

268268
happenings.push('render');
@@ -276,52 +276,52 @@ describe('ReactShallowRenderer with hooks', () => {
276276
// Note the layout effect is triggered first.
277277
expect(happenings).toEqual([
278278
'render',
279-
'call layout effect',
280-
'call effect',
279+
'create layout effect',
280+
'create effect',
281281
]);
282282
});
283283

284-
it('should trigger effects and cleanup depending on inputs', () => {
284+
it('should trigger effects and destroy depending on inputs', () => {
285285
let _setFriend;
286286
const happenings = [];
287287

288288
function SomeComponent() {
289289
const [friend, setFriend] = React.useState('Bons');
290-
const [cat] = React.useState('Muskus');
290+
const cat = 'Muskus';
291291
_setFriend = setFriend;
292292

293293
React.useEffect(
294294
() => {
295-
happenings.push('call friend effect');
295+
happenings.push('create friend effect');
296296
return () => {
297-
happenings.push('cleanup friend effect');
297+
happenings.push('destroy friend effect');
298298
};
299299
},
300300
[friend],
301301
);
302302

303303
React.useEffect(() => {
304-
happenings.push('call empty effect');
304+
happenings.push('create empty effect');
305305
return () => {
306-
happenings.push('cleanup empty effect');
306+
happenings.push('destroy empty effect');
307307
};
308308
});
309309

310310
React.useEffect(
311311
() => {
312-
happenings.push('call cat effect');
312+
happenings.push('create cat effect');
313313
return () => {
314-
happenings.push('cleanup cat effect');
314+
happenings.push('destroy cat effect');
315315
};
316316
},
317317
[cat],
318318
);
319319

320320
React.useEffect(
321321
() => {
322-
happenings.push('call both effect');
322+
happenings.push('create both effect');
323323
return () => {
324-
happenings.push('cleanup both effect');
324+
happenings.push('destroy both effect');
325325
};
326326
},
327327
[friend, cat],
@@ -338,21 +338,21 @@ describe('ReactShallowRenderer with hooks', () => {
338338
shallowRenderer.render(<SomeComponent />);
339339

340340
expect(happenings).toEqual([
341-
'call friend effect',
342-
'call empty effect',
343-
'call cat effect',
344-
'call both effect',
341+
'create friend effect',
342+
'create empty effect',
343+
'create cat effect',
344+
'create both effect',
345345
]);
346346

347347
happenings.splice(0);
348348
_setFriend('Maryam');
349349
expect(happenings).toEqual([
350-
'cleanup friend effect',
351-
'call friend effect',
352-
'cleanup empty effect',
353-
'call empty effect',
354-
'cleanup both effect',
355-
'call both effect',
350+
'destroy friend effect',
351+
'create friend effect',
352+
'destroy empty effect',
353+
'create empty effect',
354+
'destroy both effect',
355+
'create both effect',
356356
]);
357357
});
358358
});

0 commit comments

Comments
 (0)