Skip to content

Commit 646472f

Browse files
committed
fix mismerge????
1 parent 935e8f8 commit 646472f

File tree

1 file changed

+0
-16
lines changed

1 file changed

+0
-16
lines changed

packages/react-dom/src/__tests__/ReactDOMFizzServer-test.js

-16
Original file line numberDiff line numberDiff line change
@@ -1680,20 +1680,16 @@ describe('ReactDOMFizzServer', () => {
16801680
function getServerSnapshot() {
16811681
return 'server';
16821682
}
1683-
16841683
function getClientSnapshot() {
16851684
return 'client';
16861685
}
1687-
16881686
function subscribe() {
16891687
return () => {};
16901688
}
1691-
16921689
function Child({text}) {
16931690
Scheduler.unstable_yieldValue(text);
16941691
return text;
16951692
}
1696-
16971693
function App() {
16981694
const value = useSyncExternalStore(
16991695
subscribe,
@@ -1706,14 +1702,12 @@ describe('ReactDOMFizzServer', () => {
17061702
</div>
17071703
);
17081704
}
1709-
17101705
const loggedErrors = [];
17111706
await act(async () => {
17121707
const {pipe} = ReactDOMFizzServer.renderToPipeableStream(
17131708
<Suspense fallback="Loading...">
17141709
<App />
17151710
</Suspense>,
1716-
17171711
{
17181712
onError(x) {
17191713
loggedErrors.push(x);
@@ -1737,38 +1731,30 @@ describe('ReactDOMFizzServer', () => {
17371731
});
17381732

17391733
// The selector implementation uses the lazy ref initialization pattern
1740-
// @gate supportsNativeUseSyncExternalStore
17411734
// @gate experimental
17421735
it('calls getServerSnapshot instead of getSnapshot (with selector and isEqual)', async () => {
17431736
// Same as previous test, but with a selector that returns a complex object
17441737
// that is memoized with a custom `isEqual` function.
17451738
const ref = React.createRef();
1746-
17471739
function getServerSnapshot() {
17481740
return {env: 'server', other: 'unrelated'};
17491741
}
1750-
17511742
function getClientSnapshot() {
17521743
return {env: 'client', other: 'unrelated'};
17531744
}
1754-
17551745
function selector({env}) {
17561746
return {env};
17571747
}
1758-
17591748
function isEqual(a, b) {
17601749
return a.env === b.env;
17611750
}
1762-
17631751
function subscribe() {
17641752
return () => {};
17651753
}
1766-
17671754
function Child({text}) {
17681755
Scheduler.unstable_yieldValue(text);
17691756
return text;
17701757
}
1771-
17721758
function App() {
17731759
const {env} = useSyncExternalStoreWithSelector(
17741760
subscribe,
@@ -1783,14 +1769,12 @@ describe('ReactDOMFizzServer', () => {
17831769
</div>
17841770
);
17851771
}
1786-
17871772
const loggedErrors = [];
17881773
await act(async () => {
17891774
const {pipe} = ReactDOMFizzServer.renderToPipeableStream(
17901775
<Suspense fallback="Loading...">
17911776
<App />
17921777
</Suspense>,
1793-
17941778
{
17951779
onError(x) {
17961780
loggedErrors.push(x);

0 commit comments

Comments
 (0)