luciano/d2
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

update test

Browse source
This commit is contained in:
Gavin Nishizawa 2023-09-28 13:33:51 -07:00
parent 6fc84e2026
commit 9ec68d246d
No known key found for this signature in database
GPG key ID: AE3B177777CE55CD
3 changed files with 620 additions and 121 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
e2etests/testdata/files/grid_edge_across_cell.d2 vendored
View file

@ -1,3 +1,17 @@
grid-columns: 2 classes.red.style.stroke: red
grid: {
grid-columns: 2
grid-gap: 10
1.a -> 2.b cell 1.a -> cell 2.b -> cell 3.c.d: {
class: red
}
cell 3: {
c -> e
c.d -> f.g
}
cell 3.f.g -> cell 1.a: {
class: red
}
}

544
e2etests/testdata/stable/grid_edge_across_cell/dagre/board.exp.json generated vendored
View file

@ -4,14 +4,14 @@
"fontFamily": "SourceSansPro", "fontFamily": "SourceSansPro",
"shapes": [ "shapes": [
{ {
"id": "1", "id": "grid",
"type": "rectangle", "type": "rectangle",
"pos": { "pos": {
"x": 0, "x": 0,
"y": 41 "y": 0
}, },
"width": 113, "width": 424,
"height": 126, "height": 550,
"opacity": 1, "opacity": 1,
"strokeDash": 0, "strokeDash": 0,
"strokeWidth": 2, "strokeWidth": 2,
@ -30,7 +30,7 @@
"fields": null, "fields": null,
"methods": null, "methods": null,
"columns": null, "columns": null,
"label": "1", "label": "grid",
"fontSize": 28, "fontSize": 28,
"fontFamily": "DEFAULT", "fontFamily": "DEFAULT",
"language": "", "language": "",
@ -38,18 +38,59 @@
"italic": false, "italic": false,
"bold": false, "bold": false,
"underline": false, "underline": false,
"labelWidth": 11, "labelWidth": 44,
"labelHeight": 36, "labelHeight": 36,
"labelPosition": "OUTSIDE_TOP_CENTER", "labelPosition": "INSIDE_TOP_CENTER",
"zIndex": 0, "zIndex": 0,
"level": 1 "level": 1
}, },
{ {
"id": "1.a", "id": "grid.cell 1",
"type": "rectangle", "type": "rectangle",
"pos": { "pos": {
"x": 30, "x": 10,
"y": 71 "y": 82
},
"width": 113,
"height": 206,
"opacity": 1,
"strokeDash": 0,
"strokeWidth": 2,
"borderRadius": 0,
"fill": "B5",
"stroke": "B1",
"shadow": false,
"3d": false,
"multiple": false,
"double-border": false,
"tooltip": "",
"link": "",
"icon": null,
"iconPosition": "",
"blend": false,
"fields": null,
"methods": null,
"columns": null,
"label": "cell 1",
"fontSize": 24,
"fontFamily": "DEFAULT",
"language": "",
"color": "N1",
"italic": false,
"bold": false,
"underline": false,
"labelWidth": 50,
"labelHeight": 31,
"labelPosition": "OUTSIDE_TOP_CENTER",
"zIndex": 0,
"level": 2
},
{
"id": "grid.cell 1.a",
"type": "rectangle",
"pos": {
"x": 40,
"y": 112
}, },
"width": 53, "width": 53,
"height": 66, "height": 66,
@ -57,7 +98,7 @@
"strokeDash": 0, "strokeDash": 0,
"strokeWidth": 2, "strokeWidth": 2,
"borderRadius": 0, "borderRadius": 0,
"fill": "B5", "fill": "B6",
"stroke": "B1", "stroke": "B1",
"shadow": false, "shadow": false,
"3d": false, "3d": false,
@ -83,22 +124,22 @@
"labelHeight": 21, "labelHeight": 21,
"labelPosition": "INSIDE_MIDDLE_CENTER", "labelPosition": "INSIDE_MIDDLE_CENTER",
"zIndex": 0, "zIndex": 0,
"level": 2 "level": 3
}, },
{ {
"id": "2", "id": "grid.cell 2",
"type": "rectangle", "type": "rectangle",
"pos": { "pos": {
"x": 153, "x": 10,
"y": 41 "y": 334
}, },
"width": 113, "width": 113,
"height": 126, "height": 206,
"opacity": 1, "opacity": 1,
"strokeDash": 0, "strokeDash": 0,
"strokeWidth": 2, "strokeWidth": 2,
"borderRadius": 0, "borderRadius": 0,
"fill": "B4", "fill": "B5",
"stroke": "B1", "stroke": "B1",
"shadow": false, "shadow": false,
"3d": false, "3d": false,
@ -112,26 +153,26 @@
"fields": null, "fields": null,
"methods": null, "methods": null,
"columns": null, "columns": null,
"label": "2", "label": "cell 2",
"fontSize": 28, "fontSize": 24,
"fontFamily": "DEFAULT", "fontFamily": "DEFAULT",
"language": "", "language": "",
"color": "N1", "color": "N1",
"italic": false, "italic": false,
"bold": false, "bold": false,
"underline": false, "underline": false,
"labelWidth": 12, "labelWidth": 50,
"labelHeight": 36, "labelHeight": 31,
"labelPosition": "OUTSIDE_TOP_CENTER", "labelPosition": "OUTSIDE_TOP_CENTER",
"zIndex": 0, "zIndex": 0,
"level": 1 "level": 2
}, },
{ {
"id": "2.b", "id": "grid.cell 2.b",
"type": "rectangle", "type": "rectangle",
"pos": { "pos": {
"x": 183, "x": 40,
"y": 71 "y": 364
}, },
"width": 53, "width": 53,
"height": 66, "height": 66,
@ -139,7 +180,7 @@
"strokeDash": 0, "strokeDash": 0,
"strokeWidth": 2, "strokeWidth": 2,
"borderRadius": 0, "borderRadius": 0,
"fill": "B5", "fill": "B6",
"stroke": "B1", "stroke": "B1",
"shadow": false, "shadow": false,
"3d": false, "3d": false,
@ -165,15 +206,343 @@
"labelHeight": 21, "labelHeight": 21,
"labelPosition": "INSIDE_MIDDLE_CENTER", "labelPosition": "INSIDE_MIDDLE_CENTER",
"zIndex": 0, "zIndex": 0,
"level": 3
},
{
"id": "grid.cell 3",
"type": "rectangle",
"pos": {
"x": 133,
"y": 82
},
"width": 280,
"height": 458,
"opacity": 1,
"strokeDash": 0,
"strokeWidth": 2,
"borderRadius": 0,
"fill": "B5",
"stroke": "B1",
"shadow": false,
"3d": false,
"multiple": false,
"double-border": false,
"tooltip": "",
"link": "",
"icon": null,
"iconPosition": "",
"blend": false,
"fields": null,
"methods": null,
"columns": null,
"label": "cell 3",
"fontSize": 24,
"fontFamily": "DEFAULT",
"language": "",
"color": "N1",
"italic": false,
"bold": false,
"underline": false,
"labelWidth": 50,
"labelHeight": 31,
"labelPosition": "OUTSIDE_TOP_CENTER",
"zIndex": 0,
"level": 2 "level": 2
},
{
"id": "grid.cell 3.c",
"type": "rectangle",
"pos": {
"x": 163,
"y": 118
},
"width": 154,
"height": 126,
"opacity": 1,
"strokeDash": 0,
"strokeWidth": 2,
"borderRadius": 0,
"fill": "B6",
"stroke": "B1",
"shadow": false,
"3d": false,
"multiple": false,
"double-border": false,
"tooltip": "",
"link": "",
"icon": null,
"iconPosition": "",
"blend": false,
"fields": null,
"methods": null,
"columns": null,
"label": "c",
"fontSize": 20,
"fontFamily": "DEFAULT",
"language": "",
"color": "N1",
"italic": false,
"bold": false,
"underline": false,
"labelWidth": 9,
"labelHeight": 26,
"labelPosition": "OUTSIDE_TOP_CENTER",
"zIndex": 0,
"level": 3
},
{
"id": "grid.cell 3.c.d",
"type": "rectangle",
"pos": {
"x": 233,
"y": 148
},
"width": 54,
"height": 66,
"opacity": 1,
"strokeDash": 0,
"strokeWidth": 2,
"borderRadius": 0,
"fill": "N7",
"stroke": "B1",
"shadow": false,
"3d": false,
"multiple": false,
"double-border": false,
"tooltip": "",
"link": "",
"icon": null,
"iconPosition": "",
"blend": false,
"fields": null,
"methods": null,
"columns": null,
"label": "d",
"fontSize": 16,
"fontFamily": "DEFAULT",
"language": "",
"color": "N1",
"italic": false,
"bold": true,
"underline": false,
"labelWidth": 9,
"labelHeight": 21,
"labelPosition": "INSIDE_MIDDLE_CENTER",
"zIndex": 0,
"level": 4
},
{
"id": "grid.cell 3.e",
"type": "rectangle",
"pos": {
"x": 166,
"y": 414
},
"width": 53,
"height": 66,
"opacity": 1,
"strokeDash": 0,
"strokeWidth": 2,
"borderRadius": 0,
"fill": "B6",
"stroke": "B1",
"shadow": false,
"3d": false,
"multiple": false,
"double-border": false,
"tooltip": "",
"link": "",
"icon": null,
"iconPosition": "",
"blend": false,
"fields": null,
"methods": null,
"columns": null,
"label": "e",
"fontSize": 16,
"fontFamily": "DEFAULT",
"language": "",
"color": "N1",
"italic": false,
"bold": true,
"underline": false,
"labelWidth": 8,
"labelHeight": 21,
"labelPosition": "INSIDE_MIDDLE_CENTER",
"zIndex": 0,
"level": 3
},
{
"id": "grid.cell 3.f",
"type": "rectangle",
"pos": {
"x": 269,
"y": 384
},
"width": 114,
"height": 126,
"opacity": 1,
"strokeDash": 0,
"strokeWidth": 2,
"borderRadius": 0,
"fill": "B6",
"stroke": "B1",
"shadow": false,
"3d": false,
"multiple": false,
"double-border": false,
"tooltip": "",
"link": "",
"icon": null,
"iconPosition": "",
"blend": false,
"fields": null,
"methods": null,
"columns": null,
"label": "f",
"fontSize": 20,
"fontFamily": "DEFAULT",
"language": "",
"color": "N1",
"italic": false,
"bold": false,
"underline": false,
"labelWidth": 7,
"labelHeight": 26,
"labelPosition": "OUTSIDE_TOP_CENTER",
"zIndex": 0,
"level": 3
},
{
"id": "grid.cell 3.f.g",
"type": "rectangle",
"pos": {
"x": 299,
"y": 414
},
"width": 54,
"height": 66,
"opacity": 1,
"strokeDash": 0,
"strokeWidth": 2,
"borderRadius": 0,
"fill": "N7",
"stroke": "B1",
"shadow": false,
"3d": false,
"multiple": false,
"double-border": false,
"tooltip": "",
"link": "",
"icon": null,
"iconPosition": "",
"blend": false,
"fields": null,
"methods": null,
"columns": null,
"label": "g",
"fontSize": 16,
"fontFamily": "DEFAULT",
"language": "",
"color": "N1",
"italic": false,
"bold": true,
"underline": false,
"labelWidth": 9,
"labelHeight": 21,
"labelPosition": "INSIDE_MIDDLE_CENTER",
"zIndex": 0,
"level": 4
} }
], ],
"connections": [ "connections": [
{ {
"id": "(1.a -> 2.b)[0]", "id": "grid.(cell 1.a -> cell 2.b)[0]",
"src": "1.a", "classes": [
"red"
],
"src": "grid.cell 1.a",
"srcArrow": "none", "srcArrow": "none",
"dst": "2.b", "dst": "grid.cell 2.b",
"dstArrow": "triangle",
"opacity": 1,
"strokeDash": 0,
"strokeWidth": 2,
"stroke": "red",
"borderRadius": 10,
"label": "",
"fontSize": 16,
"fontFamily": "DEFAULT",
"language": "",
"color": "N2",
"italic": true,
"bold": false,
"underline": false,
"labelWidth": 0,
"labelHeight": 0,
"labelPosition": "",
"labelPercentage": 0,
"route": [
{
"x": 66.5,
"y": 178
},
{
"x": 66.5,
"y": 364
}
],
"animated": false,
"tooltip": "",
"icon": null,
"zIndex": 0
},
{
"id": "grid.(cell 2.b -> cell 3.c.d)[0]",
"classes": [
"red"
],
"src": "grid.cell 2.b",
"srcArrow": "none",
"dst": "grid.cell 3.c.d",
"dstArrow": "triangle",
"opacity": 1,
"strokeDash": 0,
"strokeWidth": 2,
"stroke": "red",
"borderRadius": 10,
"label": "",
"fontSize": 16,
"fontFamily": "DEFAULT",
"language": "",
"color": "N2",
"italic": true,
"bold": false,
"underline": false,
"labelWidth": 0,
"labelHeight": 0,
"labelPosition": "",
"labelPercentage": 0,
"route": [
{
"x": 93.25,
"y": 367
},
{
"x": 233.25,
"y": 211
}
],
"animated": false,
"tooltip": "",
"icon": null,
"zIndex": 0
},
{
"id": "grid.cell 3.(c -> e)[0]",
"src": "grid.cell 3.c",
"srcArrow": "none",
"dst": "grid.cell 3.e",
"dstArrow": "triangle", "dstArrow": "triangle",
"opacity": 1, "opacity": 1,
"strokeDash": 0, "strokeDash": 0,
@ -194,12 +563,121 @@
"labelPercentage": 0, "labelPercentage": 0,
"route": [ "route": [
{ {
"x": 83.5, "x": 193,
"y": 104 "y": 244
}, },
{ {
"x": 183.5, "x": 193,
"y": 104 "y": 300
},
{
"x": 193,
"y": 374
},
{
"x": 193,
"y": 414
}
],
"isCurve": true,
"animated": false,
"tooltip": "",
"icon": null,
"zIndex": 0
},
{
"id": "grid.cell 3.(c.d -> f.g)[0]",
"src": "grid.cell 3.c.d",
"srcArrow": "none",
"dst": "grid.cell 3.f.g",
"dstArrow": "triangle",
"opacity": 1,
"strokeDash": 0,
"strokeWidth": 2,
"stroke": "B1",
"borderRadius": 10,
"label": "",
"fontSize": 16,
"fontFamily": "DEFAULT",
"language": "",
"color": "N2",
"italic": true,
"bold": false,
"underline": false,
"labelWidth": 0,
"labelHeight": 0,
"labelPosition": "",
"labelPercentage": 0,
"route": [
{
"x": 286.5,
"y": 214
},
{
"x": 318.5,
"y": 254
},
{
"x": 326.5,
"y": 274
},
{
"x": 326.5,
"y": 289
},
{
"x": 326.5,
"y": 304
},
{
"x": 326.5,
"y": 374
},
{
"x": 326.5,
"y": 414
}
],
"isCurve": true,
"animated": false,
"tooltip": "",
"icon": null,
"zIndex": 0
},
{
"id": "grid.(cell 3.f.g -> cell 1.a)[0]",
"classes": [
"red"
],
"src": "grid.cell 3.f.g",
"srcArrow": "none",
"dst": "grid.cell 1.a",
"dstArrow": "triangle",
"opacity": 1,
"strokeDash": 0,
"strokeWidth": 2,
"stroke": "red",
"borderRadius": 10,
"label": "",
"fontSize": 16,
"fontFamily": "DEFAULT",
"language": "",
"color": "N2",
"italic": true,
"bold": false,
"underline": false,
"labelWidth": 0,
"labelHeight": 0,
"labelPosition": "",
"labelPercentage": 0,
"route": [
{
"x": 299.5,
"y": 416
},
{
"x": 92.5,
"y": 176
} }
], ],
"animated": false, "animated": false,

179
e2etests/testdata/stable/grid_edge_across_cell/dagre/sketch.exp.svg vendored
View file

File diff suppressed because one or more lines are too long
Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 13 KiB

After

Width:  |  Height:  |  Size: 19 KiB