Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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
2 changes: 1 addition & 1 deletion e2e/plugin-axe-e2e/tests/collect.e2e.test.ts
Original file line number Diff line number Diff line change
Expand Up @@ -2,11 +2,11 @@ import { cp } from 'node:fs/promises';
import path from 'node:path';
import { afterAll, beforeAll, describe, expect, it } from 'vitest';
import { type Report, reportSchema } from '@code-pushup/models';
import { omitVariableReportData } from '@code-pushup/test-fixtures';
import { nxTargetProject } from '@code-pushup/test-nx-utils';
import {
E2E_ENVIRONMENTS_DIR,
TEST_OUTPUT_DIR,
omitVariableReportData,
teardownTestFolder,
} from '@code-pushup/test-utils';
import { executeProcess, readJsonFile } from '@code-pushup/utils';
Expand Down
2 changes: 1 addition & 1 deletion e2e/plugin-coverage-e2e/tests/collect.e2e.test.ts
Original file line number Diff line number Diff line change
Expand Up @@ -3,12 +3,12 @@ import path from 'node:path';
import { simpleGit } from 'simple-git';
import { afterAll, afterEach, beforeAll } from 'vitest';
import { type Report, reportSchema } from '@code-pushup/models';
import { omitVariableReportData } from '@code-pushup/test-fixtures';
import { nxTargetProject } from '@code-pushup/test-nx-utils';
import {
E2E_ENVIRONMENTS_DIR,
TEST_OUTPUT_DIR,
initGitRepo,
omitVariableReportData,
restoreNxIgnoredFiles,
teardownTestFolder,
} from '@code-pushup/test-utils';
Expand Down
2 changes: 1 addition & 1 deletion e2e/plugin-eslint-e2e/tests/collect.e2e.test.ts
Original file line number Diff line number Diff line change
Expand Up @@ -2,11 +2,11 @@ import { cp } from 'node:fs/promises';
import path from 'node:path';
import { afterAll, afterEach, beforeAll, describe, expect, it } from 'vitest';
import { type Report, reportSchema } from '@code-pushup/models';
import { omitVariableReportData } from '@code-pushup/test-fixtures';
import { nxTargetProject } from '@code-pushup/test-nx-utils';
import {
E2E_ENVIRONMENTS_DIR,
TEST_OUTPUT_DIR,
omitVariableReportData,
restoreNxIgnoredFiles,
teardownTestFolder,
} from '@code-pushup/test-utils';
Expand Down
2 changes: 1 addition & 1 deletion e2e/plugin-jsdocs-e2e/tests/collect.e2e.test.ts
Original file line number Diff line number Diff line change
Expand Up @@ -3,12 +3,12 @@ import path from 'node:path';
import { simpleGit } from 'simple-git';
import { afterAll, afterEach, beforeAll, describe, expect, it } from 'vitest';
import { type Report, reportSchema } from '@code-pushup/models';
import { omitVariableReportData } from '@code-pushup/test-fixtures';
import { nxTargetProject } from '@code-pushup/test-nx-utils';
import {
E2E_ENVIRONMENTS_DIR,
TEST_OUTPUT_DIR,
initGitRepo,
omitVariableReportData,
restoreNxIgnoredFiles,
teardownTestFolder,
} from '@code-pushup/test-utils';
Expand Down
2 changes: 1 addition & 1 deletion e2e/plugin-lighthouse-e2e/tests/collect.e2e.test.ts
Original file line number Diff line number Diff line change
Expand Up @@ -2,11 +2,11 @@ import { cp } from 'node:fs/promises';
import path from 'node:path';
import { afterAll, beforeAll, expect } from 'vitest';
import { type Report, reportSchema } from '@code-pushup/models';
import { omitVariableReportData } from '@code-pushup/test-fixtures';
import { nxTargetProject } from '@code-pushup/test-nx-utils';
import {
E2E_ENVIRONMENTS_DIR,
TEST_OUTPUT_DIR,
omitVariableReportData,
restoreNxIgnoredFiles,
teardownTestFolder,
} from '@code-pushup/test-utils';
Expand Down
6 changes: 4 additions & 2 deletions e2e/plugin-typescript-e2e/tests/collect.e2e.test.ts
Original file line number Diff line number Diff line change
Expand Up @@ -2,12 +2,14 @@ import { cp } from 'node:fs/promises';
import path from 'node:path';
import { afterAll, beforeAll, expect } from 'vitest';
import { type Report, reportSchema } from '@code-pushup/models';
import {
omitVariableReportData,
osAgnosticAuditOutputs,
} from '@code-pushup/test-fixtures';
import { nxTargetProject } from '@code-pushup/test-nx-utils';
import {
E2E_ENVIRONMENTS_DIR,
TEST_OUTPUT_DIR,
omitVariableReportData,
osAgnosticAuditOutputs,
osAgnosticPath,
restoreNxIgnoredFiles,
teardownTestFolder,
Expand Down
7 changes: 4 additions & 3 deletions packages/cli/src/lib/autorun/autorun-command.unit.test.ts
Original file line number Diff line number Diff line change
Expand Up @@ -2,14 +2,15 @@ import { vol } from 'memfs';
import { describe, expect, it, vi } from 'vitest';
import { uploadReportToPortal } from '@code-pushup/portal-client';
import { collectAndPersistReports, readRcByPath } from '@code-pushup/core';
import { MEMFS_VOLUME, MINIMAL_REPORT_MOCK } from '@code-pushup/test-utils';
import { MINIMAL_REPORT_MOCK } from '@code-pushup/test-fixtures';
import { MEMFS_VOLUME } from '@code-pushup/test-utils';
import { DEFAULT_CLI_CONFIGURATION } from '../../../mocks/constants.js';
import { yargsCli } from '../yargs-cli.js';
import { yargsAutorunCommandObject } from './autorun-command.js';

vi.mock('@code-pushup/core', async () => {
const { CORE_CONFIG_MOCK }: typeof import('@code-pushup/test-utils') =
await vi.importActual('@code-pushup/test-utils');
const { CORE_CONFIG_MOCK }: typeof import('@code-pushup/test-fixtures') =
await vi.importActual('@code-pushup/test-fixtures');
const core: object = await vi.importActual('@code-pushup/core');
return {
...core,
Expand Down
4 changes: 2 additions & 2 deletions packages/cli/src/lib/collect/collect-command.unit.test.ts
Original file line number Diff line number Diff line change
Expand Up @@ -11,8 +11,8 @@ import { yargsCli } from '../yargs-cli.js';
import { yargsCollectCommandObject } from './collect-command.js';

vi.mock('@code-pushup/core', async () => {
const { CORE_CONFIG_MOCK }: typeof import('@code-pushup/test-utils') =
await vi.importActual('@code-pushup/test-utils');
const { CORE_CONFIG_MOCK }: typeof import('@code-pushup/test-fixtures') =
await vi.importActual('@code-pushup/test-fixtures');
const core: object = await vi.importActual('@code-pushup/core');
return {
...core,
Expand Down
4 changes: 2 additions & 2 deletions packages/cli/src/lib/compare/compare-command.unit.test.ts
Original file line number Diff line number Diff line change
Expand Up @@ -12,8 +12,8 @@ import { yargsCompareCommandObject } from './compare-command.js';

vi.mock('@code-pushup/core', async () => {
const core: object = await vi.importActual('@code-pushup/core');
const { CORE_CONFIG_MOCK }: typeof import('@code-pushup/test-utils') =
await vi.importActual('@code-pushup/test-utils');
const { CORE_CONFIG_MOCK }: typeof import('@code-pushup/test-fixtures') =
await vi.importActual('@code-pushup/test-fixtures');
return {
...core,
autoloadRc: vi.fn().mockResolvedValue(CORE_CONFIG_MOCK),
Expand Down
4 changes: 2 additions & 2 deletions packages/cli/src/lib/history/history-command.unit.test.ts
Original file line number Diff line number Diff line change
Expand Up @@ -8,8 +8,8 @@ import { yargsHistoryCommandObject } from './history-command.js';
vi.mock('@code-pushup/core', async () => {
const {
MINIMAL_HISTORY_CONFIG_MOCK,
}: typeof import('@code-pushup/test-utils') = await vi.importActual(
'@code-pushup/test-utils',
}: typeof import('@code-pushup/test-fixtures') = await vi.importActual(
'@code-pushup/test-fixtures',
);
const core: object = await vi.importActual('@code-pushup/core');
return {
Expand Down
5 changes: 4 additions & 1 deletion packages/cli/src/lib/implementation/core-config.int.test.ts
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,10 @@ import {
type PersistConfig,
type UploadConfig,
} from '@code-pushup/models';
import { CORE_CONFIG_MOCK, MINIMAL_CONFIG_MOCK } from '@code-pushup/test-utils';
import {
CORE_CONFIG_MOCK,
MINIMAL_CONFIG_MOCK,
} from '@code-pushup/test-fixtures';
import { yargsCli } from '../yargs-cli.js';
import { coreConfigMiddleware } from './core-config.middleware.js';
import { yargsCoreConfigOptionsDefinition } from './core-config.options.js';
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ const configDirPath = path.join(
'..',
'..',
'testing',
'test-utils',
'test-fixtures',
'src',
'lib',
'fixtures',
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -9,8 +9,8 @@ import type { FilterOptions } from './filter.model.js';
import type { GlobalOptions } from './global.model.js';

vi.mock('@code-pushup/core', async () => {
const { CORE_CONFIG_MOCK }: typeof import('@code-pushup/test-utils') =
await vi.importActual('@code-pushup/test-utils');
const { CORE_CONFIG_MOCK }: typeof import('@code-pushup/test-fixtures') =
await vi.importActual('@code-pushup/test-fixtures');
const core: object = await vi.importActual('@code-pushup/core');
return {
...core,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -8,8 +8,8 @@ import {
import { OptionValidationError } from './validate-filter-options.utils.js';

vi.mock('@code-pushup/core', async () => {
const { CORE_CONFIG_MOCK }: typeof import('@code-pushup/test-utils') =
await vi.importActual('@code-pushup/test-utils');
const { CORE_CONFIG_MOCK }: typeof import('@code-pushup/test-fixtures') =
await vi.importActual('@code-pushup/test-fixtures');
const core: object = await vi.importActual('@code-pushup/core');
return {
...core,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -12,8 +12,8 @@ import { yargsMergeDiffsCommandObject } from './merge-diffs-command.js';

vi.mock('@code-pushup/core', async () => {
const core: object = await vi.importActual('@code-pushup/core');
const { CORE_CONFIG_MOCK }: typeof import('@code-pushup/test-utils') =
await vi.importActual('@code-pushup/test-utils');
const { CORE_CONFIG_MOCK }: typeof import('@code-pushup/test-fixtures') =
await vi.importActual('@code-pushup/test-fixtures');
return {
...core,
autoloadRc: vi.fn().mockResolvedValue(CORE_CONFIG_MOCK),
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -9,8 +9,8 @@ import { yargsCli } from '../yargs-cli.js';
import { yargsPrintConfigCommandObject } from './print-config-command.js';

vi.mock('@code-pushup/core', async () => {
const { CORE_CONFIG_MOCK }: typeof import('@code-pushup/test-utils') =
await vi.importActual('@code-pushup/test-utils');
const { CORE_CONFIG_MOCK }: typeof import('@code-pushup/test-fixtures') =
await vi.importActual('@code-pushup/test-fixtures');
const core: object = await vi.importActual('@code-pushup/core');
return {
...core,
Expand Down
11 changes: 4 additions & 7 deletions packages/cli/src/lib/upload/upload-command.unit.test.ts
Original file line number Diff line number Diff line change
Expand Up @@ -2,18 +2,15 @@ import { vol } from 'memfs';
import { describe, expect, it } from 'vitest';
import { uploadReportToPortal } from '@code-pushup/portal-client';
import { readRcByPath } from '@code-pushup/core';
import {
ISO_STRING_REGEXP,
MEMFS_VOLUME,
MINIMAL_REPORT_MOCK,
} from '@code-pushup/test-utils';
import { MINIMAL_REPORT_MOCK } from '@code-pushup/test-fixtures';
import { ISO_STRING_REGEXP, MEMFS_VOLUME } from '@code-pushup/test-utils';
import { DEFAULT_CLI_CONFIGURATION } from '../../../mocks/constants.js';
import { yargsCli } from '../yargs-cli.js';
import { yargsUploadCommandObject } from './upload-command.js';

vi.mock('@code-pushup/core', async () => {
const { CORE_CONFIG_MOCK }: typeof import('@code-pushup/test-utils') =
await vi.importActual('@code-pushup/test-utils');
const { CORE_CONFIG_MOCK }: typeof import('@code-pushup/test-fixtures') =
await vi.importActual('@code-pushup/test-fixtures');
const core: object = await vi.importActual('@code-pushup/core');
return {
...core,
Expand Down
2 changes: 1 addition & 1 deletion packages/core/src/lib/collect-and-persist.unit.test.ts
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ import { type MockInstance, describe } from 'vitest';
import {
MINIMAL_CONFIG_MOCK,
MINIMAL_REPORT_MOCK,
} from '@code-pushup/test-utils';
} from '@code-pushup/test-fixtures';
import * as utils from '@code-pushup/utils';
import {
type ScoredReport,
Expand Down
4 changes: 2 additions & 2 deletions packages/core/src/lib/compare.unit.test.ts
Original file line number Diff line number Diff line change
Expand Up @@ -11,11 +11,11 @@ import {
import {
COMMIT_ALT_MOCK,
COMMIT_MOCK,
MEMFS_VOLUME,
MINIMAL_REPORT_MOCK,
REPORT_MOCK,
reportMock,
} from '@code-pushup/test-utils';
} from '@code-pushup/test-fixtures';
import { MEMFS_VOLUME } from '@code-pushup/test-utils';
import { type Diff, fileExists, readJsonFile } from '@code-pushup/utils';
import { compareReportFiles, compareReports } from './compare.js';

Expand Down
2 changes: 1 addition & 1 deletion packages/core/src/lib/history.unit.test.ts
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import { describe, expect, vi } from 'vitest';
import { MINIMAL_PLUGIN_CONFIG_MOCK } from '@code-pushup/test-utils';
import { MINIMAL_PLUGIN_CONFIG_MOCK } from '@code-pushup/test-fixtures';
import { getCurrentBranchOrTag, safeCheckout } from '@code-pushup/utils';
import { collectAndPersistReports } from './collect-and-persist.js';
import { type HistoryOptions, history } from './history.js';
Expand Down
3 changes: 2 additions & 1 deletion packages/core/src/lib/implementation/collect.int.test.ts
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,8 @@ import { writeFile } from 'node:fs/promises';
import path from 'node:path';
import { describe, expect, it } from 'vitest';
import { commitSchema } from '@code-pushup/models';
import { MINIMAL_CONFIG_MOCK, cleanTestFolder } from '@code-pushup/test-utils';
import { MINIMAL_CONFIG_MOCK } from '@code-pushup/test-fixtures';
import { cleanTestFolder } from '@code-pushup/test-utils';
import {
ensureDirectoryExists,
fileExists,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -6,10 +6,8 @@ import {
DEFAULT_PERSIST_CONFIG,
type PluginConfig,
} from '@code-pushup/models';
import {
MEMFS_VOLUME,
MINIMAL_PLUGIN_CONFIG_MOCK,
} from '@code-pushup/test-utils';
import { MINIMAL_PLUGIN_CONFIG_MOCK } from '@code-pushup/test-fixtures';
import { MEMFS_VOLUME } from '@code-pushup/test-utils';
import { logger } from '@code-pushup/utils';
import { executePlugin, executePlugins } from './execute-plugin.js';
import * as runnerModule from './runner.js';
Expand Down
7 changes: 2 additions & 5 deletions packages/core/src/lib/implementation/persist.unit.test.ts
Original file line number Diff line number Diff line change
Expand Up @@ -4,11 +4,8 @@ import { readFile } from 'node:fs/promises';
import path from 'node:path';
import { beforeEach, describe, expect, it } from 'vitest';
import type { Report } from '@code-pushup/models';
import {
MEMFS_VOLUME,
MINIMAL_REPORT_MOCK,
REPORT_MOCK,
} from '@code-pushup/test-utils';
import { MINIMAL_REPORT_MOCK, REPORT_MOCK } from '@code-pushup/test-fixtures';
import { MEMFS_VOLUME } from '@code-pushup/test-utils';
import { logger, scoreReport, sortReport } from '@code-pushup/utils';
import { logPersistedReport, persistReport } from './persist.js';

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ describe('readRcByPath', () => {
'..',
'..',
'testing',
'test-utils',
'test-fixtures',
'src',
'lib',
'fixtures',
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ import { autoloadRc } from './read-rc-file.js';
// mock bundleRequire inside importEsmModule used for fetching config
vi.mock('bundle-require', async () => {
const { CORE_CONFIG_MOCK }: Record<string, CoreConfig> =
await vi.importActual('@code-pushup/test-utils');
await vi.importActual('@code-pushup/test-fixtures');

return {
bundleRequire: vi
Expand Down
5 changes: 2 additions & 3 deletions packages/core/src/lib/implementation/runner.unit.test.ts
Original file line number Diff line number Diff line change
Expand Up @@ -9,12 +9,11 @@ import {
auditOutputsSchema,
} from '@code-pushup/models';
import {
MEMFS_VOLUME,
MINIMAL_PLUGIN_CONFIG_MOCK,
MINIMAL_RUNNER_CONFIG_MOCK,
MINIMAL_RUNNER_FUNCTION_MOCK,
osAgnosticPath,
} from '@code-pushup/test-utils';
} from '@code-pushup/test-fixtures';
import { MEMFS_VOLUME, osAgnosticPath } from '@code-pushup/test-utils';
import * as utils from '@code-pushup/utils';
import {
executePluginRunner,
Expand Down
4 changes: 2 additions & 2 deletions packages/core/src/lib/merge-diffs.unit.test.ts
Original file line number Diff line number Diff line change
Expand Up @@ -3,12 +3,12 @@ import { readFile } from 'node:fs/promises';
import path from 'node:path';
import type { PersistConfig } from '@code-pushup/models';
import {
MEMFS_VOLUME,
reportsDiffAddedPluginMock,
reportsDiffAltMock,
reportsDiffMock,
reportsDiffUnchangedMock,
} from '@code-pushup/test-utils';
} from '@code-pushup/test-fixtures';
import { MEMFS_VOLUME } from '@code-pushup/test-utils';
import { fileExists, logger } from '@code-pushup/utils';
import { mergeDiffs } from './merge-diffs.js';

Expand Down
7 changes: 2 additions & 5 deletions packages/core/src/lib/upload.unit.test.ts
Original file line number Diff line number Diff line change
@@ -1,11 +1,8 @@
import { vol } from 'memfs';
import { describe, expect } from 'vitest';
import { uploadReportToPortal } from '@code-pushup/portal-client';
import {
ISO_STRING_REGEXP,
MEMFS_VOLUME,
MINIMAL_REPORT_MOCK,
} from '@code-pushup/test-utils';
import { MINIMAL_REPORT_MOCK } from '@code-pushup/test-fixtures';
import { ISO_STRING_REGEXP, MEMFS_VOLUME } from '@code-pushup/test-utils';
import { upload } from './upload.js';

describe('upload', () => {
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import path from 'node:path';
import { fileURLToPath } from 'node:url';
import { describe, expect, it } from 'vitest';
import { osAgnosticAuditOutputs } from '@code-pushup/test-utils';
import { osAgnosticAuditOutputs } from '@code-pushup/test-fixtures';
import { lcovResultsToAuditOutputs } from './lcov-runner.js';

describe('lcovResultsToAuditOutputs', () => {
Expand Down
2 changes: 1 addition & 1 deletion packages/plugin-eslint/src/lib/runner.int.test.ts
Original file line number Diff line number Diff line change
Expand Up @@ -11,8 +11,8 @@ import {
DEFAULT_PERSIST_CONFIG,
type Issue,
} from '@code-pushup/models';
import { osAgnosticAuditOutputs } from '@code-pushup/test-fixtures';
import {
osAgnosticAuditOutputs,
restoreNxIgnoredFiles,
teardownTestFolder,
} from '@code-pushup/test-utils';
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import { describe, expect } from 'vitest';
import type { AuditOutputs } from '@code-pushup/models';
import { osAgnosticAuditOutputs } from '@code-pushup/test-utils';
import { osAgnosticAuditOutputs } from '@code-pushup/test-fixtures';
import { getAudits } from '../utils.js';
import { createRunnerFunction } from './runner.js';

Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import { describe } from 'vitest';
import { reportMock } from '@code-pushup/test-utils';
import { reportMock } from '@code-pushup/test-fixtures';
import { generateMdReport } from './generate-md-report.js';
import { scoreReport } from './scoring.js';
import { sortReport } from './sorting.js';
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ import {
reportsDiffChangedMock,
reportsDiffMock,
reportsDiffUnchangedMock,
} from '@code-pushup/test-utils';
} from '@code-pushup/test-fixtures';
import {
generateMdReportsDiff,
generateMdReportsDiffForMonorepo,
Expand Down
Loading