Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

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

Merged
merged 1 commit into from
Jan 13, 2025
Merged

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

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
0 test/general-cli.mjs → test/cli.mjs
View file
Open in desktop
File renamed without changes.
8 changes: 4 additions & 4 deletions test/database/create.mjs → test/commands/database/create.mjs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
4 changes: 2 additions & 2 deletions test/database/database.mjs → test/commands/database/database.mjs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
8 changes: 4 additions & 4 deletions test/database/delete.mjs → test/commands/database/delete.mjs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
10 changes: 5 additions & 5 deletions test/database/list.mjs → test/commands/database/list.mjs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
8 changes: 4 additions & 4 deletions test/local.mjs → test/commands/local.mjs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand Down
6 changes: 3 additions & 3 deletions test/login.mjs → test/commands/login.mjs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
12 changes: 6 additions & 6 deletions test/query.mjs → test/commands/query.mjs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
6 changes: 3 additions & 3 deletions test/schema/abandon.mjs → test/commands/schema/abandon.mjs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 =
Expand Down
6 changes: 3 additions & 3 deletions test/schema/commit.mjs → test/commands/schema/commit.mjs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 =
Expand Down
8 changes: 4 additions & 4 deletions test/schema/diff.mjs → test/commands/schema/diff.mjs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 =
Expand Down
8 changes: 4 additions & 4 deletions test/schema/pull.mjs → test/commands/schema/pull.mjs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
8 changes: 4 additions & 4 deletions test/schema/push.mjs → test/commands/schema/push.mjs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 =
Expand Down
6 changes: 3 additions & 3 deletions test/schema/schema.mjs → test/commands/schema/schema.mjs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
8 changes: 4 additions & 4 deletions test/schema/status.mjs → test/commands/schema/status.mjs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
19 changes: 11 additions & 8 deletions test/shell.mjs → test/commands/shell.mjs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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({
Expand Down Expand Up @@ -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)),
Expand Down
Loading