Skip to content

Commit 687e682

Browse files
author
Michael Yu
committed
MC-518: Simplify mapping of content type
- Fixed integration test with removal of data-element in the configuration
1 parent 635c4f3 commit 687e682

File tree

2 files changed

+10
-74
lines changed

2 files changed

+10
-74
lines changed

dev/tests/integration/testsuite/Magento/PageBuilder/_files/content_type/expected_merged_array.php

Lines changed: 10 additions & 66 deletions
Original file line numberDiff line numberDiff line change
@@ -66,14 +66,6 @@
6666
],
6767
'attributes' => [
6868
0 => [
69-
'var' => 'element',
70-
'name' => 'data-element',
71-
'virtual' => null,
72-
'converter' => null,
73-
'persist' => null,
74-
'preview_converter' => null
75-
],
76-
1 => [
7769
'var' => 'name',
7870
'name' => 'data-role',
7971
'virtual' => null,
@@ -335,61 +327,53 @@
335327
],
336328
'attributes' => [
337329
0 => [
338-
'var' => 'element',
339-
'name' => 'data-element',
340-
'virtual' => null,
341-
'converter' => null,
342-
'persist' => null,
343-
'preview_converter' => null
344-
],
345-
1 => [
346330
'var' => 'name',
347331
'name' => 'data-role',
348332
'virtual' => null,
349333
'converter' => null,
350334
'persist' => null,
351335
'preview_converter' => null
352336
],
353-
2 => [
337+
1 => [
354338
'var' => 'attribute_change',
355339
'name' => 'data-custom',
356340
'virtual' => 'false',
357341
'converter' => 'Path/to/custom/converter',
358342
'persist' => 'true',
359343
'preview_converter' => 'Path/to/preview/custom/converter'
360344
],
361-
3 => [
345+
2 => [
362346
'var' => 'attribute_add',
363347
'name' => 'attribute_add',
364348
'virtual' => 'false',
365349
'converter' => 'Path/to/custom/converter',
366350
'persist' => 'true',
367351
'preview_converter' => 'Path/to/preview/custom/converter'
368352
],
369-
4 => [
353+
3 => [
370354
'var' => 'new_attribute',
371355
'name' => 'data-new',
372356
'virtual' => 'true',
373357
'converter' => 'Path/to/custom/converter',
374358
'persist' => 'false',
375359
'preview_converter' => 'Path/to/preview/custom/converter'
376360
],
377-
5 => [
361+
4 => [
378362
'name' => 'original_static',
379363
'value' => 'original_value',
380364
'static' => true
381365
],
382-
6 => [
366+
5 => [
383367
'name' => 'static_attribute_change',
384368
'value' => 'custom_value',
385369
'static' => true
386370
],
387-
7 => [
371+
6 => [
388372
'name' => 'new_static',
389373
'value' => 'new-value',
390374
'static' => true
391375
],
392-
8 => [
376+
7 => [
393377
'var' => 'original_complex',
394378
'reader' => 'Path/to/reader',
395379
'converter' => null,
@@ -398,7 +382,7 @@
398382
'complex' => true,
399383
'persist' => null
400384
],
401-
9 => [
385+
8 => [
402386
'var' => 'complex_style_attributes_change',
403387
'reader' => 'Path/to/custom/reader',
404388
'converter' => 'Path/to/custom/converter',
@@ -407,7 +391,7 @@
407391
'complex' => true,
408392
'persist' => null
409393
],
410-
10 => [
394+
9 => [
411395
'var' => 'complex_style_attributes_add',
412396
'reader' => 'Path/to/custom/reader',
413397
'converter' => 'Path/to/custom/converter',
@@ -416,7 +400,7 @@
416400
'complex' => true,
417401
'persist' => null
418402
],
419-
11 => [
403+
10 => [
420404
'var' => 'new_complex',
421405
'reader' => 'Path/to/reader',
422406
'converter' => null,
@@ -458,14 +442,6 @@
458442
],
459443
'attributes' => [
460444
0 => [
461-
'var' => 'element',
462-
'name' => 'data-element',
463-
'virtual' => null,
464-
'converter' => null,
465-
'persist' => null,
466-
'preview_converter' => null
467-
],
468-
1 => [
469445
'var' => 'name',
470446
'name' => 'data-role',
471447
'virtual' => null,
@@ -496,14 +472,6 @@
496472
],
497473
'attributes' => [
498474
0 => [
499-
'var' => 'element',
500-
'name' => 'data-element',
501-
'virtual' => null,
502-
'converter' => null,
503-
'persist' => null,
504-
'preview_converter' => null
505-
],
506-
1 => [
507475
'var' => 'name',
508476
'name' => 'data-role',
509477
'virtual' => null,
@@ -579,14 +547,6 @@
579547
],
580548
'attributes' => [
581549
0 => [
582-
'var' => 'element',
583-
'name' => 'data-element',
584-
'virtual' => null,
585-
'converter' => null,
586-
'persist' => null,
587-
'preview_converter' => null
588-
],
589-
1 => [
590550
'var' => 'name',
591551
'name' => 'data-role',
592552
'virtual' => null,
@@ -652,14 +612,6 @@
652612
],
653613
'attributes' => [
654614
0 => [
655-
'var' => 'element',
656-
'name' => 'data-element',
657-
'virtual' => null,
658-
'converter' => null,
659-
'persist' => null,
660-
'preview_converter' => null
661-
],
662-
1 => [
663615
'var' => 'name',
664616
'name' => 'data-role',
665617
'virtual' => null,
@@ -726,14 +678,6 @@
726678
],
727679
'attributes' => [
728680
0 => [
729-
'var' => 'element',
730-
'name' => 'data-element',
731-
'virtual' => null,
732-
'converter' => null,
733-
'persist' => null,
734-
'preview_converter' => null
735-
],
736-
1 => [
737681
'var' => 'name',
738682
'name' => 'data-role',
739683
'virtual' => null,

dev/tests/integration/testsuite/Magento/PageBuilder/_files/content_type/type3_expected_merged_array.php

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -47,14 +47,6 @@
4747
],
4848
'attributes' => [
4949
0 => [
50-
'var' => 'element',
51-
'name' => 'data-element',
52-
'virtual' => null,
53-
'converter' => null,
54-
'persist' => null,
55-
'preview_converter' => null
56-
],
57-
1 => [
5850
'var' => 'name',
5951
'name' => 'data-role',
6052
'virtual' => null,

0 commit comments

Comments
 (0)