Move command tests into a commands dir in test/ (#557)

fauna · Jan 13, 2025 · 94bb56a · 94bb56a
1 parent 334ed9f
commit 94bb56a
Show file tree

Hide file tree

Showing 16 changed files with 64 additions and 61 deletions.
diff --git a/test/general-cli.mjs → test/cli.mjs b/test/general-cli.mjs → test/cli.mjs
diff --git a/test/database/create.mjs → test/commands/database/create.mjs b/test/database/create.mjs → test/commands/database/create.mjs
@@ -4,10 +4,10 @@ import { expect } from "chai";
 import { fql, ServiceError } from "fauna";
 import sinon from "sinon";
 
-import { run } from "../../src/cli.mjs";
-import { setupTestContainer as setupContainer } from "../../src/config/setup-test-container.mjs";
-import { AUTHENTICATION_ERROR_MESSAGE } from "../../src/lib/errors.mjs";
-import { mockAccessKeysFile } from "../helpers.mjs";
+import { run } from "../../../src/cli.mjs";
+import { setupTestContainer as setupContainer } from "../../../src/config/setup-test-container.mjs";
+import { AUTHENTICATION_ERROR_MESSAGE } from "../../../src/lib/errors.mjs";
+import { mockAccessKeysFile } from "../../helpers.mjs";
 
 describe("database create", () => {
   let container, logger, runQuery, accountAPI;

diff --git a/test/database/database.mjs → test/commands/database/database.mjs b/test/database/database.mjs → test/commands/database/database.mjs
@@ -3,8 +3,8 @@
 import { expect } from "chai";
 import chalk from "chalk";
 
-import { builtYargs, run } from "../../src/cli.mjs";
-import { setupTestContainer as setupContainer } from "../../src/config/setup-test-container.mjs";
+import { builtYargs, run } from "../../../src/cli.mjs";
+import { setupTestContainer as setupContainer } from "../../../src/config/setup-test-container.mjs";
 
 describe("database", () => {
   let container, logger;

diff --git a/test/database/delete.mjs → test/commands/database/delete.mjs b/test/database/delete.mjs → test/commands/database/delete.mjs
@@ -4,10 +4,10 @@ import { expect } from "chai";
 import { fql, ServiceError } from "fauna";
 import sinon from "sinon";
 
-import { run } from "../../src/cli.mjs";
-import { setupTestContainer as setupContainer } from "../../src/config/setup-test-container.mjs";
-import { AUTHENTICATION_ERROR_MESSAGE } from "../../src/lib/errors.mjs";
-import { mockAccessKeysFile } from "../helpers.mjs";
+import { run } from "../../../src/cli.mjs";
+import { setupTestContainer as setupContainer } from "../../../src/config/setup-test-container.mjs";
+import { AUTHENTICATION_ERROR_MESSAGE } from "../../../src/lib/errors.mjs";
+import { mockAccessKeysFile } from "../../helpers.mjs";
 
 describe("database delete", () => {
   let container, logger, runQuery, accountAPI;

diff --git a/test/database/list.mjs → test/commands/database/list.mjs b/test/database/list.mjs → test/commands/database/list.mjs
@@ -4,11 +4,11 @@ import { expect } from "chai";
 import { ServiceError } from "fauna";
 import sinon from "sinon";
 
-import { run } from "../../src/cli.mjs";
-import { setupTestContainer as setupContainer } from "../../src/config/setup-test-container.mjs";
-import { AUTHENTICATION_ERROR_MESSAGE } from "../../src/lib/errors.mjs";
-import { colorize } from "../../src/lib/formatting/colorize.mjs";
-import { mockAccessKeysFile } from "../helpers.mjs";
+import { run } from "../../../src/cli.mjs";
+import { setupTestContainer as setupContainer } from "../../../src/config/setup-test-container.mjs";
+import { AUTHENTICATION_ERROR_MESSAGE } from "../../../src/lib/errors.mjs";
+import { colorize } from "../../../src/lib/formatting/colorize.mjs";
+import { mockAccessKeysFile } from "../../helpers.mjs";
 
 describe("database list", () => {
   let container, fs, logger, stdout, runQueryFromString, accountAPI;

diff --git a/test/local.mjs → test/commands/local.mjs b/test/local.mjs → test/commands/local.mjs
@@ -5,10 +5,10 @@ import { expect } from "chai";
 import { AbortError } from "fauna";
 import sinon, { stub } from "sinon";
 
-import { run } from "../src/cli.mjs";
-import { setupTestContainer } from "../src/config/setup-test-container.mjs";
-import { reformatFSL } from "../src/lib/schema.mjs";
-import { f } from "./helpers.mjs";
+import { run } from "../../src/cli.mjs";
+import { setupTestContainer } from "../../src/config/setup-test-container.mjs";
+import { reformatFSL } from "../../src/lib/schema.mjs";
+import { f } from "../helpers.mjs";
 
 describe("local command", () => {
   let container,

diff --git a/test/login.mjs → test/commands/login.mjs b/test/login.mjs → test/commands/login.mjs
@@ -4,9 +4,9 @@ import * as awilix from "awilix";
 import { expect } from "chai";
 import sinon, { spy } from "sinon";
 
-import { run } from "../src/cli.mjs";
-import { setupTestContainer as setupContainer } from "../src/config/setup-test-container.mjs";
-import { f } from "./helpers.mjs";
+import { run } from "../../src/cli.mjs";
+import { setupTestContainer as setupContainer } from "../../src/config/setup-test-container.mjs";
+import { f } from "../helpers.mjs";
 
 describe("login", function () {
   let container, fs, fetch, getSession;

diff --git a/test/query.mjs → test/commands/query.mjs b/test/query.mjs → test/commands/query.mjs
@@ -4,17 +4,17 @@ import { expect } from "chai";
 import { NetworkError, ServiceError } from "fauna";
 import sinon from "sinon";
 
-import { run } from "../src/cli.mjs";
-import { setupTestContainer as setupContainer } from "../src/config/setup-test-container.mjs";
-import { NETWORK_ERROR_MESSAGE } from "../src/lib/errors.mjs";
-import { colorize } from "../src/lib/formatting/colorize.mjs";
-import { QUERY_INFO_CHOICES } from "../src/lib/options.mjs";
+import { run } from "../../src/cli.mjs";
+import { setupTestContainer as setupContainer } from "../../src/config/setup-test-container.mjs";
+import { NETWORK_ERROR_MESSAGE } from "../../src/lib/errors.mjs";
+import { colorize } from "../../src/lib/formatting/colorize.mjs";
+import { QUERY_INFO_CHOICES } from "../../src/lib/options.mjs";
 import {
   createV4QueryFailure,
   createV4QuerySuccess,
   createV10QueryFailure,
   createV10QuerySuccess,
-} from "./helpers.mjs";
+} from "../helpers.mjs";
 
 describe("query", function () {
   let container, logger, runQueryFromString;

diff --git a/test/schema/abandon.mjs → test/commands/schema/abandon.mjs b/test/schema/abandon.mjs → test/commands/schema/abandon.mjs
@@ -5,9 +5,9 @@ import chalk from "chalk";
 import sinon from "sinon";
 import tryToCatch from "try-to-catch";
 
-import { run } from "../../src/cli.mjs";
-import { setupTestContainer as setupContainer } from "../../src/config/setup-test-container.mjs";
-import { buildUrl, commonFetchParams, f } from "../helpers.mjs";
+import { run } from "../../../src/cli.mjs";
+import { setupTestContainer as setupContainer } from "../../../src/config/setup-test-container.mjs";
+import { buildUrl, commonFetchParams, f } from "../../helpers.mjs";
 
 describe("schema abandon", function () {
   let diff =

diff --git a/test/schema/commit.mjs → test/commands/schema/commit.mjs b/test/schema/commit.mjs → test/commands/schema/commit.mjs
@@ -5,9 +5,9 @@ import chalk from "chalk";
 import sinon from "sinon";
 import tryToCatch from "try-to-catch";
 
-import { run } from "../../src/cli.mjs";
-import { setupTestContainer as setupContainer } from "../../src/config/setup-test-container.mjs";
-import { buildUrl, commonFetchParams, f } from "../helpers.mjs";
+import { run } from "../../../src/cli.mjs";
+import { setupTestContainer as setupContainer } from "../../../src/config/setup-test-container.mjs";
+import { buildUrl, commonFetchParams, f } from "../../helpers.mjs";
 
 describe("schema commit", function () {
   const textDiff =

diff --git a/test/schema/diff.mjs → test/commands/schema/diff.mjs b/test/schema/diff.mjs → test/commands/schema/diff.mjs
@@ -2,10 +2,10 @@
 
 import { expect } from "chai";
 
-import { run } from "../../src/cli.mjs";
-import { setupTestContainer as setupContainer } from "../../src/config/setup-test-container.mjs";
-import { reformatFSL } from "../../src/lib/schema.mjs";
-import { buildUrl, commonFetchParams, f } from "../helpers.mjs";
+import { run } from "../../../src/cli.mjs";
+import { setupTestContainer as setupContainer } from "../../../src/config/setup-test-container.mjs";
+import { reformatFSL } from "../../../src/lib/schema.mjs";
+import { buildUrl, commonFetchParams, f } from "../../helpers.mjs";
 
 describe("schema diff", function () {
   const colorDiffString =

diff --git a/test/schema/pull.mjs → test/commands/schema/pull.mjs b/test/schema/pull.mjs → test/commands/schema/pull.mjs
@@ -4,14 +4,14 @@ import * as awilix from "awilix";
 import { expect } from "chai";
 import sinon from "sinon";
 
-import { run } from "../../src/cli.mjs";
-import { setupTestContainer as setupContainer } from "../../src/config/setup-test-container.mjs";
+import { run } from "../../../src/cli.mjs";
+import { setupTestContainer as setupContainer } from "../../../src/config/setup-test-container.mjs";
 import {
   deleteUnusedSchemaFiles,
   getAllSchemaFileContents,
   writeSchemaFiles,
-} from "../../src/lib/schema.mjs";
-import { buildUrl, commonFetchParams, f } from "../helpers.mjs";
+} from "../../../src/lib/schema.mjs";
+import { buildUrl, commonFetchParams, f } from "../../helpers.mjs";
 
 describe("schema pull", function () {
   let container, logger, confirm, fetch, fs, fsp, gatherFSL;

diff --git a/test/schema/push.mjs → test/commands/schema/push.mjs b/test/schema/push.mjs → test/commands/schema/push.mjs
@@ -5,10 +5,10 @@ import chalk from "chalk";
 import path from "path";
 import sinon from "sinon";
 
-import { builtYargs, run } from "../../src/cli.mjs";
-import { setupTestContainer as setupContainer } from "../../src/config/setup-test-container.mjs";
-import { reformatFSL } from "../../src/lib/schema.mjs";
-import { buildUrl, f } from "../helpers.mjs";
+import { builtYargs, run } from "../../../src/cli.mjs";
+import { setupTestContainer as setupContainer } from "../../../src/config/setup-test-container.mjs";
+import { reformatFSL } from "../../../src/lib/schema.mjs";
+import { buildUrl, f } from "../../helpers.mjs";
 
 describe("schema push", function () {
   const diffString =

diff --git a/test/schema/schema.mjs → test/commands/schema/schema.mjs b/test/schema/schema.mjs → test/commands/schema/schema.mjs
@@ -4,12 +4,12 @@ import { expect } from "chai";
 import chalk from "chalk";
 import sinon from "sinon";
 
-import { builtYargs, run } from "../../src/cli.mjs";
-import { setupTestContainer as setupContainer } from "../../src/config/setup-test-container.mjs";
+import { builtYargs, run } from "../../../src/cli.mjs";
+import { setupTestContainer as setupContainer } from "../../../src/config/setup-test-container.mjs";
 import {
   AUTHENTICATION_ERROR_MESSAGE,
   NETWORK_ERROR_MESSAGE,
-} from "../../src/lib/errors.mjs";
+} from "../../../src/lib/errors.mjs";
 
 describe("schema", function () {
   let container, logger, stderr;

diff --git a/test/schema/status.mjs → test/commands/schema/status.mjs b/test/schema/status.mjs → test/commands/schema/status.mjs
@@ -4,10 +4,10 @@ import { expect } from "chai";
 import chalk from "chalk";
 import sinon from "sinon";
 
-import { run } from "../../src/cli.mjs";
-import { setupTestContainer as setupContainer } from "../../src/config/setup-test-container.mjs";
-import { reformatFSL } from "../../src/lib/schema.mjs";
-import { buildUrl, commonFetchParams, f } from "../helpers.mjs";
+import { run } from "../../../src/cli.mjs";
+import { setupTestContainer as setupContainer } from "../../../src/config/setup-test-container.mjs";
+import { reformatFSL } from "../../../src/lib/schema.mjs";
+import { buildUrl, commonFetchParams, f } from "../../helpers.mjs";
 
 describe("schema status", function () {
   let container, fetch, logger, gatherFSL;

diff --git a/test/shell.mjs → test/commands/shell.mjs b/test/shell.mjs → test/commands/shell.mjs
@@ -9,13 +9,16 @@ import { expect } from "chai";
 import { NetworkError } from "fauna";
 import sinon, { stub } from "sinon";
 
-import { run } from "../src/cli.mjs";
-import { setupTestContainer as setupContainer } from "../src/config/setup-test-container.mjs";
-import { NETWORK_ERROR_MESSAGE, ValidationError } from "../src/lib/errors.mjs";
-import { isQueryable } from "../src/lib/fauna-client.mjs";
-import { dirExists } from "../src/lib/file-util.mjs";
-import { colorize } from "../src/lib/formatting/colorize.mjs";
-import { createV4QuerySuccess, createV10QuerySuccess } from "./helpers.mjs";
+import { run } from "../../src/cli.mjs";
+import { setupTestContainer as setupContainer } from "../../src/config/setup-test-container.mjs";
+import {
+  NETWORK_ERROR_MESSAGE,
+  ValidationError,
+} from "../../src/lib/errors.mjs";
+import { isQueryable } from "../../src/lib/fauna-client.mjs";
+import { dirExists } from "../../src/lib/file-util.mjs";
+import { colorize } from "../../src/lib/formatting/colorize.mjs";
+import { createV4QuerySuccess, createV10QuerySuccess } from "../helpers.mjs";
 
 // this is defined up here so the indentation doesn't make it harder to use :(
 const v10Object1 = createV10QuerySuccess({
@@ -132,7 +135,7 @@ describe("shell", function () {
 
       const registerHomedir = (container, subdir = "") => {
         const __dirname = import.meta.dirname;
-        const homedir = path.join(__dirname, "../test/test-homedir", subdir);
+        const homedir = path.join(__dirname, "../../test/test-homedir", subdir);
 
         container.register({
           homedir: awilix.asValue(stub().returns(homedir)),