wrangler 2.0.23 → 2.0.26

package/src/__tests__/jest.setup.ts

@@ -1,11 +1,18 @@
 import fetchMock from "jest-fetch-mock";
 import {
+	fetchDashboardScript,
 	fetchInternal,
 	fetchKVGetValue,
+	fetchR2Objects,
 	getCloudflareAPIBaseURL,
 } from "../cfetch/internal";
 import { confirm, prompt } from "../dialogs";
-import { mockFetchInternal, mockFetchKVGetValue } from "./helpers/mock-cfetch";
+import {
+	mockFetchDashScript,
+	mockFetchInternal,
+	mockFetchKVGetValue,
+	mockFetchR2Objects,
+} from "./helpers/mock-cfetch";
 import { MockWebSocket } from "./helpers/mock-web-socket";
 
 // Mock out getPort since we don't actually care about what ports are open in unit tests.
@@ -43,6 +50,8 @@ jest.mock("../cfetch/internal");
 (getCloudflareAPIBaseURL as jest.Mock).mockReturnValue(
 	"https://api.cloudflare.com/client/v4"
 );
+(fetchR2Objects as jest.Mock).mockImplementation(mockFetchR2Objects);
+(fetchDashboardScript as jest.Mock).mockImplementation(mockFetchDashScript);
 
 jest.mock("../dialogs");
 
@@ -118,3 +127,27 @@ jest.mock("xdg-app-paths", () => {
 		}),
 	};
 });
+
+jest.mock("create-cloudflare");
+
+jest.mock("../metrics/metrics-config", () => {
+	const realModule = jest.requireActual("../metrics/metrics-config");
+	const fakeModule = {
+		...realModule,
+		// Although we mock out the getMetricsConfig() function in most tests,
+		// we need a way to reinstate it for the metrics specific tests.
+		// This is what `useOriginal` is for.
+		useOriginal: false,
+		getMetricsConfig: (...args: unknown[]) =>
+			fakeModule.useOriginal
+				? realModule.getMetricsConfig(...args)
+				: async () => {
+						return {
+							enabled: false,
+							deviceId: "mock-device",
+							userId: undefined,
+						};
+				  },
+	};
+	return fakeModule;
+});

package/src/__tests__/kv.test.ts

@@ -4,7 +4,7 @@ import { mockAccountId, mockApiToken } from "./helpers/mock-account-id";
 import {
 	setMockResponse,
 	unsetAllMocks,
-	unsetMockFetchKVGetValues,
+	unsetSpecialMockFns,
 	setMockFetchKVGetValue,
 	setMockRawResponse,
 	createFetchResult,
@@ -924,7 +924,7 @@ describe("wrangler", () => {
 
 		describe("get", () => {
 			afterEach(() => {
-				unsetMockFetchKVGetValues();
+				unsetSpecialMockFns();
 			});
 
 			it("should get a key in a given namespace specified by namespace-id", async () => {

package/src/__tests__/metrics.test.ts

@@ -26,6 +26,9 @@ describe("metrics", () => {
 	runInTempDir();
 
 	beforeEach(() => {
+		// Tell jest to use the original version of the `getMetricsConfig()` function in these tests.
+		const mockMetricsConfig = jest.requireMock("../metrics/metrics-config");
+		mockMetricsConfig.useOriginal = true;
 		global.SPARROW_SOURCE_KEY = "MOCK_KEY";
 		logger.loggerLevel = "debug";
 		// Create a node_modules directory to store config-cache files
@@ -65,6 +68,7 @@ describe("metrics", () => {
 						properties: {
 							category: "Workers",
 							wranglerVersion,
+							os: process.platform + ":" + process.arch,
 							a: 1,
 							b: 2,
 						},
@@ -139,6 +143,7 @@ describe("metrics", () => {
 						properties: {
 							category: "Workers",
 							wranglerVersion,
+							os: process.platform + ":" + process.arch,
 							a: 1,
 							b: 2,
 						},

package/src/__tests__/pages.test.ts

@@ -97,6 +97,20 @@ describe("pages", () => {
 			expect(std.out).toMatchInlineSnapshot(`
         "🚧 'wrangler pages <command>' is a beta command. Please report any issues to https://github.com/cloudflare/wrangler2/issues/new/choose
 
+        If you think this is a bug then please create an issue at https://github.com/cloudflare/wrangler2/issues/new/choose"
+      `);
+		});
+
+		it("should display for pages:functions:optimize-routes", async () => {
+			await expect(
+				runWrangler(
+					'pages functions optimize-routes --routes-path="/build/_routes.json" --output-routes-path="/build/_optimized-routes.json"'
+				)
+			).rejects.toThrowError();
+
+			expect(std.out).toMatchInlineSnapshot(`
+        "🚧 'wrangler pages <command>' is a beta command. Please report any issues to https://github.com/cloudflare/wrangler2/issues/new/choose
+
         If you think this is a bug then please create an issue at https://github.com/cloudflare/wrangler2/issues/new/choose"
       `);
 		});