Skip to content

Commit

Permalink
Merge branch 'master' into build/optimize-deps
Browse files Browse the repository at this point in the history
  • Loading branch information
noomorph authored Oct 27, 2023
2 parents dcff4c5 + 5352f50 commit e1e5cdc
Show file tree
Hide file tree
Showing 12 changed files with 74 additions and 46 deletions.
6 changes: 3 additions & 3 deletions e2e/__fixtures__/27.x.x/env-1/hook-nesting.json
Original file line number Diff line number Diff line change
Expand Up @@ -141,7 +141,7 @@
"labels"
],
"value": [
"flaky"
"sanity"
],
"operation": "push"
},
Expand All @@ -154,9 +154,9 @@
"labels"
],
"value": [
"sanity"
"flaky"
],
"operation": "push"
"operation": "unshift"
},
{
"type": "finish_describe_definition",
Expand Down
6 changes: 3 additions & 3 deletions e2e/__fixtures__/27.x.x/env-N/hook-nesting.json
Original file line number Diff line number Diff line change
Expand Up @@ -141,7 +141,7 @@
"labels"
],
"value": [
"flaky"
"sanity"
],
"operation": "push"
},
Expand All @@ -154,9 +154,9 @@
"labels"
],
"value": [
"sanity"
"flaky"
],
"operation": "push"
"operation": "unshift"
},
{
"type": "finish_describe_definition",
Expand Down
6 changes: 3 additions & 3 deletions e2e/__fixtures__/28.x.x/env-1/hook-nesting.json
Original file line number Diff line number Diff line change
Expand Up @@ -141,7 +141,7 @@
"labels"
],
"value": [
"flaky"
"sanity"
],
"operation": "push"
},
Expand All @@ -154,9 +154,9 @@
"labels"
],
"value": [
"sanity"
"flaky"
],
"operation": "push"
"operation": "unshift"
},
{
"type": "finish_describe_definition",
Expand Down
6 changes: 3 additions & 3 deletions e2e/__fixtures__/28.x.x/env-N/hook-nesting.json
Original file line number Diff line number Diff line change
Expand Up @@ -141,7 +141,7 @@
"labels"
],
"value": [
"flaky"
"sanity"
],
"operation": "push"
},
Expand All @@ -154,9 +154,9 @@
"labels"
],
"value": [
"sanity"
"flaky"
],
"operation": "push"
"operation": "unshift"
},
{
"type": "finish_describe_definition",
Expand Down
6 changes: 3 additions & 3 deletions e2e/__fixtures__/29.x.x/env-1/hook-nesting.json
Original file line number Diff line number Diff line change
Expand Up @@ -141,7 +141,7 @@
"labels"
],
"value": [
"flaky"
"sanity"
],
"operation": "push"
},
Expand All @@ -154,9 +154,9 @@
"labels"
],
"value": [
"sanity"
"flaky"
],
"operation": "push"
"operation": "unshift"
},
{
"type": "finish_describe_definition",
Expand Down
6 changes: 3 additions & 3 deletions e2e/__fixtures__/29.x.x/env-N/hook-nesting.json
Original file line number Diff line number Diff line change
Expand Up @@ -141,7 +141,7 @@
"labels"
],
"value": [
"flaky"
"sanity"
],
"operation": "push"
},
Expand All @@ -154,9 +154,9 @@
"labels"
],
"value": [
"sanity"
"flaky"
],
"operation": "push"
"operation": "unshift"
},
{
"type": "finish_describe_definition",
Expand Down
6 changes: 3 additions & 3 deletions e2e/__tests__/default/hook-nesting.js
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
const { metadata, $Assign, $Push, $Set, $Merge } = require('jest-metadata');
const { metadata, $Assign, $Push, $Set, $Merge, $Unshift } = require('jest-metadata');

let now = 1672524000000;

Expand All @@ -16,7 +16,7 @@ const $Description = (text) => $Set('vendor.description', text);
const $Maintainer = (name, email) => $Assign('vendor.maintainer', { name, email });
const $Lead = (name, email) => $Merge('vendor.lead', { name, email });
const $Tag = (value) => $Push(['vendor', 'labels'], value);
const $Flaky = () => $Tag('flaky');
const $Flaky = () => $Unshift(['vendor', 'labels'], 'flaky');

const step = (text) => metadata.push('vendor.steps', [{ text, startedAt: now }]);

Expand Down Expand Up @@ -55,8 +55,8 @@ describe('Login flow', () => {
step('Assert that the login failed');
});

$Flaky();
$Tag('sanity');
$Flaky();
test('Happy scenario', () => {
step('Enter valid credentials');
actions.sleep(100);
Expand Down
7 changes: 7 additions & 0 deletions src/index.ts
Original file line number Diff line number Diff line change
Expand Up @@ -40,6 +40,13 @@ export const $Set = realm.metadataDSL.$Set;
*/
export const $Push = realm.metadataDSL.$Push;

/**
* Pseudo-annotation that allows to associate metadata with a test block.
* It is not an ECMAScript decorator, but it behaves similarly.
* Use it to prepend a value to an array in metadata.
*/
export const $Unshift = realm.metadataDSL.$Unshift;

/**
* Pseudo-annotation that allows to associate metadata with a test block.
* It is not an ECMAScript decorator, but it behaves similarly.
Expand Down
58 changes: 34 additions & 24 deletions src/metadata/containers/BaseMetadata.ts
Original file line number Diff line number Diff line change
Expand Up @@ -51,31 +51,11 @@ export abstract class BaseMetadata implements Metadata {
}

push(path: string | readonly string[], values: unknown[]): this {
this.#assertPath(path, 'push to');
if (!Array.isArray(values)) {
throw new TypeError(`Cannot push a non-array value to path "${path}". Received: ${values}`);
}

const array = lodashGet(this[symbols.data], path, [] as unknown[]);
if (!Array.isArray(array)) {
throw new TypeError(
`Cannot push to path "${path}", because it is not an array, but: ${array}`,
);
}

array.push(...values);
this.#set(path, array);

this[symbols.context].emitter.emit({
type: 'write_metadata',
testFilePath: this[symbols.id].testFilePath,
targetId: this[symbols.id].identifier,
path,
value: values,
operation: 'push',
});
return this.#concat('push', path, values);
}

return this;
unshift(path: string | readonly string[], values: unknown[]): this {
return this.#concat('unshift', path, values);
}

assign(path: undefined | string | readonly string[], value: object): this {
Expand Down Expand Up @@ -131,4 +111,34 @@ export abstract class BaseMetadata implements Metadata {
throw new TypeError(`Cannot ${operationName} metadata without a path`);
}
}

#concat(operation: 'push' | 'unshift', path: string | readonly string[], values: unknown[]) {
this.#assertPath(path, `${operation} to`);
if (!Array.isArray(values)) {
throw new TypeError(
`Cannot ${operation} a non-array value to path "${path}". Received: ${values}`,
);
}

const array = lodashGet(this[symbols.data], path, [] as unknown[]);
if (!Array.isArray(array)) {
throw new TypeError(
`Cannot ${operation} to path "${path}", because it is not an array, but: ${array}`,
);
}

array[operation](...values);
this.#set(path, array);

this[symbols.context].emitter.emit({
type: 'write_metadata',
testFilePath: this[symbols.id].testFilePath,
targetId: this[symbols.id].identifier,
path,
value: values,
operation,
});

return this;
}
}
10 changes: 10 additions & 0 deletions src/metadata/dsl/MetadataDSL.ts
Original file line number Diff line number Diff line change
Expand Up @@ -56,6 +56,16 @@ export class MetadataDSL {
});
};

$Unshift = (path: string | readonly string[], ...values: unknown[]): void => {
this.#assertPath(path);
this.#assertValues(values);

this.schedule(() => {
const metadata = this.#metadata();
metadata.unshift(path, values);
});
};

$Assign = (path: string | readonly string[] | undefined, value: Data): void => {
this.#assertPath(path);
this.#assertValue(value);
Expand Down
2 changes: 1 addition & 1 deletion src/metadata/events/WriteMetadataEvent.ts
Original file line number Diff line number Diff line change
Expand Up @@ -4,5 +4,5 @@ export type WriteMetadataEvent = {
targetId: string; // instance ID
path?: string | readonly string[];
value: unknown;
operation: 'set' | 'assign' | 'merge' | 'push';
operation: 'set' | 'assign' | 'merge' | 'push' | 'unshift';
};
1 change: 1 addition & 0 deletions src/metadata/types/Metadata.ts
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@ export interface Metadata {
get<T>(path?: string | readonly string[], fallbackValue?: T): T;
set(path: string | readonly string[], value: unknown): this;
push(path: string | readonly string[], values: unknown[]): this;
unshift(path: string | readonly string[], values: unknown[]): this;
assign(path: undefined | string | readonly string[], value: Data): this;
merge(path: undefined | string | readonly string[], value: Data): this;
}
Expand Down

0 comments on commit e1e5cdc

Please sign in to comment.