fix tests

Author: fredzqm

src/init/features/project.spec.ts

@@ -96,26 +96,6 @@ describe("project", () => {
           displayName: "my-project",
         });
       });
-
-      it("should throw if project ID is empty after prompt", async () => {
-        const options = {};
-        const setup = { config: {}, rcfile: {} };
-        prompt.select.onFirstCall().resolves("Create a new project");
-        prompt.input.resolves("");
-        configstoreSetStub.onFirstCall().resolves();
-
-        let err;
-        try {
-          await doSetup(setup, emptyConfig, options);
-        } catch (e: any) {
-          err = e;
-        }
-
-        expect(err.message).to.equal("Project ID cannot be empty");
-        expect(prompt.select).to.be.calledOnce;
-        expect(prompt.input).to.be.calledTwice;
-        expect(createFirebaseProjectStub).to.be.not.called;
-      });
     });
 
     describe('with "Add Firebase resources to GCP project" option', () => {
@@ -139,27 +119,6 @@ describe("project", () => {
         expect(promptAvailableProjectIdStub).to.be.calledOnce;
         expect(addFirebaseProjectStub).to.be.calledOnceWith("my-project-123");
       });
-
-      it("should throw if project ID is empty after prompt", async () => {
-        const options = {};
-        const setup = { config: {}, rcfile: {} };
-        prompt.select
-          .onFirstCall()
-          .resolves("Add Firebase to an existing Google Cloud Platform project");
-        promptAvailableProjectIdStub.onFirstCall().resolves("");
-
-        let err;
-        try {
-          await doSetup(setup, emptyConfig, options);
-        } catch (e: any) {
-          err = e;
-        }
-
-        expect(err.message).to.equal("Project ID cannot be empty");
-        expect(prompt.select).to.be.calledOnce;
-        expect(promptAvailableProjectIdStub).to.be.calledOnce;
-        expect(addFirebaseProjectStub).to.be.not.called;
-      });
     });
 
     describe(`with "Don't set up a default project" option`, () => {
@@ -183,6 +142,7 @@ describe("project", () => {
         options = {};
         setup = { config: {}, rcfile: { projects: { default: "my-project-123" } } };
         getProjectStub.onFirstCall().resolves(TEST_FIREBASE_PROJECT);
+        configstoreSetStub.onFirstCall().resolves();
       });
 
       it("should not prompt", async () => {

src/init/features/project.ts

@@ -15,6 +15,7 @@ import * as utils from "../../utils";
 import * as prompt from "../../prompt";
 import { requireAuth } from "../../requireAuth";
 import { Constants } from "../../emulator/constants";
+import { FirebaseError } from "../../error";
 
 const OPTION_NO_PROJECT = "Don't set up a default project";
 const OPTION_USE_PROJECT = "Use an existing project";
@@ -116,6 +117,9 @@ async function usingProjectMetadata(
   config: any,
   pm: FirebaseProjectMetadata,
 ): Promise<void> {
+  if (!pm) {
+    throw new FirebaseError("null FirebaseProjectMetadata");
+  }
   // write "default" alias and activate it immediately
   _.set(setup.rcfile, "projects.default", pm.projectId);
   setup.projectId = pm.projectId;

src/management/projects.ts

@@ -186,15 +186,20 @@ export async function selectProjectInteractively(
   if (nextPageToken) {
     // Prompt user for project ID if we can't list all projects in 1 page
     logger.debug(`Found more than ${projects.length} projects, selecting via prompt`);
-    return selectProjectByPrompting();
+    return await getFirebaseProject(await selectProjectByPrompting());
   }
   return selectProjectFromList(projects);
 }
 
-async function selectProjectByPrompting(): Promise<FirebaseProjectMetadata> {
+async function selectProjectByPrompting(): Promise<string> {
   const projectId = await prompt.input("Please input the project ID you would like to use:");
-
-  return await getFirebaseProject(projectId);
+  if (!projectId) {
+    throw new FirebaseError("Project ID cannot be empty");
+  }
+  if (Constants.isDemoProject(projectId)) {
+    throw new FirebaseError("Project ID cannot starts with demo-");
+  }
+  return projectId;
 }
 
 /**
@@ -255,17 +260,9 @@ export async function promptAvailableProjectId(): Promise<string> {
   }
 
   if (nextPageToken) {
-    // Prompt for project ID if we can't list all projects in 1 page
-    const projectId = await prompt.input(
-      "Please input the ID of the Google Cloud Project you would like to add Firebase:",
-    );
-    if (!projectId) {
-      throw new FirebaseError("Project ID cannot be empty");
-    }
-    if (Constants.isDemoProject(projectId)) {
-      throw new FirebaseError("Project ID cannot starts with demo-");
-    }
-    return projectId;
+    // Prompt user for project ID if we can't list all projects in 1 page
+    logger.debug(`Found more than ${projects.length} projects, selecting via prompt`);
+    return await selectProjectByPrompting();
   } else {
     const choices = projects
       .filter((p: CloudProjectInfo) => !!p)