Fix tests for 'wrangler pages publish'

cloudflare · May 4, 2022 · 72bf28d · 72bf28d
1 parent eaf348d
commit 72bf28d
Show file tree

Hide file tree

Showing 4 changed files with 21 additions and 42 deletions.
diff --git a/packages/wrangler/src/__tests__/config-cache.test.ts b/packages/wrangler/src/__tests__/config-cache.test.ts
@@ -1,31 +1,36 @@
 import { getConfigCache, saveToConfigCache } from "../config-cache";
 import { runInTempDir } from "./helpers/run-in-tmp";
 
+interface PagesConfigCache {
+  account_id: string;
+  pages_project_name: string;
+}
+
 describe("config cache", () => {
   runInTempDir();
 
   const pagesConfigCacheFilename = "pages-config-cache.json";
 
   it("should return an empty config if no file exists", () => {
-    expect(getConfigCache(pagesConfigCacheFilename)).toMatchInlineSnapshot(
-      `Object {}`
-    );
+    expect(
+      getConfigCache<PagesConfigCache>(pagesConfigCacheFilename)
+    ).toMatchInlineSnapshot(`Object {}`);
   });
 
   it("should read and write values without overriding old ones", () => {
-    saveToConfigCache(pagesConfigCacheFilename, {
+    saveToConfigCache<PagesConfigCache>(pagesConfigCacheFilename, {
       account_id: "some-account-id",
       pages_project_name: "foo",
     });
-    expect(getConfigCache(pagesConfigCacheFilename).account_id).toEqual(
-      "some-account-id"
-    );
+    expect(
+      getConfigCache<PagesConfigCache>(pagesConfigCacheFilename).account_id
+    ).toEqual("some-account-id");
 
-    saveToConfigCache(pagesConfigCacheFilename, {
+    saveToConfigCache<PagesConfigCache>(pagesConfigCacheFilename, {
       pages_project_name: "bar",
     });
-    expect(getConfigCache(pagesConfigCacheFilename).account_id).toEqual(
-      "some-account-id"
-    );
+    expect(
+      getConfigCache<PagesConfigCache>(pagesConfigCacheFilename).account_id
+    ).toEqual("some-account-id");
   });
 });
diff --git a/packages/wrangler/src/__tests__/pages.test.ts b/packages/wrangler/src/__tests__/pages.test.ts
@@ -155,32 +155,7 @@ describe("pages", () => {
       unsetAllMocks();
     });
 
-    it("should create a project with a the default production branch", async () => {
-      setMockResponse(
-        "/accounts/:accountId/pages/projects",
-        ([_url, accountId], init) => {
-          expect(accountId).toEqual("some-account-id");
-          expect(init.method).toEqual("POST");
-          const body = JSON.parse(init.body as string);
-          expect(body).toEqual({
-            name: "a-new-project",
-            production_branch: "production",
-          });
-          return {
-            name: "a-new-project",
-            subdomain: "a-new-project.pages.dev",
-            production_branch: "production",
-          };
-        }
-      );
-      await runWrangler("pages project create a-new-project");
-      expect(std.out).toMatchInlineSnapshot(`
-        "✨ Successfully created the 'a-new-project' project. It will be available at https://a-new-project.pages.dev/ once you create your first deployment.
-        To deploy a folder of assets, run 'wrangler pages publish [directory]'."
-      `);
-    });
-
-    it("should create a project with a the default production branch", async () => {
+    it("should create a project with a production branch", async () => {
       setMockResponse(
         "/accounts/:accountId/pages/projects",
         ([_url, accountId], init) => {
@@ -316,7 +291,7 @@ describe("pages", () => {
           expect(logoPNGFile.name).toEqual("logo.png");
 
           return {
-            id: "2082190357cfd3617ccfe04f340c6247d4b47484797840635feb491447bcd81c",
+            id: "2082190357cfd3617ccfe04f340c6247",
           };
         }
       );
@@ -330,7 +305,7 @@ describe("pages", () => {
           const manifest = JSON.parse(body.get("manifest") as string);
           expect(manifest).toMatchInlineSnapshot(`
             Object {
-              "logo.png": "2082190357cfd3617ccfe04f340c6247d4b47484797840635feb491447bcd81c",
+              "logo.png": "2082190357cfd3617ccfe04f340c6247",
             }
           `);
 

diff --git a/packages/wrangler/src/config-cache.ts b/packages/wrangler/src/config-cache.ts
@@ -1,4 +1,4 @@
-import { mkdirSync, readFileSync, rmdirSync, rmSync, writeFileSync } from "fs";
+import { mkdirSync, readFileSync, rmSync, writeFileSync } from "fs";
 import { dirname, join } from "path";
 
 let cacheMessageShown = false;

diff --git a/packages/wrangler/src/user.tsx b/packages/wrangler/src/user.tsx
@@ -220,15 +220,14 @@ import Table from "ink-table";
 import React from "react";
 import { fetch } from "undici";
 import { getCloudflareApiBaseUrl } from "./cfetch";
+import { purgeConfigCaches } from "./config-cache";
 import { getEnvironmentVariableFactory } from "./environment-variables";
 import { logger } from "./logger";
 import openInBrowser from "./open-in-browser";
 import { parseTOML, readFileSync } from "./parse";
-import type { Config } from "./config";
 import type { Item as SelectInputItem } from "ink-select-input/build/SelectInput";
 import type { ParsedUrlQuery } from "node:querystring";
 import type { Response } from "undici";
-import { purgeConfigCaches } from "./config-cache";
 
 /**
  * Try to read the API token from the environment.