Skip to content

Commit 0608e83

Browse files
jasonvargajasonvarga
committed
Merge branch 'master' into vitest
# Conflicts: # resources/js/tests/FieldConditionsValidator.test.js # resources/js/tests/Globals.test.js # resources/js/tests/NormalizeInputOptions.test.js # resources/js/tests/Slug.test.js
2 parents c290e34 + c560d46 commit 0608e83

11 files changed

+637
-556
lines changed

‎.git-blame-ignore-revs‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,4 @@
11
# Apply Prettier
22
95ff14ba8923d6979d592b20a0209e81171c2019
3+
# Apply Prettier to JS tests
4+
abf6421a543429ccef3bf0da2f66f0db0e196540

‎.prettierignore‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ vendor/
44
/vendor
55
.git
66
**/.git
7-
tests
7+
/tests
88
package-lock.json
99
composer.lock
1010
src/View/Debugbar/AntlersProfiler/resources/chart.js

‎resources/js/tests/FieldConditionsConverter.test.js‎

Lines changed: 48 additions & 36 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ import { test, expect } from 'vitest';
22
import Converter from '../components/field-conditions/Converter.js';
33
global._ = require('underscore');
44

5-
const FieldConditionsConverter = new Converter;
5+
const FieldConditionsConverter = new Converter();
66

77
test('it converts from blueprint format', () => {
88
let converted = FieldConditionsConverter.fromBlueprint({
@@ -12,95 +12,107 @@ test('it converts from blueprint format', () => {
1212
});
1313

1414
let expected = [
15-
{field: 'name', operator: 'not', value: 'joe'},
16-
{field: 'age', operator: 'equals', value: '13'},
17-
{field: 'email', operator: 'equals', value: 'san@holo.com'}
15+
{ field: 'name', operator: 'not', value: 'joe' },
16+
{ field: 'age', operator: 'equals', value: '13' },
17+
{ field: 'email', operator: 'equals', value: 'san@holo.com' },
1818
];
1919

2020
expect(converted).toEqual(expected);
2121
});
2222

2323
test('it converts from blueprint format and applies prefixes', () => {
24-
let converted = FieldConditionsConverter.fromBlueprint({
25-
name: 'isnt joe',
26-
age: 13,
27-
email: 'equals san@holo.com',
28-
}, 'nested_');
24+
let converted = FieldConditionsConverter.fromBlueprint(
25+
{
26+
name: 'isnt joe',
27+
age: 13,
28+
email: 'equals san@holo.com',
29+
},
30+
'nested_',
31+
);
2932

3033
let expected = [
31-
{field: 'nested_name', operator: 'not', value: 'joe'},
32-
{field: 'nested_age', operator: 'equals', value: '13'},
33-
{field: 'nested_email', operator: 'equals', value: 'san@holo.com'}
34+
{ field: 'nested_name', operator: 'not', value: 'joe' },
35+
{ field: 'nested_age', operator: 'equals', value: '13' },
36+
{ field: 'nested_email', operator: 'equals', value: 'san@holo.com' },
3437
];
3538

3639
expect(converted).toEqual(expected);
3740
});
3841

3942
test('it converts from blueprint format and does not apply prefix to field conditions with root syntax', () => {
40-
let converted = FieldConditionsConverter.fromBlueprint({
41-
'name': 'isnt joe',
42-
'$root.title': 'not empty',
43-
}, 'nested_');
43+
let converted = FieldConditionsConverter.fromBlueprint(
44+
{
45+
name: 'isnt joe',
46+
'$root.title': 'not empty',
47+
},
48+
'nested_',
49+
);
4450

4551
let expected = [
46-
{field: 'nested_name', operator: 'not', value: 'joe'},
47-
{field: '$root.title', operator: 'not', value: 'empty'}
52+
{ field: 'nested_name', operator: 'not', value: 'joe' },
53+
{ field: '$root.title', operator: 'not', value: 'empty' },
4854
];
4955

5056
expect(converted).toEqual(expected);
5157
});
5258

5359
test('it converts from blueprint format and does not apply prefix to field conditions with legacy root syntax for backwards compatibility', () => {
54-
let converted = FieldConditionsConverter.fromBlueprint({
55-
'name': 'isnt joe',
56-
'root.title': 'not empty',
57-
}, 'nested_');
60+
let converted = FieldConditionsConverter.fromBlueprint(
61+
{
62+
name: 'isnt joe',
63+
'root.title': 'not empty',
64+
},
65+
'nested_',
66+
);
5867

5968
let expected = [
60-
{field: 'nested_name', operator: 'not', value: 'joe'},
61-
{field: 'root.title', operator: 'not', value: 'empty'}
69+
{ field: 'nested_name', operator: 'not', value: 'joe' },
70+
{ field: 'root.title', operator: 'not', value: 'empty' },
6271
];
6372

6473
expect(converted).toEqual(expected);
6574
});
6675

6776
test('it converts from blueprint format and does not apply prefix to field conditions with parent syntax', () => {
68-
let converted = FieldConditionsConverter.fromBlueprint({
69-
'name': 'isnt joe',
70-
'$parent.title': 'not empty',
71-
}, 'nested_');
77+
let converted = FieldConditionsConverter.fromBlueprint(
78+
{
79+
name: 'isnt joe',
80+
'$parent.title': 'not empty',
81+
},
82+
'nested_',
83+
);
7284

7385
let expected = [
74-
{field: 'nested_name', operator: 'not', value: 'joe'},
75-
{field: '$parent.title', operator: 'not', value: 'empty'}
86+
{ field: 'nested_name', operator: 'not', value: 'joe' },
87+
{ field: '$parent.title', operator: 'not', value: 'empty' },
7688
];
7789

7890
expect(converted).toEqual(expected);
7991
});
8092

8193
test('it converts to blueprint format', () => {
8294
let converted = FieldConditionsConverter.toBlueprint([
83-
{field: 'name', operator: 'isnt', value: 'joe'},
84-
{field: 'age', operator: '==', value: '13'}
95+
{ field: 'name', operator: 'isnt', value: 'joe' },
96+
{ field: 'age', operator: '==', value: '13' },
8597
]);
8698

8799
let expected = {
88100
name: 'isnt joe',
89-
age: '== 13'
101+
age: '== 13',
90102
};
91103

92104
expect(converted).toEqual(expected);
93105
});
94106

95107
test('it converts and trims properly with empty operators', () => {
96108
let converted = FieldConditionsConverter.toBlueprint([
97-
{field: 'name', operator: '', value: 'joe'},
98-
{field: 'age', operator: null, value: '13'}
109+
{ field: 'name', operator: '', value: 'joe' },
110+
{ field: 'age', operator: null, value: '13' },
99111
]);
100112

101113
let expected = {
102114
name: 'joe',
103-
age: '13'
115+
age: '13',
104116
};
105117

106118
expect(converted).toEqual(expected);

‎resources/js/tests/FieldConditionsParentResolver.test.js‎

Lines changed: 22 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ import ParentResolver from '../components/field-conditions/ParentResolver.js';
33

44
let resolve = function (currentFieldPath, pathWithParent) {
55
return new ParentResolver(currentFieldPath).resolve(pathWithParent);
6-
}
6+
};
77

88
test('it resolves from group to top level', () => {
99
expect(resolve('group.field', '$parent.name')).toEqual('$root.name');
@@ -59,11 +59,25 @@ test('it resolves from deeply nested mix of everything all the way up to top lev
5959
let fromField = 'group.replicator.1.group.bard.4.grid.0.group.group.replicator.6.field';
6060

6161
expect(resolve(fromField, '$parent.name')).toEqual('$root.group.replicator.1.group.bard.4.grid.0.group.group.name');
62-
expect(resolve(fromField, '$parent.$parent.name')).toEqual('$root.group.replicator.1.group.bard.4.grid.0.group.name');
63-
expect(resolve(fromField, '$parent.$parent.$parent.name')).toEqual('$root.group.replicator.1.group.bard.4.grid.0.name');
64-
expect(resolve(fromField, '$parent.$parent.$parent.$parent.name')).toEqual('$root.group.replicator.1.group.bard.4.name');
65-
expect(resolve(fromField, '$parent.$parent.$parent.$parent.$parent.name')).toEqual('$root.group.replicator.1.group.name');
66-
expect(resolve(fromField, '$parent.$parent.$parent.$parent.$parent.$parent.name')).toEqual('$root.group.replicator.1.name');
67-
expect(resolve(fromField, '$parent.$parent.$parent.$parent.$parent.$parent.$parent.name')).toEqual('$root.group.name');
68-
expect(resolve(fromField, '$parent.$parent.$parent.$parent.$parent.$parent.$parent.$parent.name')).toEqual('$root.name');
62+
expect(resolve(fromField, '$parent.$parent.name')).toEqual(
63+
'$root.group.replicator.1.group.bard.4.grid.0.group.name',
64+
);
65+
expect(resolve(fromField, '$parent.$parent.$parent.name')).toEqual(
66+
'$root.group.replicator.1.group.bard.4.grid.0.name',
67+
);
68+
expect(resolve(fromField, '$parent.$parent.$parent.$parent.name')).toEqual(
69+
'$root.group.replicator.1.group.bard.4.name',
70+
);
71+
expect(resolve(fromField, '$parent.$parent.$parent.$parent.$parent.name')).toEqual(
72+
'$root.group.replicator.1.group.name',
73+
);
74+
expect(resolve(fromField, '$parent.$parent.$parent.$parent.$parent.$parent.name')).toEqual(
75+
'$root.group.replicator.1.name',
76+
);
77+
expect(resolve(fromField, '$parent.$parent.$parent.$parent.$parent.$parent.$parent.name')).toEqual(
78+
'$root.group.name',
79+
);
80+
expect(resolve(fromField, '$parent.$parent.$parent.$parent.$parent.$parent.$parent.$parent.name')).toEqual(
81+
'$root.name',
82+
);
6983
});

0 commit comments

Comments
 (0)