wrangler 0.0.0-e7a0cd5b → 0.0.0-e87ad068

package/src/__tests__/api-devregistry.test.js

@@ -1,57 +0,0 @@
-import { unstable_dev } from "../api";
-import { fetch } from "undici";
-
-jest.unmock("undici");
-
-//TODO Fix Tests extremely flakey
-/**
- * a huge caveat to how testing multi-worker scripts works:
- * you can't shutdown the first worker you spun up, or it'll kill the devRegistry
- */
-describe.skip("multi-worker testing", () => {
-	let childWorker;
-	let parentWorker;
-
-	beforeAll(async () => {
-		childWorker = await unstable_dev(
-			"src/__tests__/helpers/worker-scripts/hello-world-worker.js",
-			{ config: "src/__tests__/helpers/worker-scripts/child-wrangler.toml" },
-			{ disableExperimentalWarning: true }
-		);
-		parentWorker = await unstable_dev(
-			"src/__tests__/helpers/worker-scripts/parent-worker.js",
-			{ config: "src/__tests__/helpers/worker-scripts/parent-wrangler.toml" },
-			{ disableExperimentalWarning: true }
-		);
-	});
-
-	afterAll(async () => {
-		await childWorker.stop();
-		await parentWorker.stop();
-	});
-
-	it("parentWorker and childWorker should be added devRegistry", async () => {
-		const resp = await fetch("http://localhost:6284/workers");
-		if (resp) {
-			const parsedResp = await resp.json();
-			expect(parsedResp.parent).toBeTruthy();
-			expect(parsedResp.child).toBeTruthy();
-		}
-	});
-
-	it("childWorker should return Hello World itself", async () => {
-		const resp = await childWorker.fetch();
-		if (resp) {
-			const text = await resp.text();
-			expect(text).toMatchInlineSnapshot(`"Hello World!"`);
-		}
-	});
-
-	it("parentWorker should return Hello World by invoking the child worker", async () => {
-		const resp = await parentWorker.fetch();
-		if (resp) {
-			const parsedResp = await resp.text();
-			expect(parsedResp).toEqual("Parent worker sees: Hello World!");
-		}
-	});
-});

package/src/__tests__/d1.test.ts

@@ -1,72 +0,0 @@
-import { mockAccountId } from "./helpers/mock-account-id";
-import { mockConsoleMethods } from "./helpers/mock-console";
-import { runWrangler } from "./helpers/run-wrangler";
-
-function endEventLoop() {
-	return new Promise((resolve) => setImmediate(resolve));
-}
-
-describe("d1", () => {
-	const std = mockConsoleMethods();
-
-	mockAccountId();
-
-	it("should show help when no argument is passed", async () => {
-		await runWrangler("d1");
-		await endEventLoop();
-
-		expect(std.out).toMatchInlineSnapshot(`
-		"wrangler d1
-
-		🗄  Interact with a D1 database
-
-		Commands:
-		  wrangler d1 list            List D1 databases
-		  wrangler d1 create <name>   Create D1 database
-		  wrangler d1 delete <name>   Delete D1 database
-		  wrangler d1 backup          Interact with D1 Backups
-		  wrangler d1 execute <name>  Executed command or SQL file
-
-		Flags:
-		  -c, --config   Path to .toml configuration file  [string]
-		  -e, --env      Environment to use for operations and .env files  [string]
-		  -h, --help     Show help  [boolean]
-		  -v, --version  Show version number  [boolean]
-
-		🚧 'wrangler d1 <command>' is a beta command. Please report any issues to https://github.com/cloudflare/wrangler2/issues/new/choose"
-	`);
-	});
-
-	it("should show help when an invalid argument is passed", async () => {
-		await expect(() => runWrangler("d1 asdf")).rejects.toThrow(
-			"Unknown argument: asdf"
-		);
-
-		expect(std.err).toMatchInlineSnapshot(`
-		"X [ERROR] Unknown argument: asdf
-
-		"
-	`);
-		expect(std.out).toMatchInlineSnapshot(`
-		"
-		wrangler d1
-
-		🗄  Interact with a D1 database
-
-		Commands:
-		  wrangler d1 list            List D1 databases
-		  wrangler d1 create <name>   Create D1 database
-		  wrangler d1 delete <name>   Delete D1 database
-		  wrangler d1 backup          Interact with D1 Backups
-		  wrangler d1 execute <name>  Executed command or SQL file
-
-		Flags:
-		  -c, --config   Path to .toml configuration file  [string]
-		  -e, --env      Environment to use for operations and .env files  [string]
-		  -h, --help     Show help  [boolean]
-		  -v, --version  Show version number  [boolean]
-
-		🚧 'wrangler d1 <command>' is a beta command. Please report any issues to https://github.com/cloudflare/wrangler2/issues/new/choose"
-	`);
-	});
-});

package/src/__tests__/dialogs.test.tsx

@@ -1,40 +0,0 @@
-jest.unmock("../dialogs");
-import { fromDashMessagePrompt } from "../dialogs";
-import { CI } from "../is-ci";
-
-describe("fromDashMessagePrompt", () => {
-	it("should return undefined in CI when last deployed from api", async () => {
-		//in CI
-		jest.spyOn(CI, "isCI").mockReturnValue(true);
-		const result = await fromDashMessagePrompt("api");
-		expect(result).toBe(undefined);
-	});
-
-	it("should return undefined in CI when last deployed from wrangler", async () => {
-		//in CI
-		jest.spyOn(CI, "isCI").mockReturnValue(true);
-		const result = await fromDashMessagePrompt("wrangler");
-		expect(result).toBe(undefined);
-	});
-
-	it("should return true in CI when last deployed from dash", async () => {
-		//in CI
-		jest.spyOn(CI, "isCI").mockReturnValue(true);
-		const result = await fromDashMessagePrompt("dash");
-		expect(result).toBe(true);
-	});
-
-	it("should return undefined when last deployed from api", async () => {
-		//not in CI
-		jest.spyOn(CI, "isCI").mockReturnValue(false);
-		const result = await fromDashMessagePrompt("api");
-		expect(result).toBe(undefined);
-	});
-
-	it("should return undefined when last deployed from wrangler", async () => {
-		//not in CI
-		jest.spyOn(CI, "isCI").mockReturnValue(false);
-		const result = await fromDashMessagePrompt("wrangler");
-		expect(result).toBe(undefined);
-	});
-});

package/src/__tests__/helpers/mock-cfetch.ts

@@ -1,333 +0,0 @@
-import { Readable } from "node:stream";
-import { URL, URLSearchParams } from "node:url";
-import { pathToRegexp } from "path-to-regexp";
-import { Response } from "undici";
-import { getCloudflareApiBaseUrl } from "../../cfetch";
-import type { FetchResult, FetchError } from "../../cfetch";
-import type {
-	fetchInternal,
-	fetchR2Objects,
-	performApiFetch,
-} from "../../cfetch/internal";
-import type { RequestInit, BodyInit, HeadersInit } from "undici";
-
-/**
- * When the custom mocks fallthrough in tests because they aren't set, instead of throwing an error,
- * we use real fetch to make the request which will use Mock Service Workers.
- */
-const {
-	fetchInternal: realFetchInternal,
-}: { fetchInternal: typeof fetchInternal } = jest.requireActual(
-	"../../cfetch/internal"
-);
-const {
-	fetchR2Objects: realFetchR2Objects,
-}: { fetchR2Objects: typeof fetchR2Objects } = jest.requireActual(
-	"../../cfetch/internal"
-);
-
-const {
-	performApiFetch: realPerformApiFetch,
-}: { performApiFetch: typeof performApiFetch } = jest.requireActual(
-	"../../cfetch/internal"
-);
-
-/**
- * The signature of the function that will handle a mock request.
- */
-export type MockHandler<ResponseType> = (
-	uri: RegExpExecArray,
-	init: RequestInit,
-	queryParams: URLSearchParams
-) => ResponseType | Promise<ResponseType>;
-
-type RemoveMockFn = () => void;
-
-interface MockFetch<ResponseType> {
-	regexp: RegExp;
-	method: string | undefined;
-	handler: MockHandler<ResponseType>;
-}
-const mocks: MockFetch<unknown>[] = [];
-
-/**
- * The mock implementation of `cfApi.fetch()`.
- *
- * This function will attempt to match the given request to one of the mock handlers configured by calls to `setMock`.
- *
- * Once found the handler will be used to generate a mock response.
- */
-export async function mockFetchInternal(
-	resource: string,
-	init: RequestInit = {},
-	queryParams: URLSearchParams | undefined
-) {
-	for (const { regexp, method, handler } of mocks) {
-		const resourcePath = new URL(resource, getCloudflareApiBaseUrl()).pathname;
-		const uri = regexp.exec(resourcePath);
-		// Do the resource path and (if specified) the HTTP method match?
-		if (uri !== null && (!method || method === (init.method ?? "GET"))) {
-			// The `resource` regular expression will extract the labelled groups from the URL.
-			// These are passed through to the `handler` call, to allow it to do additional checks or behaviour.
-			return await handler(uri, init, queryParams ?? new URLSearchParams()); // TODO: should we have some kind of fallthrough system? we'll see.
-		}
-	}
-
-	// let it fall through to mock-service-worker
-	// (do a real, unmocked fetch)
-	return await realFetchInternal(resource, init, queryParams);
-}
-
-/**
- * We don't have loads of infrastructure around performApiFetch
- * the same way we do for cfetch, so we'll just pass off the real
- * deal to avoid getting it auto-mocked, so that msw can catch it.
- */
-export const mockPerformApiFetch = realPerformApiFetch;
-
-/**
- * Specify an expected resource path that is to be handled, resulting in a raw JSON response.
- *
- * @param resource The path of the resource to be matched.
- * This can include wildcards whose value will be passed to the `handler`.
- * @param handler The function that will generate the mock response for this request.
- */
-export function setMockRawResponse<ResponseType>(
-	resource: string,
-	handler: MockHandler<ResponseType>
-): RemoveMockFn;
-/**
- * Specify an expected resource path that is to be handled, resulting in a raw JSON response.
- *
- * @param resource The path of the resource to be matched.
- * This can include wildcards whose value will be passed to the `handler`.
- * @param method The HTTP method (e.g. GET, POST, etc) that the request must have to match this mock handler.
- * @param handler The function that will generate the mock response for this request.
- */
-export function setMockRawResponse<ResponseType>(
-	resource: string,
-	method: string,
-	handler: MockHandler<ResponseType>
-): RemoveMockFn;
-/**
- * Specify an expected resource path that is to be handled, resulting in a raw JSON response.
- */
-export function setMockRawResponse<ResponseType>(
-	resource: string,
-	...args: [string, MockHandler<ResponseType>] | [MockHandler<ResponseType>]
-): RemoveMockFn {
-	const handler = args.pop() as MockHandler<ResponseType>;
-	const method = args.pop() as string;
-	const mock = {
-		resource,
-		method,
-		handler,
-		regexp: pathToRegexp(resource),
-	};
-	mocks.push(mock);
-	return () => {
-		const mockIndex = mocks.indexOf(mock);
-		if (mockIndex !== -1) {
-			mocks.splice(mockIndex, 1);
-		}
-	};
-}
-
-/**
- * Specify an expected resource path that is to be handled, resulting in a `FetchRequest`.
- *
- * The mock `handler` should return the `result`, which will then be wrapped in a `FetchRequest` object.
- *
- * @param resource The path of the resource to be matched.
- * This can include wildcards whose value will be passed to the `handler`.
- * @param handler The function that will generate the mock response for this request.
- */
-export function setMockResponse<ResponseType>(
-	resource: string,
-	handler: MockHandler<ResponseType>
-): RemoveMockFn;
-/**
- * Specify an expected resource path that is to be handled, resulting in a FetchRequest..
- *
- * @param resource The path of the resource to be matched.
- * This can include wildcards whose value will be passed to the `handler`.
- * @param method The HTTP method (e.g. GET, POST, etc) that the request must have to match this mock handler.
- * @param handler The function that will generate the mock response for this request.
- */
-export function setMockResponse<ResponseType>(
-	resource: string,
-	method: string,
-	handler: MockHandler<ResponseType>
-): RemoveMockFn;
-/**
- * Specify an expected resource path that is to be handled, resulting in a FetchRequest.
- */
-export function setMockResponse<ResponseType>(
-	resource: string,
-	...args: [string, MockHandler<ResponseType>] | [MockHandler<ResponseType>]
-): RemoveMockFn {
-	const handler = args.pop() as MockHandler<ResponseType>;
-	const method = args.pop() as string;
-	return setMockRawResponse(resource, method, (...handlerArgs) =>
-		createFetchResult(handler(...handlerArgs))
-	);
-}
-
-/**
- * A helper to make it easier to create `FetchResult` objects in tests.
- */
-export async function createFetchResult<ResponseType>(
-	result: ResponseType | Promise<ResponseType>,
-	success = true,
-	errors: FetchError[] = [],
-	messages: string[] = [],
-	result_info?: unknown
-): Promise<FetchResult<ResponseType>> {
-	return result_info
-		? {
-				result: await result,
-				success,
-				errors,
-				messages,
-				result_info,
-		  }
-		: {
-				result: await result,
-				success,
-				errors,
-				messages,
-		  };
-}
-
-/**
- * Remove all the configured mock handlers.
- *
- * This should be called in an `afterEach()` block to ensure that mock handlers do not leak between tests.
- */
-export function unsetAllMocks() {
-	mocks.length = 0;
-}
-
-/**
- * We special-case fetching the request for `kv:key get`, because it's
- * the only cloudflare API endpoint that returns a plain string as the
- * value, and not as the "standard" FetchResult-style json. Hence, we also
- * special-case mocking it here.
- */
-
-const kvGetMocks = new Map<string, string | Buffer>();
-const r2GetMocks = new Map<string, string | undefined>();
-const dashScriptMocks = new Map<string, string | undefined>();
-
-/**
- * @mocked typeof fetchKVGetValue
- */
-export function mockFetchKVGetValue(
-	accountId: string,
-	namespaceId: string,
-	key: string
-) {
-	const mapKey = `${accountId}/${namespaceId}/${key}`;
-	if (kvGetMocks.has(mapKey)) {
-		const value = kvGetMocks.get(mapKey);
-		if (value !== undefined) return Promise.resolve(value);
-	}
-	throw new Error(`no mock value found for \`kv:key get\` - ${mapKey}`);
-}
-
-export function setMockFetchKVGetValue(
-	accountId: string,
-	namespaceId: string,
-	key: string,
-	value: string | Buffer
-) {
-	kvGetMocks.set(`${accountId}/${namespaceId}/${key}`, value);
-}
-
-/**
- * @mocked typeof fetchR2Objects
- */
-export async function mockFetchR2Objects(
-	resource: string,
-	bodyInit: {
-		body: BodyInit | Readable;
-		headers: HeadersInit | undefined;
-		method: "PUT" | "GET" | "DELETE";
-	}
-): Promise<Response> {
-	if (r2GetMocks.has(resource)) {
-		/**
-		 * Here we destroy & removeListeners to "drain" the stream, for testing purposes
-		 * mimicking the fetch request taking in the stream and draining it.
-		 */
-		if (bodyInit.body instanceof Readable) {
-			bodyInit.body.destroy();
-			bodyInit.body.removeAllListeners();
-		}
-
-		const value = r2GetMocks.get(resource);
-
-		return new Response(value);
-	}
-
-	// No mocks found for ${init.method ?? "any HTTP"} request to ${resource}
-	// let it fall through to Mock Service Worker with a real fetch.
-	return await realFetchR2Objects(resource, bodyInit);
-}
-
-/**
- * Mock setter for usage within test blocks, companion helper to `mockFetchR2Objects`
- */
-export function setMockFetchR2Objects({
-	accountId,
-	bucketName,
-	objectName,
-	mockResponse,
-}: {
-	accountId: string;
-	bucketName: string;
-	objectName: string;
-	mockResponse?: string;
-}) {
-	r2GetMocks.set(
-		`/accounts/${accountId}/r2/buckets/${bucketName}/objects/${objectName}`,
-		mockResponse
-	);
-}
-
-export function unsetSpecialMockFns() {
-	kvGetMocks.clear();
-	r2GetMocks.clear();
-	dashScriptMocks.clear();
-}
-
-/**
- * @mocked typeof fetchDashScript
- * multipart/form-data is the response for modules and raw text for the Script endpoint.
- */
-export async function mockFetchDashScript(resource: string): Promise<string> {
-	if (dashScriptMocks.has(resource)) {
-		return dashScriptMocks.get(resource) ?? "";
-	}
-	throw new Error(`no mock found for \`init from-dash\` - ${resource}`);
-}
-
-/**
- * Mock setter for usage within test blocks, companion helper to `mockFetchDashScript`
- */
-export function setMockFetchDashScript({
-	accountId,
-	fromDashScriptName,
-	environment,
-	mockResponse,
-}: {
-	accountId: string;
-	fromDashScriptName: string;
-	environment: string;
-	mockResponse?: string;
-}) {
-	dashScriptMocks.set(
-		`/accounts/${accountId}/workers/services/${fromDashScriptName}/environments/${environment}/content`,
-		mockResponse
-	);
-}