Skip to content

Commit b821454

Browse files
authored
Merge branch 'develop' into bug/6518_allow-empty-colon-messaage
2 parents c17277e + cf8fc2a commit b821454

File tree

3 files changed

+58
-54
lines changed

3 files changed

+58
-54
lines changed

.github/workflows/e2e-applitools.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,7 @@ jobs:
5151
APPLITOOLS_PARENT_BRANCH: ${{ github.event.inputs.parent_branch }}
5252
APPLITOOLS_API_KEY: ${{ secrets.APPLITOOLS_API_KEY }}
5353
APPLITOOLS_SERVER_URL: 'https://eyesapi.applitools.com'
54-
uses: wei/curl@61d92b5169ea0425820dd13cf6fbad66b483e9f1
54+
uses: wei/curl@012398a392d02480afa2720780031f8621d5f94c
5555
with:
5656
args: -X POST "$APPLITOOLS_SERVER_URL/api/externals/github/push?apiKey=$APPLITOOLS_API_KEY&CommitSha=$GITHUB_SHA&BranchName=${APPLITOOLS_BRANCH}$&ParentBranchName=$APPLITOOLS_PARENT_BRANCH"
5757

cypress/timings.json

Lines changed: 56 additions & 52 deletions
Original file line numberDiff line numberDiff line change
@@ -2,211 +2,215 @@
22
"durations": [
33
{
44
"spec": "cypress/integration/other/configuration.spec.js",
5-
"duration": 5450
5+
"duration": 6130
66
},
77
{
88
"spec": "cypress/integration/other/external-diagrams.spec.js",
9-
"duration": 2004
9+
"duration": 1974
1010
},
1111
{
1212
"spec": "cypress/integration/other/ghsa.spec.js",
13-
"duration": 3183
13+
"duration": 3308
1414
},
1515
{
1616
"spec": "cypress/integration/other/iife.spec.js",
17-
"duration": 1913
17+
"duration": 1877
1818
},
1919
{
2020
"spec": "cypress/integration/other/interaction.spec.js",
21-
"duration": 10944
21+
"duration": 10902
2222
},
2323
{
2424
"spec": "cypress/integration/other/rerender.spec.js",
25-
"duration": 1938
25+
"duration": 1836
2626
},
2727
{
2828
"spec": "cypress/integration/other/xss.spec.js",
29-
"duration": 26753
29+
"duration": 26467
3030
},
3131
{
3232
"spec": "cypress/integration/rendering/appli.spec.js",
33-
"duration": 2571
33+
"duration": 3129
3434
},
3535
{
3636
"spec": "cypress/integration/rendering/architecture.spec.ts",
37-
"duration": 110
37+
"duration": 104
3838
},
3939
{
4040
"spec": "cypress/integration/rendering/block.spec.js",
41-
"duration": 14697
41+
"duration": 16230
4242
},
4343
{
4444
"spec": "cypress/integration/rendering/c4.spec.js",
45-
"duration": 4705
45+
"duration": 5231
4646
},
4747
{
4848
"spec": "cypress/integration/rendering/classDiagram-elk-v3.spec.js",
49-
"duration": 35841
49+
"duration": 38113
5050
},
5151
{
5252
"spec": "cypress/integration/rendering/classDiagram-handDrawn-v3.spec.js",
53-
"duration": 34279
53+
"duration": 36423
5454
},
5555
{
5656
"spec": "cypress/integration/rendering/classDiagram-v2.spec.js",
57-
"duration": 20641
57+
"duration": 22509
5858
},
5959
{
6060
"spec": "cypress/integration/rendering/classDiagram-v3.spec.js",
61-
"duration": 33020
61+
"duration": 34933
6262
},
6363
{
6464
"spec": "cypress/integration/rendering/classDiagram.spec.js",
65-
"duration": 13546
65+
"duration": 14681
6666
},
6767
{
6868
"spec": "cypress/integration/rendering/conf-and-directives.spec.js",
69-
"duration": 8072
69+
"duration": 8877
7070
},
7171
{
7272
"spec": "cypress/integration/rendering/current.spec.js",
73-
"duration": 2083
73+
"duration": 2517
7474
},
7575
{
7676
"spec": "cypress/integration/rendering/erDiagram-unified.spec.js",
77-
"duration": 78269
77+
"duration": 81226
7878
},
7979
{
8080
"spec": "cypress/integration/rendering/erDiagram.spec.js",
81-
"duration": 12578
81+
"duration": 14211
8282
},
8383
{
8484
"spec": "cypress/integration/rendering/errorDiagram.spec.js",
85-
"duration": 2784
85+
"duration": 3355
8686
},
8787
{
8888
"spec": "cypress/integration/rendering/flowchart-elk.spec.js",
89-
"duration": 36205
89+
"duration": 38857
9090
},
9191
{
9292
"spec": "cypress/integration/rendering/flowchart-handDrawn.spec.js",
93-
"duration": 26627
93+
"duration": 28570
94+
},
95+
{
96+
"spec": "cypress/integration/rendering/flowchart-icon.spec.js",
97+
"duration": 6902
9498
},
9599
{
96100
"spec": "cypress/integration/rendering/flowchart-shape-alias.spec.ts",
97-
"duration": 21332
101+
"duration": 23075
98102
},
99103
{
100104
"spec": "cypress/integration/rendering/flowchart-v2.spec.js",
101-
"duration": 37328
105+
"duration": 40514
102106
},
103107
{
104108
"spec": "cypress/integration/rendering/flowchart.spec.js",
105-
"duration": 25914
109+
"duration": 28611
106110
},
107111
{
108112
"spec": "cypress/integration/rendering/gantt.spec.js",
109-
"duration": 15383
113+
"duration": 16605
110114
},
111115
{
112116
"spec": "cypress/integration/rendering/gitGraph.spec.js",
113-
"duration": 45226
117+
"duration": 47636
114118
},
115119
{
116120
"spec": "cypress/integration/rendering/iconShape.spec.ts",
117-
"duration": 251094
121+
"duration": 262219
118122
},
119123
{
120124
"spec": "cypress/integration/rendering/imageShape.spec.ts",
121-
"duration": 50916
125+
"duration": 54111
122126
},
123127
{
124128
"spec": "cypress/integration/rendering/info.spec.ts",
125-
"duration": 2489
129+
"duration": 3006
126130
},
127131
{
128132
"spec": "cypress/integration/rendering/journey.spec.js",
129-
"duration": 5988
133+
"duration": 6858
130134
},
131135
{
132136
"spec": "cypress/integration/rendering/kanban.spec.ts",
133-
"duration": 6225
137+
"duration": 7281
134138
},
135139
{
136140
"spec": "cypress/integration/rendering/katex.spec.js",
137-
"duration": 3009
141+
"duration": 3579
138142
},
139143
{
140144
"spec": "cypress/integration/rendering/marker_unique_id.spec.js",
141-
"duration": 2426
145+
"duration": 2448
142146
},
143147
{
144148
"spec": "cypress/integration/rendering/mindmap.spec.ts",
145-
"duration": 9306
149+
"duration": 10618
146150
},
147151
{
148152
"spec": "cypress/integration/rendering/newShapes.spec.ts",
149-
"duration": 134419
153+
"duration": 140874
150154
},
151155
{
152156
"spec": "cypress/integration/rendering/oldShapes.spec.ts",
153-
"duration": 102434
157+
"duration": 108015
154158
},
155159
{
156160
"spec": "cypress/integration/rendering/packet.spec.ts",
157-
"duration": 3373
161+
"duration": 4241
158162
},
159163
{
160164
"spec": "cypress/integration/rendering/pie.spec.ts",
161-
"duration": 4898
165+
"duration": 5645
162166
},
163167
{
164168
"spec": "cypress/integration/rendering/quadrantChart.spec.js",
165-
"duration": 7578
169+
"duration": 8524
166170
},
167171
{
168172
"spec": "cypress/integration/rendering/radar.spec.js",
169-
"duration": 4526
173+
"duration": 5203
170174
},
171175
{
172176
"spec": "cypress/integration/rendering/requirement.spec.js",
173-
"duration": 2172
177+
"duration": 2635
174178
},
175179
{
176180
"spec": "cypress/integration/rendering/requirementDiagram-unified.spec.js",
177-
"duration": 47175
181+
"duration": 50512
178182
},
179183
{
180184
"spec": "cypress/integration/rendering/sankey.spec.ts",
181-
"duration": 5717
185+
"duration": 6692
182186
},
183187
{
184188
"spec": "cypress/integration/rendering/sequencediagram.spec.js",
185-
"duration": 32556
189+
"duration": 34559
186190
},
187191
{
188192
"spec": "cypress/integration/rendering/stateDiagram-v2.spec.js",
189-
"duration": 22572
193+
"duration": 24421
190194
},
191195
{
192196
"spec": "cypress/integration/rendering/stateDiagram.spec.js",
193-
"duration": 14064
197+
"duration": 15316
194198
},
195199
{
196200
"spec": "cypress/integration/rendering/theme.spec.js",
197-
"duration": 26565
201+
"duration": 28240
198202
},
199203
{
200204
"spec": "cypress/integration/rendering/timeline.spec.ts",
201-
"duration": 6233
205+
"duration": 6808
202206
},
203207
{
204208
"spec": "cypress/integration/rendering/xyChart.spec.js",
205-
"duration": 17750
209+
"duration": 19359
206210
},
207211
{
208212
"spec": "cypress/integration/rendering/zenuml.spec.js",
209-
"duration": 2696
213+
"duration": 3164
210214
}
211215
]
212216
}

packages/mermaid-layout-elk/README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,7 @@ mermaid.registerLayoutLoaders(elkLayouts);
5454
```html
5555
<script type="module">
5656
import mermaid from 'https://cdn.jsdelivr.net/npm/mermaid@11/dist/mermaid.esm.min.mjs';
57-
import elkLayouts from 'https://cdn.jsdelivr.net/npm/@mermaid-js/layout-elk@11/dist/mermaid-layout-elk.esm.min.mjs';
57+
import elkLayouts from 'https://cdn.jsdelivr.net/npm/@mermaid-js/layout-elk@0/dist/mermaid-layout-elk.esm.min.mjs';
5858
5959
mermaid.registerLayoutLoaders(elkLayouts);
6060
</script>

0 commit comments

Comments
 (0)