Move src/test/*.spec.ts tests (#7318)

yuchenshi · yuchenshi · commit ea0954e5d6fe · 2024-06-14T09:16:05.000-07:00
diff --git a/src/accountExporter.spec.ts b/src/accountExporter.spec.ts
@@ -4,7 +4,7 @@ import * as nock from "nock";
 import * as os from "os";
 import * as sinon from "sinon";
 
-import { validateOptions, serialExportUsers } from "../accountExporter";
+import { validateOptions, serialExportUsers } from "./accountExporter";
 
 describe("accountExporter", () => {
   describe("validateOptions", () => {
diff --git a/src/accountImporter.spec.ts b/src/accountImporter.spec.ts
@@ -1,9 +1,9 @@
 import * as nock from "nock";
 import { expect } from "chai";
 
-import { googleOrigin } from "../api";
+import { googleOrigin } from "./api";
 
-import * as accountImporter from "../accountImporter";
+import * as accountImporter from "./accountImporter";
 
 describe("accountImporter", () => {
   before(() => {
diff --git a/src/api.spec.ts b/src/api.spec.ts
@@ -1,12 +1,12 @@
 import { expect } from "chai";
 
-import * as utils from "../utils";
+import * as utils from "./utils";
 
 describe("api", () => {
   beforeEach(() => {
     // The api module resolves env var statically so we need to
     // do lazy imports and clear the import each time.
-    delete require.cache[require.resolve("../api")];
+    delete require.cache[require.resolve("./api")];
   });
 
   afterEach(() => {
@@ -18,21 +18,21 @@ describe("api", () => {
   });
 
   after(() => {
-    delete require.cache[require.resolve("../api")];
+    delete require.cache[require.resolve("./api")];
   });
 
   it("should override with FIRESTORE_URL", () => {
     process.env.FIRESTORE_URL = "http://foobar.com";
 
-    const api = require("../api");
+    const api = require("./api");
     expect(api.firestoreOrigin()).to.eq("http://foobar.com");
   });
 
   it("should prefer FIRESTORE_EMULATOR_HOST to FIRESTORE_URL", () => {
     process.env.FIRESTORE_EMULATOR_HOST = "localhost:8080";
     process.env.FIRESTORE_URL = "http://foobar.com";
 
-    const api = require("../api");
+    const api = require("./api");
     expect(api.firestoreOriginOrEmulator()).to.eq("http://localhost:8080");
   });
 });
diff --git a/src/apiv2.spec.ts b/src/apiv2.spec.ts
@@ -4,20 +4,20 @@ import * as nock from "nock";
 import AbortController from "abort-controller";
 const proxySetup = require("proxy");
 
-import { Client } from "../apiv2";
-import { FirebaseError } from "../error";
-import { streamToString, stringToStream } from "../utils";
+import { Client } from "./apiv2";
+import { FirebaseError } from "./error";
+import { streamToString, stringToStream } from "./utils";
 
 describe("apiv2", () => {
   beforeEach(() => {
     // The api module has package variables that we don't want sticking around.
-    delete require.cache[require.resolve("../apiv2")];
+    delete require.cache[require.resolve("./apiv2")];
 
     nock.cleanAll();
   });
 
   after(() => {
-    delete require.cache[require.resolve("../apiv2")];
+    delete require.cache[require.resolve("./apiv2")];
   });
 
   describe("request", () => {
diff --git a/src/archiveDirectory.spec.ts b/src/archiveDirectory.spec.ts
@@ -1,10 +1,10 @@
 import { resolve } from "path";
 import { expect } from "chai";
-import { FirebaseError } from "../error";
+import { FirebaseError } from "./error";
 
-import { archiveDirectory } from "../archiveDirectory";
+import { archiveDirectory } from "./archiveDirectory";
 
-const SOME_FIXTURE_DIRECTORY = resolve(__dirname, "./fixtures/config-imports");
+const SOME_FIXTURE_DIRECTORY = resolve(__dirname, "./test/fixtures/config-imports");
 
 describe("archiveDirectory", () => {
   it("should archive happy little directories", async () => {
diff --git a/src/auth.spec.ts b/src/auth.spec.ts
@@ -7,9 +7,9 @@ import {
   getGlobalDefaultAccount,
   getProjectDefaultAccount,
   selectAccount,
-} from "../auth";
-import { configstore } from "../configstore";
-import { Account } from "../types/auth";
+} from "./auth";
+import { configstore } from "./configstore";
+import { Account } from "./types/auth";
 
 describe("auth", () => {
   const sandbox: sinon.SinonSandbox = sinon.createSandbox();
diff --git a/src/checkMinRequiredVersion.spec.ts b/src/checkMinRequiredVersion.spec.ts
@@ -1,8 +1,8 @@
 import { expect } from "chai";
-import { configstore } from "../configstore";
+import { configstore } from "./configstore";
 import * as sinon from "sinon";
 
-import { checkMinRequiredVersion } from "../checkMinRequiredVersion";
+import { checkMinRequiredVersion } from "./checkMinRequiredVersion";
 import Sinon from "sinon";
 
 describe("checkMinRequiredVersion", () => {
diff --git a/src/checkValidTargetFilters.spec.ts b/src/checkValidTargetFilters.spec.ts
@@ -1,9 +1,9 @@
 import { expect } from "chai";
 
-import { Options } from "../options";
-import { RC } from "../rc";
+import { Options } from "./options";
+import { RC } from "./rc";
 
-import { checkValidTargetFilters } from "../checkValidTargetFilters";
+import { checkValidTargetFilters } from "./checkValidTargetFilters";
 
 const SAMPLE_OPTIONS: Options = {
   cwd: "/",
diff --git a/src/command.spec.ts b/src/command.spec.ts
@@ -1,8 +1,8 @@
 import { expect } from "chai";
 import * as nock from "nock";
 
-import { Command, validateProjectId } from "../command";
-import { FirebaseError } from "../error";
+import { Command, validateProjectId } from "./command";
+import { FirebaseError } from "./error";
 
 describe("Command", () => {
   let command: Command;
diff --git a/src/config.spec.ts b/src/config.spec.ts
@@ -1,18 +1,18 @@
 import { expect } from "chai";
 import * as path from "path";
 
-import { Config } from "../config";
+import { Config } from "./config";
 
 function fixtureDir(name: string): string {
-  return path.resolve(__dirname, "./fixtures/" + name);
+  return path.resolve(__dirname, "./test/fixtures/" + name);
 }
 
 describe("Config", () => {
   describe("#load", () => {
     it("should load a cjson file when configPath is specified", () => {
       const config = Config.load({
         cwd: __dirname,
-        configPath: "./fixtures/valid-config/firebase.json",
+        configPath: "./test/fixtures/valid-config/firebase.json",
       });
       expect(config).to.not.be.null;
       if (config) {
diff --git a/src/defaultCredentials.spec.ts b/src/defaultCredentials.spec.ts
@@ -4,11 +4,11 @@ import * as fs from "fs";
 import * as path from "path";
 import * as os from "os";
 
-import * as api from "../api";
-import { configstore } from "../configstore";
-import * as defaultCredentials from "../defaultCredentials";
-import { getGlobalDefaultAccount } from "../auth";
-import { Account } from "../types/auth";
+import * as api from "./api";
+import { configstore } from "./configstore";
+import * as defaultCredentials from "./defaultCredentials";
+import { getGlobalDefaultAccount } from "./auth";
+import { Account } from "./types/auth";
 
 describe("defaultCredentials", () => {
   const sandbox: sinon.SinonSandbox = sinon.createSandbox();
diff --git a/src/downloadUtils.spec.ts b/src/downloadUtils.spec.ts
@@ -3,8 +3,8 @@ import { readFileSync } from "fs-extra";
 import * as nock from "nock";
 import { gunzipSync, gzipSync } from "zlib";
 
-import { downloadToTmp } from "../downloadUtils";
-import { FirebaseError } from "../error";
+import { downloadToTmp } from "./downloadUtils";
+import { FirebaseError } from "./error";
 
 describe("downloadToTmp", () => {
   it("should download a file", async () => {
diff --git a/src/ensureApiEnabled.spec.ts b/src/ensureApiEnabled.spec.ts
@@ -1,7 +1,7 @@
 import { expect } from "chai";
 import * as nock from "nock";
 
-import { check, ensure, POLL_SETTINGS } from "../ensureApiEnabled";
+import { check, ensure, POLL_SETTINGS } from "./ensureApiEnabled";
 
 const FAKE_PROJECT_ID = "my_project";
 const FAKE_API = "myapi.googleapis.com";
diff --git a/src/error.spec.ts b/src/error.spec.ts
@@ -1,5 +1,5 @@
 import { expect } from "chai";
-import { FirebaseError } from "../error";
+import { FirebaseError } from "./error";
 
 describe("error", () => {
   describe("FirebaseError", () => {
diff --git a/src/experiments.spec.ts b/src/experiments.spec.ts
@@ -1,5 +1,5 @@
 import { expect } from "chai";
-import { enableExperimentsFromCliEnvVariable, isEnabled, setEnabled } from "../experiments";
+import { enableExperimentsFromCliEnvVariable, isEnabled, setEnabled } from "./experiments";
 
 describe("experiments", () => {
   let originalCLIState = process.env.FIREBASE_CLI_EXPERIMENTS;
diff --git a/src/fetchWebSetup.spec.ts b/src/fetchWebSetup.spec.ts
@@ -2,10 +2,10 @@ import { expect } from "chai";
 import * as nock from "nock";
 import * as sinon from "sinon";
 
-import { configstore } from "../configstore";
-import { fetchWebSetup, getCachedWebSetup } from "../fetchWebSetup";
-import { firebaseApiOrigin } from "../api";
-import { FirebaseError } from "../error";
+import { configstore } from "./configstore";
+import { fetchWebSetup, getCachedWebSetup } from "./fetchWebSetup";
+import { firebaseApiOrigin } from "./api";
+import { FirebaseError } from "./error";
 
 describe("fetchWebSetup module", () => {
   before(() => {
diff --git a/src/filterTargets.spec.ts b/src/filterTargets.spec.ts
@@ -1,7 +1,7 @@
 import { expect } from "chai";
-import { filterTargets } from "../filterTargets";
-import { Options } from "../options";
-import { RC } from "../rc";
+import { filterTargets } from "./filterTargets";
+import { Options } from "./options";
+import { RC } from "./rc";
 
 const SAMPLE_OPTIONS: Options = {
   cwd: "/",
diff --git a/src/firebaseConfigValidate.spec.ts b/src/firebaseConfigValidate.spec.ts
@@ -1,6 +1,6 @@
 import { expect } from "chai";
-import { getValidator } from "../firebaseConfigValidate";
-import { FirebaseConfig } from "../firebaseConfig";
+import { getValidator } from "./firebaseConfigValidate";
+import { FirebaseConfig } from "./firebaseConfig";
 
 describe("firebaseConfigValidate", () => {
   it("should accept a basic, valid config", () => {
diff --git a/src/fsAsync.spec.ts b/src/fsAsync.spec.ts
@@ -5,7 +5,7 @@ import * as os from "os";
 import * as path from "path";
 import { sync as rimraf } from "rimraf";
 
-import * as fsAsync from "../fsAsync";
+import * as fsAsync from "./fsAsync";
 
 // These tests work on the following directory structure:
 // <basedir>
diff --git a/src/fsutils.spec.ts b/src/fsutils.spec.ts
@@ -1,6 +1,6 @@
 import { expect } from "chai";
 
-import * as fsutils from "../fsutils";
+import * as fsutils from "./fsutils";
 
 describe("fsutils", () => {
   describe("fileExistsSync", () => {
diff --git a/src/functional.spec.ts b/src/functional.spec.ts
@@ -1,8 +1,8 @@
 import { expect } from "chai";
 import { flatten } from "lodash";
-import { SameType } from "../metaprogramming";
+import { SameType } from "./metaprogramming";
 
-import * as f from "../functional";
+import * as f from "./functional";
 
 describe("functional", () => {
   describe("flatten", () => {
diff --git a/src/functionsConfig.spec.ts b/src/functionsConfig.spec.ts
@@ -1,6 +1,6 @@
 import { expect } from "chai";
 
-import * as functionsConfig from "../functionsConfig";
+import * as functionsConfig from "./functionsConfig";
 
 describe("config.parseSetArgs", () => {
   it("should throw if a reserved namespace is used", () => {
diff --git a/src/hosting/config.spec.ts b/src/hosting/config.spec.ts
@@ -1,4 +1,5 @@
 import { expect } from "chai";
+import * as path from "path";
 import { FirebaseError } from "../error";
 import { HostingConfig, HostingMultiple, HostingSingle } from "../firebaseConfig";
 
@@ -24,8 +25,8 @@ function options(
         return targetsToSites?.[name] || [];
       },
     },
-    cwd: __dirname + "/../fixtures/simplehosting",
-    configPath: __dirname + "/../fixtures/simplehosting/firebase.json",
+    cwd: path.resolve(__dirname, "../test/fixtures/simplehosting"),
+    configPath: path.resolve(__dirname, "../test/fixtures/simplehosting/firebase.json"),
     ...base,
   };
 }
diff --git a/src/listFiles.spec.ts b/src/listFiles.spec.ts
@@ -1,12 +1,12 @@
 import { expect } from "chai";
 import { resolve } from "path";
 
-import { listFiles } from "../listFiles";
+import { listFiles } from "./listFiles";
 
 describe("listFiles", () => {
   // for details, see the file structure and firebase.json in test/fixtures/ignores
   it("should ignore firebase-debug.log, specified ignores, and nothing else", () => {
-    const fileNames = listFiles(resolve(__dirname, "./fixtures/ignores"), [
+    const fileNames = listFiles(resolve(__dirname, "./test/fixtures/ignores"), [
       "**/.*",
       "firebase.json",
       "ignored.txt",
@@ -16,7 +16,7 @@ describe("listFiles", () => {
   });
 
   it("should allow us to not specify additional ignores", () => {
-    const fileNames = listFiles(resolve(__dirname, "./fixtures/ignores"));
+    const fileNames = listFiles(resolve(__dirname, "./test/fixtures/ignores"));
     expect(fileNames.sort()).to.have.members([
       ".hiddenfile",
       "firebase.json",
diff --git a/src/localFunction.spec.ts b/src/localFunction.spec.ts
@@ -1,8 +1,8 @@
 import { expect } from "chai";
 
-import LocalFunction from "../localFunction";
-import { EmulatedTriggerDefinition } from "../emulator/functionsEmulatorShared";
-import { FunctionsEmulatorShell } from "../emulator/functionsEmulatorShell";
+import LocalFunction from "./localFunction";
+import { EmulatedTriggerDefinition } from "./emulator/functionsEmulatorShared";
+import { FunctionsEmulatorShell } from "./emulator/functionsEmulatorShell";
 
 const EMULATED_TRIGGER: EmulatedTriggerDefinition = {
   id: "fn",
diff --git a/src/metapgrogramming.spec.ts b/src/metapgrogramming.spec.ts
@@ -7,7 +7,7 @@ import {
   DeepOmit,
   RequireKeys,
   DeepExtract,
-} from "../metaprogramming";
+} from "./metaprogramming";
 
 describe("metaprogramming", () => {
   it("can calcluate recursive keys", () => {
diff --git a/src/operation-poller.spec.ts b/src/operation-poller.spec.ts
@@ -2,9 +2,9 @@ import { expect } from "chai";
 import * as nock from "nock";
 import * as sinon from "sinon";
 
-import { FirebaseError } from "../error";
-import { OperationPollerOptions, pollOperation } from "../operation-poller";
-import TimeoutError from "../throttler/errors/timeout-error";
+import { FirebaseError } from "./error";
+import { OperationPollerOptions, pollOperation } from "./operation-poller";
+import TimeoutError from "./throttler/errors/timeout-error";
 
 const TEST_ORIGIN = "https://firebasedummy.googleapis.com.com";
 const VERSION = "v1";
diff --git a/src/profileReport.spec.ts b/src/profileReport.spec.ts
@@ -2,13 +2,13 @@ import { expect } from "chai";
 
 import * as path from "path";
 import * as stream from "stream";
-import { extractReadableIndex, formatNumber, ProfileReport } from "../profileReport";
+import { extractReadableIndex, formatNumber, ProfileReport } from "./profileReport";
 
 function combinerFunc(obj1: any, obj2: any): any {
   return { count: obj1.count + obj2.count };
 }
 
-const fixturesDir = path.resolve(__dirname, "./fixtures");
+const fixturesDir = path.resolve(__dirname, "./test/fixtures");
 
 function newReport() {
   const input = path.resolve(fixturesDir, "profiler-data/sample.json");
diff --git a/src/projectUtils.spec.ts b/src/projectUtils.spec.ts
@@ -1,9 +1,9 @@
 import { expect } from "chai";
 import * as sinon from "sinon";
 
-import { needProjectNumber, needProjectId, getAliases, getProjectId } from "../projectUtils";
-import * as projects from "../management/projects";
-import { RC } from "../rc";
+import { needProjectNumber, needProjectId, getAliases, getProjectId } from "./projectUtils";
+import * as projects from "./management/projects";
+import { RC } from "./rc";
 
 describe("getProjectId", () => {
   it("should prefer projectId, falling back to project", () => {
diff --git a/src/prompt.spec.ts b/src/prompt.spec.ts
diff --git a/src/rc.spec.ts b/src/rc.spec.ts
diff --git a/src/remoteconfig/versionslist.spec.ts b/src/remoteconfig/versionslist.spec.ts
diff --git a/src/requireConfig.spec.ts b/src/requireConfig.spec.ts
diff --git a/src/requireTosAcceptance.spec.ts b/src/requireTosAcceptance.spec.ts
diff --git a/src/rulesDeploy.spec.ts b/src/rulesDeploy.spec.ts
diff --git a/src/shortenUrl.spec.ts b/src/shortenUrl.spec.ts
diff --git a/src/unzip.spec.ts b/src/unzip.spec.ts
diff --git a/src/utils.spec.ts b/src/utils.spec.ts
