Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix data masking tests that depended on the old profiler utils #12113

Merged
merged 9 commits into from
Nov 8, 2024
Merged

Fix data masking tests that depended on the old profiler utils #12113

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
1d1d968
Update useSuspenseQuery data masking tests to use new profiler library
jerelmiller Nov 7, 2024
c7acbf3
Update useQuery tests to use new render stream library
jerelmiller Nov 7, 2024
102d97c
Update useFragment tests to use new render stream library
jerelmiller Nov 7, 2024
2d1cdb5
Update useBackgroundQuery tests to use new render stream library
jerelmiller Nov 7, 2024
de6daf1
Update useLazyQuery tests to use new render stream library
jerelmiller Nov 7, 2024
44ccdb1
Update useMutation tests to use new render stream library
jerelmiller Nov 7, 2024
9d4a46d
Update useSubscription tests to use new render stream library
jerelmiller Nov 7, 2024
5190874
Update createQueryPreloader tests to use new render stream library
jerelmiller Nov 7, 2024
bda9d2b
Update size limits
jerelmiller Nov 7, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .size-limits.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
{
"dist/apollo-client.min.cjs": 41445,
"dist/apollo-client.min.cjs": 41459,
"import { ApolloClient, InMemoryCache, HttpLink } from \"dist/index.js\" (production)": 34213
}
96 changes: 50 additions & 46 deletions src/react/hooks/__tests__/useBackgroundQuery.test.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4141,9 +4141,9 @@ it("masks queries when dataMasking is `true`", async () => {
link: new MockLink(mocks),
});

const Profiler = createDefaultProfiler<Masked<Query>>();
const renderStream = createDefaultProfiler<Masked<Query>>();
const { SuspenseFallback, ReadQueryHook } =
createDefaultTrackedComponents(Profiler);
createDefaultTrackedComponents(renderStream);

function App() {
useTrackRenders();
Expand All @@ -4156,13 +4156,15 @@ it("masks queries when dataMasking is `true`", async () => {
);
}

renderWithClient(<App />, { client, wrapper: Profiler });
renderStream.render(<App />, {
wrapper: createClientWrapper(client),
});

// loading
await Profiler.takeRender();
await renderStream.takeRender();

{
const { snapshot } = await Profiler.takeRender();
const { snapshot } = await renderStream.takeRender();

expect(snapshot.result).toEqual({
data: {
Expand Down Expand Up @@ -4227,9 +4229,9 @@ it("does not mask query when dataMasking is `false`", async () => {
link: new MockLink(mocks),
});

const Profiler = createDefaultProfiler<Query>();
const renderStream = createDefaultProfiler<Query>();
const { SuspenseFallback, ReadQueryHook } =
createDefaultTrackedComponents(Profiler);
createDefaultTrackedComponents(renderStream);

function App() {
useTrackRenders();
Expand All @@ -4242,12 +4244,12 @@ it("does not mask query when dataMasking is `false`", async () => {
);
}

renderWithClient(<App />, { client, wrapper: Profiler });
renderStream.render(<App />, { wrapper: createClientWrapper(client) });

// loading
await Profiler.takeRender();
await renderStream.takeRender();

const { snapshot } = await Profiler.takeRender();
const { snapshot } = await renderStream.takeRender();

expect(snapshot.result).toEqual({
data: {
Expand Down Expand Up @@ -4311,9 +4313,9 @@ it("does not mask query by default", async () => {
link: new MockLink(mocks),
});

const Profiler = createDefaultProfiler<Query>();
const renderStream = createDefaultProfiler<Query>();
const { SuspenseFallback, ReadQueryHook } =
createDefaultTrackedComponents(Profiler);
createDefaultTrackedComponents(renderStream);

function App() {
useTrackRenders();
Expand All @@ -4326,12 +4328,12 @@ it("does not mask query by default", async () => {
);
}

renderWithClient(<App />, { client, wrapper: Profiler });
renderStream.render(<App />, { wrapper: createClientWrapper(client) });

// loading
await Profiler.takeRender();
await renderStream.takeRender();

const { snapshot } = await Profiler.takeRender();
const { snapshot } = await renderStream.takeRender();

expect(snapshot.result).toEqual({
data: {
Expand Down Expand Up @@ -4396,9 +4398,9 @@ it("masks queries updated by the cache", async () => {
link: new MockLink(mocks),
});

const Profiler = createDefaultProfiler<Masked<Query>>();
const renderStream = createDefaultProfiler<Masked<Query>>();
const { SuspenseFallback, ReadQueryHook } =
createDefaultTrackedComponents(Profiler);
createDefaultTrackedComponents(renderStream);

function App() {
useTrackRenders();
Expand All @@ -4411,13 +4413,13 @@ it("masks queries updated by the cache", async () => {
);
}

renderWithClient(<App />, { client, wrapper: Profiler });
renderStream.render(<App />, { wrapper: createClientWrapper(client) });

// loading
await Profiler.takeRender();
await renderStream.takeRender();

{
const { snapshot } = await Profiler.takeRender();
const { snapshot } = await renderStream.takeRender();

expect(snapshot.result).toEqual({
data: {
Expand Down Expand Up @@ -4447,7 +4449,7 @@ it("masks queries updated by the cache", async () => {
});

{
const { snapshot } = await Profiler.takeRender();
const { snapshot } = await renderStream.takeRender();

expect(snapshot.result).toEqual({
data: {
Expand Down Expand Up @@ -4512,9 +4514,9 @@ it("does not rerender when updating field in named fragment", async () => {
link: new MockLink(mocks),
});

const Profiler = createDefaultProfiler<Masked<Query>>();
const renderStream = createDefaultProfiler<Masked<Query>>();
const { SuspenseFallback, ReadQueryHook } =
createDefaultTrackedComponents(Profiler);
createDefaultTrackedComponents(renderStream);

function App() {
useTrackRenders();
Expand All @@ -4527,13 +4529,15 @@ it("does not rerender when updating field in named fragment", async () => {
);
}

renderWithClient(<App />, { client, wrapper: Profiler });
renderStream.render(<App />, {
wrapper: createClientWrapper(client),
});

// loading
await Profiler.takeRender();
await renderStream.takeRender();

{
const { snapshot } = await Profiler.takeRender();
const { snapshot } = await renderStream.takeRender();

expect(snapshot.result).toEqual({
data: {
Expand Down Expand Up @@ -4562,7 +4566,7 @@ it("does not rerender when updating field in named fragment", async () => {
},
});

await expect(Profiler).not.toRerender();
await expect(renderStream).not.toRerender();

expect(client.readQuery({ query })).toEqual({
currentUser: {
Expand Down Expand Up @@ -4635,9 +4639,9 @@ it("masks result from cache when using with cache-first fetch policy", async ()
},
});

const Profiler = createDefaultProfiler<Masked<Query>>();
const renderStream = createDefaultProfiler<Masked<Query>>();
const { SuspenseFallback, ReadQueryHook } =
createDefaultTrackedComponents(Profiler);
createDefaultTrackedComponents(renderStream);

function App() {
useTrackRenders();
Expand All @@ -4652,9 +4656,9 @@ it("masks result from cache when using with cache-first fetch policy", async ()
);
}

renderWithClient(<App />, { client, wrapper: Profiler });
renderStream.render(<App />, { wrapper: createClientWrapper(client) });

const { snapshot } = await Profiler.takeRender();
const { snapshot } = await renderStream.takeRender();

expect(snapshot.result).toEqual({
data: {
Expand Down Expand Up @@ -4731,9 +4735,9 @@ it("masks cache and network result when using cache-and-network fetch policy", a
},
});

const Profiler = createDefaultProfiler<Masked<Query>>();
const renderStream = createDefaultProfiler<Masked<Query>>();
const { SuspenseFallback, ReadQueryHook } =
createDefaultTrackedComponents(Profiler);
createDefaultTrackedComponents(renderStream);

function App() {
useTrackRenders();
Expand All @@ -4748,10 +4752,10 @@ it("masks cache and network result when using cache-and-network fetch policy", a
);
}

renderWithClient(<App />, { client, wrapper: Profiler });
renderStream.render(<App />, { wrapper: createClientWrapper(client) });

{
const { snapshot } = await Profiler.takeRender();
const { snapshot } = await renderStream.takeRender();

expect(snapshot.result).toEqual({
data: {
Expand All @@ -4767,7 +4771,7 @@ it("masks cache and network result when using cache-and-network fetch policy", a
}

{
const { snapshot } = await Profiler.takeRender();
const { snapshot } = await renderStream.takeRender();

expect(snapshot.result).toEqual({
data: {
Expand Down Expand Up @@ -4848,9 +4852,9 @@ it("masks partial cache data when returnPartialData is `true`", async () => {
});
}

const Profiler = createDefaultProfiler<DeepPartial<Masked<Query>>>();
const renderStream = createDefaultProfiler<DeepPartial<Masked<Query>>>();
const { SuspenseFallback, ReadQueryHook } =
createDefaultTrackedComponents(Profiler);
createDefaultTrackedComponents(renderStream);

function App() {
useTrackRenders();
Expand All @@ -4863,10 +4867,10 @@ it("masks partial cache data when returnPartialData is `true`", async () => {
);
}

renderWithClient(<App />, { client, wrapper: Profiler });
renderStream.render(<App />, { wrapper: createClientWrapper(client) });

{
const { snapshot } = await Profiler.takeRender();
const { snapshot } = await renderStream.takeRender();

expect(snapshot.result).toEqual({
data: {
Expand All @@ -4881,7 +4885,7 @@ it("masks partial cache data when returnPartialData is `true`", async () => {
}

{
const { snapshot } = await Profiler.takeRender();
const { snapshot } = await renderStream.takeRender();

expect(snapshot.result).toEqual({
data: {
Expand Down Expand Up @@ -4948,9 +4952,9 @@ it("masks partial data returned from data on errors with errorPolicy `all`", asy
link: new MockLink(mocks),
});

const Profiler = createDefaultProfiler<Masked<Query> | undefined>();
const renderStream = createDefaultProfiler<Masked<Query> | undefined>();
const { SuspenseFallback, ReadQueryHook } =
createDefaultTrackedComponents(Profiler);
createDefaultTrackedComponents(renderStream);

function App() {
useTrackRenders();
Expand All @@ -4963,13 +4967,13 @@ it("masks partial data returned from data on errors with errorPolicy `all`", asy
);
}

renderWithClient(<App />, { client, wrapper: Profiler });
renderStream.render(<App />, { wrapper: createClientWrapper(client) });

// loading
await Profiler.takeRender();
await renderStream.takeRender();

{
const { snapshot } = await Profiler.takeRender();
const { snapshot } = await renderStream.takeRender();

expect(snapshot.result).toEqual({
data: {
Expand Down
Loading
Loading