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.

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

some more knip reportings #12314

Merged
merged 2 commits into from
Jan 29, 2025
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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 knip.config.js
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ const config = {
"src/react/types/types.documentation.ts",
"eslint-local-rules/index.js",
]),
project: ["src/**/*.ts", "config/*.[jt]s", "eslint-local-rules/*.[jt]s"],
project: ["src/**/*.ts{,x}", "config/*.[jt]s", "eslint-local-rules/*.[jt]s"],
ignore: ["integration-tests/**/*", ".yalc/**/*"],
ignoreBinaries: ["jq"],
ignoreDependencies: [
Expand Down
53 changes: 0 additions & 53 deletions src/testing/internal/renderHelpers.tsx
Original file line number Diff line number Diff line change
@@ -1,20 +1,9 @@
import * as React from "react";
import type { ReactElement } from "react";
import { render } from "@testing-library/react";
import type { Queries, RenderOptions, queries } from "@testing-library/react";
import type { ApolloClient } from "../../core/index.js";
import { ApolloProvider } from "../../react/index.js";
import type { MockedProviderProps } from "../react/MockedProvider.js";
import { MockedProvider } from "../react/MockedProvider.js";

export interface RenderWithClientOptions<
Q extends Queries = typeof queries,
Container extends Element | DocumentFragment = HTMLElement,
BaseElement extends Element | DocumentFragment = Container,
> extends RenderOptions<Q, Container, BaseElement> {
client: ApolloClient<any>;
}

export function createClientWrapper(
client: ApolloClient<any>,
Wrapper: React.JSXElementConstructor<{
Expand All @@ -32,31 +21,6 @@ export function createClientWrapper(
};
}

export function renderWithClient<
Q extends Queries = typeof queries,
Container extends Element | DocumentFragment = HTMLElement,
BaseElement extends Element | DocumentFragment = Container,
>(
ui: ReactElement,
{
client,
wrapper,
...renderOptions
}: RenderWithClientOptions<Q, Container, BaseElement>
) {
return render(ui, {
...renderOptions,
wrapper: createClientWrapper(client, wrapper),
});
}

export interface RenderWithMocksOptions<
Q extends Queries = typeof queries,
Container extends Element | DocumentFragment = HTMLElement,
BaseElement extends Element | DocumentFragment = Container,
> extends RenderOptions<Q, Container, BaseElement>,
MockedProviderProps<any> {}

export function createMockWrapper(
renderOptions: MockedProviderProps<any>,
Wrapper: React.JSXElementConstructor<{
Expand All @@ -73,20 +37,3 @@ export function createMockWrapper(
);
};
}

export function renderWithMocks<
Q extends Queries = typeof queries,
Container extends Element | DocumentFragment = HTMLElement,
BaseElement extends Element | DocumentFragment = Container,
>(
ui: ReactElement,
{
wrapper,
...renderOptions
}: RenderWithMocksOptions<Q, Container, BaseElement>
) {
return render(ui, {
...renderOptions,
wrapper: createMockWrapper(renderOptions, wrapper),
});
}
2 changes: 1 addition & 1 deletion src/testing/react/MockedProvider.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ export interface MockedProviderProps<TSerializedCache = {}> {
connectToDevTools?: boolean;
}

export interface MockedProviderState {
interface MockedProviderState {
client: ApolloClient<any>;
}

Expand Down