Skip to content

Commit 53a0457

Browse files
committed
test: fixed tests as requested
1 parent 8f2e392 commit 53a0457

File tree

2 files changed

+15
-35
lines changed

2 files changed

+15
-35
lines changed

__test__/entry-editable.test.ts

Lines changed: 2 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
import { addTags } from '../src/entry-editable'
2-
import { entry_global_field, entry_global_field_multiple, entry_modular_block, entry_reference, entry_with_text, entry_with_applied_variants, entry_with_system_variants, entry_with_parent_path_variants } from './mock/entry-editable-mock'
2+
import { entry_global_field, entry_global_field_multiple, entry_modular_block, entry_reference, entry_with_text, entry_with_applied_variants, entry_with_parent_path_variants } from './mock/entry-editable-mock'
33

44
describe('Entry editable test', () => {
55
it('Entry with text test', done => {
@@ -134,7 +134,6 @@ describe('Entry editable test', () => {
134134

135135
// Field with direct variant match should get v2 prefix and variant suffix
136136
expect((entry_with_applied_variants as any)['$']['rich_text_editor']).toEqual('data-cslp=v2:entry_asset.entry_uid_1_variant_1.en-us.rich_text_editor')
137-
expect((entry_with_applied_variants as any)['$']['rich_text_editor_multiple']).toEqual('data-cslp=v2:entry_asset.entry_uid_1_variant_1.en-us.rich_text_editor_multiple')
138137

139138
// Nested field with direct variant match
140139
expect((entry_with_applied_variants as any)['nested']['$']['field']).toEqual('data-cslp=v2:entry_asset.entry_uid_1_variant_2.en-us.nested.field')
@@ -150,7 +149,6 @@ describe('Entry editable test', () => {
150149

151150
// Field with direct variant match should get v2 prefix and variant suffix as object
152151
expect((entry_with_applied_variants as any)['$']['rich_text_editor']).toEqual({'data-cslp': 'v2:entry_asset.entry_uid_1_variant_1.en-us.rich_text_editor'})
153-
expect((entry_with_applied_variants as any)['$']['rich_text_editor_multiple']).toEqual({'data-cslp': 'v2:entry_asset.entry_uid_1_variant_1.en-us.rich_text_editor_multiple'})
154152

155153
// Nested field with direct variant match
156154
expect((entry_with_applied_variants as any)['nested']['$']['field']).toEqual({'data-cslp': 'v2:entry_asset.entry_uid_1_variant_2.en-us.nested.field'})
@@ -161,16 +159,6 @@ describe('Entry editable test', () => {
161159
done()
162160
})
163161

164-
it('Entry with system-level applied variants should work correctly', done => {
165-
addTags(entry_with_system_variants, 'entry_asset', false)
166-
167-
// Fields with system variants should get v2 prefix and variant suffix
168-
expect((entry_with_system_variants as any)['$']['title']).toEqual('data-cslp=v2:entry_asset.entry_uid_2_system_variant.en-us.title')
169-
expect((entry_with_system_variants as any)['$']['description']).toEqual('data-cslp=v2:entry_asset.entry_uid_2_desc_variant.en-us.description')
170-
171-
done()
172-
})
173-
174162
it('Entry with parent path variants should find correct variant', done => {
175163
addTags(entry_with_parent_path_variants, 'entry_asset', false)
176164

@@ -191,9 +179,8 @@ describe('Entry editable test', () => {
191179

192180
// Modular block content with variant should get v2 prefix and variant suffix
193181
expect((entry_with_applied_variants as any)['modular_blocks'][0]['$']['content']).toEqual('data-cslp=v2:entry_asset.entry_uid_1_variant_3.en-us.modular_blocks.0.content')
194-
195182
// Modular block field without variant should not have v2 prefix
196-
expect((entry_with_applied_variants as any)['modular_blocks'][0]['$']['title']).toEqual('data-cslp=entry_asset.entry_uid_1.en-us.modular_blocks.0.title')
183+
expect((entry_with_applied_variants as any)['modular_blocks'][0]['content']['$']['title']).toEqual('data-cslp=v2:entry_asset.entry_uid_1_variant_3.en-us.modular_blocks.0.content.title')
197184

198185
done()
199186
})

__test__/mock/entry-editable-mock.ts

Lines changed: 13 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -171,27 +171,13 @@ const entry_with_applied_variants = {
171171
},
172172
"modular_blocks": [
173173
{
174-
"content": "modular content",
175-
"title": "modular title"
174+
"content": {
175+
"title": "modular title"
176+
}
176177
}
177178
]
178179
}
179180

180-
// Mock entry with system-level applied variants
181-
const entry_with_system_variants = {
182-
"_version": 10,
183-
"locale": "en-us",
184-
"uid": "entry_uid_2",
185-
"ACL": {},
186-
"system": {
187-
"applied_variants": {
188-
"title": "system_variant",
189-
"description": "desc_variant"
190-
}
191-
},
192-
"title": "System variant title",
193-
"description": "System variant description"
194-
}
195181

196182
// Mock entry with nested parent path variants
197183
const entry_with_parent_path_variants = {
@@ -201,7 +187,8 @@ const entry_with_parent_path_variants = {
201187
"ACL": {},
202188
"_applied_variants": {
203189
"group": "parent_variant",
204-
"group.nested.deep": "deep_variant"
190+
"group.nested.deep": "deep_variant",
191+
"modular_blocks.content": "parent_variant"
205192
},
206193
"group": {
207194
"nested": {
@@ -211,7 +198,14 @@ const entry_with_parent_path_variants = {
211198
}
212199
},
213200
"other": "other field"
214-
}
201+
},
202+
"modular_blocks": [
203+
{
204+
"content": {
205+
"title": "modular title"
206+
}
207+
}
208+
]
215209
}
216210

217211
export {
@@ -221,6 +215,5 @@ export {
221215
entry_modular_block,
222216
entry_global_field_multiple,
223217
entry_with_applied_variants,
224-
entry_with_system_variants,
225218
entry_with_parent_path_variants
226219
}

0 commit comments

Comments
 (0)