Skip to content

Commit c847a8b

Browse files
committed
fix: invalid custom list type for variable
1 parent 82a513f commit c847a8b

File tree

2 files changed

+18
-25
lines changed

2 files changed

+18
-25
lines changed

src/test/patches/pgsql_hacker_helper.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@
4747
{
4848
"type": "CustomListElement *",
4949
"parent": "CustomListVariable",
50-
"member": "custom_list"
50+
"member": "value"
5151
}
5252
]
5353
}

src/test/suite/variables.test.ts

Lines changed: 17 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -555,31 +555,24 @@ suite('Variables', async function () {
555555
suite('Config file', async () => {
556556
/* List with Non-Node pointer array elements */
557557
test('List[CustomPtr]', async () => {
558-
/* list = [{value: 1}, {value: 2}, {value: 3}] */
559-
560-
/* Check variable */
561-
let elementsMember = await getMemberOf(getVar('custom_list'), '$elements$');
562-
const elements = await expand(elementsMember);
563-
assert.equal(elements.length, 3,
564-
'$elements$ of variable does not contains all list members');
565-
566-
for (const [i, element] of elements.entries()) {
567-
const valueMember = await getMemberOf(element, 'value');
568-
assert.match(valueMember.item.description, intRegexp(i + 1),
569-
`Element at ${i} does not contain valid value for variable`);
570-
}
571-
572-
/* Check member */
573-
const valueMember = await getMemberOf(getVar('custom_list_variable'), 'value');
574-
elementsMember = await getMemberOf(valueMember, '$elements$');
575-
assert.equal(elements.length, 3,
576-
'$elements$ of member does not contains all list members');
558+
const checkListMembers = async (listVar: vars.Variable) => {
559+
const elementsMember = await getMemberOf(listVar, '$elements$');
560+
const elements = await expand(elementsMember);
561+
assert.equal(elements.length, 3,
562+
'$elements$ of variable does not contains all list members');
563+
564+
/* list = [{value: 1}, {value: 2}, {value: 3}] */
565+
for (const [i, element] of elements.entries()) {
566+
const valueMember = await getMemberOf(element, 'value');
567+
assert.match(valueMember.item.description, intRegexp(i + 1),
568+
`Element at ${i} does not contain valid value for variable`);
569+
}
570+
};
577571

578-
for (const [i, element] of elements.entries()) {
579-
const valueMember = await getMemberOf(element, 'value');
580-
assert.match(valueMember.item.description, intRegexp(i + 1),
581-
`Element at ${i} does not contain valid value for member`);
582-
}
572+
/* variable */
573+
await checkListMembers(getVar('custom_list'));
574+
/* member */
575+
await checkListMembers((await getMemberOf(getVar('custom_list_variable'), 'value')).var);
583576
});
584577

585578
/* Array members are rendered as actual array */

0 commit comments

Comments
 (0)