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

chore: inline usage of errors in tests #1266

Merged
merged 2 commits into from
Feb 13, 2025
Merged

chore: inline usage of errors in tests #1266

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
00f0593
chore: inline usage of errors in tests
peterpeterparker Feb 13, 2025
12ae284
test: correct expected msg
peterpeterparker Feb 13, 2025
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
50 changes: 0 additions & 50 deletions src/tests/specs/constants/satellite-tests.constants.ts
View file
Open in desktop

This file was deleted.

8 changes: 4 additions & 4 deletions src/tests/specs/mission-control.controllers.spec.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,16 +6,16 @@ import type { _SERVICE as SatelliteActor } from '$declarations/satellite/satelli
import { idlFactory as idlFactorSatellite } from '$declarations/satellite/satellite.factory.did';
import { Ed25519KeyIdentity } from '@dfinity/identity';
import type { Principal } from '@dfinity/principal';
import { PocketIc, type Actor } from '@hadronous/pic';
import { type Actor, PocketIc } from '@hadronous/pic';
import { JUNO_AUTH_ERROR_NOT_ADMIN_CONTROLLER } from '@junobuild/errors';
import { afterAll, beforeAll, describe, expect, inject } from 'vitest';
import { ORBITER_CONTROLLER_ERR_MSG } from './constants/orbiter-tests.constants';
import { JUNO_AUTH_ERROR_NOT_ADMIN_CONTROLLER } from './constants/satellite-tests.constants';
import { missionControlUserInitArgs } from './utils/mission-control-tests.utils';
import {
controllersInitArgs,
MISSION_CONTROL_WASM_PATH,
ORBITER_WASM_PATH,
SATELLITE_WASM_PATH,
controllersInitArgs
SATELLITE_WASM_PATH
} from './utils/setup-tests.utils';

describe('Mission Control - Controllers', () => {
Expand Down
10 changes: 5 additions & 5 deletions src/tests/specs/orbiter.spec.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,20 +9,20 @@ import type {
import { idlFactory as idlFactorOrbiter } from '$declarations/orbiter/orbiter.factory.did';
import { Ed25519KeyIdentity } from '@dfinity/identity';
import { fromNullable } from '@dfinity/utils';
import { PocketIc, type Actor } from '@hadronous/pic';
import { nanoid } from 'nanoid';
import { afterAll, beforeAll, describe, expect, inject } from 'vitest';
import { type Actor, PocketIc } from '@hadronous/pic';
import {
JUNO_ERROR_NO_VERSION_PROVIDED,
JUNO_ERROR_VERSION_OUTDATED_OR_FUTURE
} from './constants/satellite-tests.constants';
} from '@junobuild/errors';
import { nanoid } from 'nanoid';
import { afterAll, beforeAll, describe, expect, inject } from 'vitest';
import {
pageViewMock,
performanceMetricMock,
satelliteIdMock,
trackEventMock
} from './mocks/orbiter.mocks';
import { ORBITER_WASM_PATH, controllersInitArgs } from './utils/setup-tests.utils';
import { controllersInitArgs, ORBITER_WASM_PATH } from './utils/setup-tests.utils';

describe('Orbiter', () => {
let pic: PocketIc;
Expand Down
8 changes: 4 additions & 4 deletions src/tests/specs/satellite.auth.spec.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,14 +7,14 @@ import { AnonymousIdentity } from '@dfinity/agent';
import { Ed25519KeyIdentity } from '@dfinity/identity';
import type { Principal } from '@dfinity/principal';
import { toNullable } from '@dfinity/utils';
import { PocketIc, type Actor } from '@hadronous/pic';
import { afterAll, beforeAll, describe, expect, inject } from 'vitest';
import { type Actor, PocketIc } from '@hadronous/pic';
import {
JUNO_AUTH_ERROR_INVALID_ORIGIN,
JUNO_AUTH_ERROR_NOT_ADMIN_CONTROLLER
} from './constants/satellite-tests.constants';
} from '@junobuild/errors';
import { afterAll, beforeAll, describe, expect, inject } from 'vitest';
import { deleteDefaultIndexHTML } from './utils/satellite-tests.utils';
import { SATELLITE_WASM_PATH, controllersInitArgs } from './utils/setup-tests.utils';
import { controllersInitArgs, SATELLITE_WASM_PATH } from './utils/setup-tests.utils';

describe('Satellite > Authentication', () => {
let pic: PocketIc;
Expand Down
6 changes: 3 additions & 3 deletions src/tests/specs/satellite.custom-domains.spec.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,14 +3,14 @@ import { idlFactory as idlFactorSatellite } from '$declarations/satellite/satell
import { AnonymousIdentity } from '@dfinity/agent';
import { Ed25519KeyIdentity } from '@dfinity/identity';
import { toNullable } from '@dfinity/utils';
import { PocketIc, type Actor } from '@hadronous/pic';
import { type Actor, PocketIc } from '@hadronous/pic';
import { JUNO_AUTH_ERROR_NOT_ADMIN_CONTROLLER } from '@junobuild/errors';
import { afterAll, beforeAll, describe, expect, inject } from 'vitest';
import { JUNO_AUTH_ERROR_NOT_ADMIN_CONTROLLER } from './constants/satellite-tests.constants';
import {
adminCustomDomainsTests,
anonymousCustomDomainsTests
} from './utils/custom-domains-tests.utils';
import { SATELLITE_WASM_PATH, controllersInitArgs } from './utils/setup-tests.utils';
import { controllersInitArgs, SATELLITE_WASM_PATH } from './utils/setup-tests.utils';

describe('Satellite custom domains', () => {
let pic: PocketIc;
Expand Down
10 changes: 5 additions & 5 deletions src/tests/specs/satellite.datastore.spec.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,16 +7,16 @@ import type {
import { idlFactory as idlFactorSatellite } from '$declarations/satellite/satellite.factory.did';
import { Ed25519KeyIdentity } from '@dfinity/identity';
import { fromNullable, toNullable } from '@dfinity/utils';
import { PocketIc, type Actor } from '@hadronous/pic';
import { nanoid } from 'nanoid';
import { afterAll, beforeAll, describe, expect, inject } from 'vitest';
import { type Actor, PocketIc } from '@hadronous/pic';
import {
JUNO_ERROR_NO_VERSION_PROVIDED,
JUNO_ERROR_VERSION_OUTDATED_OR_FUTURE
} from './constants/satellite-tests.constants';
} from '@junobuild/errors';
import { nanoid } from 'nanoid';
import { afterAll, beforeAll, describe, expect, inject } from 'vitest';
import { mockData } from './mocks/doc.mocks';
import { createDoc as createDocUtils } from './utils/satellite-doc-tests.utils';
import { SATELLITE_WASM_PATH, controllersInitArgs } from './utils/setup-tests.utils';
import { controllersInitArgs, SATELLITE_WASM_PATH } from './utils/setup-tests.utils';

describe.each([{ memory: { Heap: null } }, { memory: { Stable: null } }])(
'Satellite datastore',
Expand Down
2 changes: 1 addition & 1 deletion src/tests/specs/satellite.max-changes.spec.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,8 @@ import type { Identity } from '@dfinity/agent';
import { Ed25519KeyIdentity } from '@dfinity/identity';
import { fromNullable, nonNullish, toNullable } from '@dfinity/utils';
import { type Actor, PocketIc } from '@hadronous/pic';
import { JUNO_DATASTORE_ERROR_USER_USAGE_CHANGE_LIMIT_REACHED } from '@junobuild/errors';
import { afterAll, beforeAll, describe, expect, inject } from 'vitest';
import { JUNO_DATASTORE_ERROR_USER_USAGE_CHANGE_LIMIT_REACHED } from './constants/satellite-tests.constants';
import { createDoc as createDocUtils } from './utils/satellite-doc-tests.utils';
import { uploadAsset } from './utils/satellite-storage-tests.utils';
import { controllersInitArgs, SATELLITE_WASM_PATH } from './utils/setup-tests.utils';
Expand Down
14 changes: 7 additions & 7 deletions src/tests/specs/satellite.spec.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,19 +2,19 @@ import type { _SERVICE as SatelliteActor, SetRule } from '$declarations/satellit
import { idlFactory as idlFactorSatellite } from '$declarations/satellite/satellite.factory.did';
import { Ed25519KeyIdentity } from '@dfinity/identity';
import { assertNonNullish, fromNullable, toNullable } from '@dfinity/utils';
import { PocketIc, type Actor } from '@hadronous/pic';
import { parse } from '@ltd/j-toml';
import { readFileSync } from 'node:fs';
import { join } from 'node:path';
import { afterAll, beforeAll, describe, expect, inject } from 'vitest';
import { type Actor, PocketIc } from '@hadronous/pic';
import {
JUNO_AUTH_ERROR_NOT_ADMIN_CONTROLLER,
JUNO_AUTH_ERROR_NOT_CONTROLLER,
JUNO_ERROR_NO_VERSION_PROVIDED,
JUNO_ERROR_VERSION_OUTDATED_OR_FUTURE,
JUNO_STORAGE_ERROR_UPLOAD_NOT_ALLOWED
} from './constants/satellite-tests.constants';
import { SATELLITE_WASM_PATH, controllersInitArgs } from './utils/setup-tests.utils';
} from '@junobuild/errors';
import { parse } from '@ltd/j-toml';
import { readFileSync } from 'node:fs';
import { join } from 'node:path';
import { afterAll, beforeAll, describe, expect, inject } from 'vitest';
import { controllersInitArgs, SATELLITE_WASM_PATH } from './utils/setup-tests.utils';

describe('Satellite', () => {
let pic: PocketIc;
Expand Down
14 changes: 7 additions & 7 deletions src/tests/specs/satellite.storage.spec.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,21 +10,21 @@ import { AnonymousIdentity } from '@dfinity/agent';
import { Ed25519KeyIdentity } from '@dfinity/identity';
import type { Principal } from '@dfinity/principal';
import { arrayBufferToUint8Array, fromNullable, toNullable } from '@dfinity/utils';
import { PocketIc, type Actor } from '@hadronous/pic';
import { toArray } from '@junobuild/utils';
import { readFileSync } from 'node:fs';
import { join } from 'node:path';
import { afterAll, beforeAll, beforeEach, describe, expect, inject } from 'vitest';
import { type Actor, PocketIc } from '@hadronous/pic';
import {
JUNO_AUTH_ERROR_NOT_ADMIN_CONTROLLER,
JUNO_AUTH_ERROR_NOT_CONTROLLER,
JUNO_STORAGE_ERROR_CANNOT_COMMIT_BATCH
} from './constants/satellite-tests.constants';
} from '@junobuild/errors';
import { toArray } from '@junobuild/utils';
import { readFileSync } from 'node:fs';
import { join } from 'node:path';
import { afterAll, beforeAll, beforeEach, describe, expect, inject } from 'vitest';
import { mockBlob, mockHtml } from './mocks/storage.mocks';
import { assertCertification } from './utils/certification-test.utils';
import { uploadAsset } from './utils/satellite-storage-tests.utils';
import { deleteDefaultIndexHTML } from './utils/satellite-tests.utils';
import { SATELLITE_WASM_PATH, controllersInitArgs } from './utils/setup-tests.utils';
import { controllersInitArgs, SATELLITE_WASM_PATH } from './utils/setup-tests.utils';

describe('Satellite storage', () => {
let pic: PocketIc;
Expand Down
8 changes: 4 additions & 4 deletions src/tests/specs/satellite.user-ban.spec.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,13 +9,13 @@ import { type Identity } from '@dfinity/agent';
import { Ed25519KeyIdentity } from '@dfinity/identity';
import { fromNullable, toNullable } from '@dfinity/utils';
import { type Actor, PocketIc } from '@hadronous/pic';
import { fromArray, toArray } from '@junobuild/utils';
import { nanoid } from 'nanoid';
import { beforeAll, describe, expect, inject } from 'vitest';
import {
JUNO_DATASTORE_ERROR_USER_INVALID_DATA,
JUNO_DATASTORE_ERROR_USER_NOT_ALLOWED
} from './constants/satellite-tests.constants';
} from '@junobuild/errors';
import { fromArray, toArray } from '@junobuild/utils';
import { nanoid } from 'nanoid';
import { beforeAll, describe, expect, inject } from 'vitest';
import { mockSetRule } from './mocks/collection.mocks';
import { mockListParams } from './mocks/list.mocks';
import { uploadAsset } from './utils/satellite-storage-tests.utils';
Expand Down
8 changes: 4 additions & 4 deletions src/tests/specs/satellite.user-usage.spec.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,13 +13,13 @@ import { Ed25519KeyIdentity } from '@dfinity/identity';
import type { Principal } from '@dfinity/principal';
import { assertNonNullish, fromNullable, isNullish, toNullable } from '@dfinity/utils';
import { type Actor, PocketIc } from '@hadronous/pic';
import { fromArray, toArray } from '@junobuild/utils';
import { nanoid } from 'nanoid';
import { beforeAll, describe, expect, inject } from 'vitest';
import {
JUNO_DATASTORE_ERROR_CANNOT_WRITE,
JUNO_DATASTORE_ERROR_USER_USAGE_INVALID_DATA
} from './constants/satellite-tests.constants';
} from '@junobuild/errors';
import { fromArray, toArray } from '@junobuild/utils';
import { nanoid } from 'nanoid';
import { beforeAll, describe, expect, inject } from 'vitest';
import { mockData } from './mocks/doc.mocks';
import { tick } from './utils/pic-tests.utils';
import { createDoc as createDocUtils } from './utils/satellite-doc-tests.utils';
Expand Down
10 changes: 5 additions & 5 deletions src/tests/specs/satellite.user.spec.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,18 +3,18 @@ import { idlFactory as idlFactorSatellite } from '$declarations/satellite/satell
import { AnonymousIdentity, type Identity } from '@dfinity/agent';
import { Ed25519KeyIdentity } from '@dfinity/identity';
import { fromNullable, toNullable } from '@dfinity/utils';
import { PocketIc, type Actor } from '@hadronous/pic';
import { toArray } from '@junobuild/utils';
import { afterAll, beforeAll, describe, expect, inject } from 'vitest';
import { type Actor, PocketIc } from '@hadronous/pic';
import {
JUNO_DATASTORE_ERROR_CANNOT_WRITE,
JUNO_DATASTORE_ERROR_USER_CALLER_KEY,
JUNO_DATASTORE_ERROR_USER_CANNOT_UPDATE,
JUNO_DATASTORE_ERROR_USER_INVALID_DATA,
JUNO_DATASTORE_ERROR_USER_KEY_NO_PRINCIPAL,
JUNO_DATASTORE_ERROR_USER_NOT_ALLOWED
} from './constants/satellite-tests.constants';
import { SATELLITE_WASM_PATH, controllersInitArgs } from './utils/setup-tests.utils';
} from '@junobuild/errors';
import { toArray } from '@junobuild/utils';
import { afterAll, beforeAll, describe, expect, inject } from 'vitest';
import { controllersInitArgs, SATELLITE_WASM_PATH } from './utils/setup-tests.utils';

describe('Satellite > User', () => {
let pic: PocketIc;
Expand Down