Skip to content

Commit ac4b637

Browse files
committed
Clean up console log and async calls in linkFiber, snapShot & testing
1 parent e7daa8b commit ac4b637

File tree

3 files changed

+19
-21
lines changed

3 files changed

+19
-21
lines changed

src/backend/__tests__/linkFiber.test.tsx

Lines changed: 14 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,8 @@ describe('linkFiber', () => {
2424
let timeJump;
2525
let fiberRoot: FiberRoot;
2626
let devTools: DevTools;
27+
let onCommitFiberRootDelayed;
28+
const DELAY = 75;
2729
const mockPostMessage = jest.fn();
2830
let dom: JSDOM;
2931

@@ -55,7 +57,7 @@ describe('linkFiber', () => {
5557
// Obtain linkFiber function
5658
linkFiber = linkFiberInitialization(snapshot, mode);
5759
// Since linkFiber invoke a throttle function that get delay for 70 ms, between each test, linkFiber need to be delayed for 75 ms to ensure no overlapping async calls.
58-
linkFiberDelayed = (resolve) => setTimeout(async () => resolve(await linkFiber()), 75);
60+
linkFiberDelayed = (resolve) => setTimeout(async () => resolve(await linkFiber()), DELAY);
5961
timeJump = timeJumpInitialization(mode);
6062
// Set up mock postMessage function
6163
window.postMessage = mockPostMessage;
@@ -67,6 +69,12 @@ describe('linkFiber', () => {
6769
getFiberRoots: (renderID = 0) => new Set([fiberRoot]),
6870
};
6971
devTools = window.__REACT_DEVTOOLS_GLOBAL_HOOK__;
72+
// Since onCommitFiberRoot invoke a throttle function that get delay for 70 ms, between each test, onCommitFiberRoot need to be delayed for 75 ms to ensure no overlapping async calls.
73+
onCommitFiberRootDelayed = (resolve) =>
74+
setTimeout(
75+
async () => resolve(await devTools.onCommitFiberRoot(0, fiberRoot, 'high')),
76+
DELAY,
77+
);
7078
});
7179

7280
afterEach(() => {
@@ -160,9 +168,7 @@ describe('linkFiber', () => {
160168
document.dispatchEvent(visibilityChangeEvent);
161169
// Reset count of mockPostMessage
162170
mockPostMessage.mockClear();
163-
await new Promise((resolve) =>
164-
setTimeout(async () => resolve(await devTools.onCommitFiberRoot(0, fiberRoot, 'high')), 75),
165-
);
171+
await new Promise(onCommitFiberRootDelayed);
166172
// If document hidden, no message/snapshot will be posted
167173
expect(mockPostMessage).not.toHaveBeenCalled();
168174
});
@@ -194,9 +200,7 @@ describe('linkFiber', () => {
194200

195201
// After modified fiberRoot to classComponent, onCommitFiberRoot should send snapSot of classPayload
196202
fiberRoot = { current: classComponent };
197-
await new Promise((resolve) =>
198-
setTimeout(async () => resolve(await devTools.onCommitFiberRoot(0, fiberRoot, 'high')), 75),
199-
);
203+
await new Promise(onCommitFiberRootDelayed);
200204
expect(mockPostMessage).toHaveBeenCalledWith(
201205
{
202206
action: 'recordSnap',
@@ -216,9 +220,7 @@ describe('linkFiber', () => {
216220

217221
// Simulate jumping and navigating
218222
mode.jumping = true;
219-
await new Promise((resolve) =>
220-
setTimeout(async () => resolve(await devTools.onCommitFiberRoot(0, fiberRoot, 'high')), 75),
221-
);
223+
await new Promise(onCommitFiberRootDelayed);
222224
// During jumping &/or navigating, should not post any message/snapshot to front end
223225
expect(mockPostMessage).not.toHaveBeenCalled();
224226
});
@@ -239,17 +241,13 @@ describe('linkFiber', () => {
239241
// Simulate jumping and navigating
240242
mode.jumping = true;
241243
mode.navigating = () => timeJump(updateClassPayload);
242-
await new Promise((resolve) =>
243-
setTimeout(async () => resolve(await devTools.onCommitFiberRoot(0, fiberRoot, 'high')), 75),
244-
);
244+
await new Promise(onCommitFiberRootDelayed);
245245
// During jumping &/or navigating, should not post any message/snapshot to front end
246246
expect(mockPostMessage).not.toHaveBeenCalled();
247247

248248
// After navigate, react application should have updateClassPayload
249249
mode.jumping = false;
250-
await new Promise((resolve) =>
251-
setTimeout(async () => resolve(await devTools.onCommitFiberRoot(0, fiberRoot, 'high')), 75),
252-
);
250+
await new Promise(onCommitFiberRootDelayed);
253251
expect(mockPostMessage).toHaveBeenCalledTimes(1);
254252
expect(mockPostMessage).toHaveBeenCalledWith(
255253
{

src/backend/routers/linkFiber.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ const MIN_TIME_BETWEEN_UPDATE = 10;
2525
*/
2626
const throttledUpdateSnapshot = throttle(
2727
async (fiberRoot: FiberRoot, mode: Status, snapShot: Snapshot) => {
28-
console.log('linkFiber - RERENDER');
28+
// console.log('linkFiber - RERENDER');
2929
// If not jumping
3030
if (!mode.jumping) {
3131
// console.log('linkFiber - SEND SNAPSHOT');

src/backend/routers/snapShot.ts

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -24,10 +24,10 @@ export default function updateAndSendSnapShotTree(snapshot: Snapshot, fiberRoot:
2424
const payload = snapshot.tree;
2525
// Save the current window url to route
2626
payload.route = routes.addRoute(window.location.href);
27-
console.log('send snapshot', {
28-
payload: payload,
29-
componentAction: componentActionsRecord.getAllComponents(),
30-
});
27+
// console.log('send snapshot', {
28+
// payload: payload,
29+
// componentAction: componentActionsRecord.getAllComponents(),
30+
// });
3131

3232
// method safely enables cross-origin communication between Window objects;
3333
// e.g., between a page and a pop-up that it spawned, or between a page

0 commit comments

Comments
 (0)