wrangler 0.0.0-e3cab74 → 0.0.0-e3e3243

package/src/__tests__/logout.test.ts

@@ -2,9 +2,12 @@ import { existsSync } from "node:fs";
 import os from "node:os";
 import path from "node:path";
 import fetchMock from "jest-fetch-mock";
-import { initialise } from "../user";
+import {
+  reinitialiseAuthTokens,
+  USER_AUTH_CONFIG_FILE,
+  writeAuthConfigFile,
+} from "../user";
 import { mockConsoleMethods } from "./helpers/mock-console";
-import { writeUserConfig } from "./helpers/mock-user";
 import { runInTempDir } from "./helpers/run-in-tmp";
 import { runWrangler } from "./helpers/run-wrangler";
 
@@ -14,14 +17,15 @@ describe("wrangler", () => {
 
   describe("logout", () => {
     it("should exit with a message stating the user is not logged in", async () => {
-      await initialise();
       await runWrangler("logout");
       expect(std.out).toMatchInlineSnapshot(`"Not logged in, exiting..."`);
     });
 
     it("should logout user that has been properly logged in", async () => {
-      writeUserConfig("some-oauth-tok", "some-refresh-tok");
-
+      writeAuthConfigFile({
+        oauth_token: "some-oauth-tok",
+        refresh_token: "some-refresh-tok",
+      });
       // Mock out the response for a request to revoke the auth tokens,
       // checking the form of the request is as expected.
       fetchMock.mockResponseOnce(async (req) => {
@@ -30,21 +34,19 @@ describe("wrangler", () => {
         return "";
       });
 
-      await initialise();
+      // Now that we have changed the auth tokens in the wrangler.toml we must reinitialize the user auth state.
+      reinitialiseAuthTokens();
       await runWrangler("logout");
 
-      expect(std.out).toMatchInlineSnapshot(`
-        "💁  Wrangler is configured with an OAuth token. The token has been successfully revoked
-        Removing ./home/.wrangler/config/default.toml.. success!"
-      `);
+      expect(std.out).toMatchInlineSnapshot(`"Successfully logged out."`);
 
       // Make sure that we made the request to logout.
       expect(fetchMock).toHaveBeenCalledTimes(1);
 
       // Make sure that logout removed the config file containing the auth tokens.
-      expect(
-        existsSync(path.join(os.homedir(), ".wrangler/config/default.toml"))
-      ).toBe(false);
+      expect(existsSync(path.join(os.homedir(), USER_AUTH_CONFIG_FILE))).toBe(
+        false
+      );
     });
   });
 });

package/src/__tests__/pages.test.ts

@@ -0,0 +1,82 @@
+import { execaSync } from "execa";
+import { getPackageManager } from "../package-manager";
+import { mockConsoleMethods } from "./helpers/mock-console";
+import { runInTempDir } from "./helpers/run-in-tmp";
+import { runWrangler } from "./helpers/run-wrangler";
+import type { PackageManager } from "../package-manager";
+
+describe("subcommand implicit help ran on imcomplete command execution", () => {
+  let mockPackageManager: PackageManager;
+  runInTempDir();
+
+  beforeEach(() => {
+    mockPackageManager = {
+      cwd: process.cwd(),
+      // @ts-expect-error we're making a fake package manager here
+      type: "mockpm",
+      addDevDeps: jest.fn(),
+      install: jest.fn(),
+    };
+    (getPackageManager as jest.Mock).mockResolvedValue(mockPackageManager);
+  });
+
+  const std = mockConsoleMethods();
+  function endEventLoop() {
+    return new Promise((resolve) => setImmediate(resolve));
+  }
+
+  it("should should display a list of available subcommands, for pages with no subcommand", async () => {
+    await runWrangler("pages");
+    await endEventLoop();
+
+    expect(std.out).toMatchInlineSnapshot(`
+      "wrangler pages
+
+      ⚡️ Configure Cloudflare Pages
+
+      Commands:
+        wrangler pages dev [directory] [-- command]  🧑‍💻 Develop your full-stack Pages application locally
+
+      Flags:
+        -c, --config      Path to .toml configuration file  [string]
+        -h, --help        Show help  [boolean]
+        -v, --version     Show version number  [boolean]
+            --legacy-env  Use legacy environments  [boolean]
+
+      🚧 'wrangler pages <command>' is a beta command. Please report any issues to https://github.com/cloudflare/wrangler2/issues/new/choose"
+    `);
+  });
+});
+
+describe("beta message for subcommands", () => {
+  const isWindows = process.platform === "win32";
+  it("should display for pages:dev", async () => {
+    try {
+      execaSync("npx", ["wrangler", "pages", "dev"], {
+        shell: isWindows,
+        env: { BROWSER: "none", ...process.env },
+      }).stderr;
+    } catch (e: unknown) {
+      expect(e).toMatchInlineSnapshot(`
+        [Error: Command failed with exit code 1: npx wrangler pages dev
+        🚧 'wrangler pages <command>' is a beta command. Please report any issues to https://github.com/cloudflare/wrangler2/issues/new/choose
+        Must specify a directory of static assets to serve or a command to run.]
+      `);
+    }
+  });
+
+  it("should display for pages:functions", async () => {
+    try {
+      execaSync("npx", ["wrangler", "pages", "functions"], {
+        shell: isWindows,
+        env: { BROWSER: "none", ...process.env },
+      }).stderr;
+    } catch (e: unknown) {
+      expect(e).toMatchInlineSnapshot(`
+          [Error: Command failed with exit code 1: npx wrangler pages functions
+          🚧 'wrangler pages <command>' is a beta command. Please report any issues to https://github.com/cloudflare/wrangler2/issues/new/choose
+          Must specify a directory of static assets to serve or a command to run.]
+        `);
+    }
+  });
+});