feat: update to drawio-desktop 24.0.4 (#70)

rlespinasse · Mar 23, 2024 · 527202a · 527202a
1 parent 13145d7
commit 527202a
Show file tree

Hide file tree

Showing 11 changed files with 72 additions and 9 deletions.
diff --git a/Dockerfile b/Dockerfile
@@ -12,7 +12,7 @@ apt-get update
 apt-get install -y xvfb wget libgbm1 libasound2
 
 # Drawio Desktop
-DRAWIO_VERSION="23.1.5"
+DRAWIO_VERSION="24.0.4"
 wget -q https://github.com/jgraph/drawio-desktop/releases/download/v${DRAWIO_VERSION}/drawio-${TARGETARCH}-${DRAWIO_VERSION}.deb
 apt-get install -y /opt/drawio-desktop/drawio-${TARGETARCH}-${DRAWIO_VERSION}.deb
 rm -rf /opt/drawio-desktop/drawio-${TARGETARCH}-${DRAWIO_VERSION}.deb

diff --git a/README.adoc b/README.adoc
@@ -1,6 +1,6 @@
 = Draw.io Desktop Headless docker image
 
-Dockerized headless version of https://github.com/jgraph/drawio-desktop[Draw.io Desktop v23.1.5]
+Dockerized headless version of https://github.com/jgraph/drawio-desktop[Draw.io Desktop v24.0.4]
 
 == What it does
 

diff --git a/tests/data/file3.drawio b/tests/data/file3.drawio
@@ -0,0 +1,60 @@
+<mxfile host="localhost" modified="2020-05-11T08:11:10.086Z" etag="L2Vw7R6ZwuYNYa1SxQTY" agent="5.0 (Macintosh; Intel Mac OS X 10_15_4) AppleWebKit/537.36 (KHTML, like Gecko) Code/1.45.0 Chrome/78.0.3904.130 Electron/7.2.4 Safari/537.36" version="13.0.9" pages="2">
+    <diagram id="KgwwwuPXLq_iXDXmIebJ" name="Page-1">
+        <mxGraphModel dx="562" dy="654" grid="1" gridSize="10" guides="1" tooltips="1" connect="1" arrows="1" fold="1" page="1" pageScale="1" pageWidth="827" pageHeight="1169" math="0" shadow="0">
+            <root>
+                <object label="" id="0">
+                    <mxCell/>
+                </object>
+                <mxCell id="1" parent="0"/>
+                <UserObject label="Some text" link="https://github.com/rlespinasse/qanda" id="X03gjs-y7KjdQwQyzjE4-2">
+                    <mxCell style="rounded=1;whiteSpace=wrap;html=1;" parent="1" vertex="1">
+                        <mxGeometry x="10" y="10" width="120" height="60" as="geometry"/>
+                    </mxCell>
+                </UserObject>
+                <mxCell id="2" style="edgeStyle=orthogonalEdgeStyle;rounded=0;orthogonalLoop=1;jettySize=auto;html=1;exitX=0.5;exitY=0;exitDx=0;exitDy=0;entryX=0.5;entryY=1;entryDx=0;entryDy=0;" parent="1" source="X03gjs-y7KjdQwQyzjE4-4" target="X03gjs-y7KjdQwQyzjE4-2" edge="1">
+                    <mxGeometry relative="1" as="geometry"/>
+                </mxCell>
+                <UserObject label="Some link" link="https://github.com/rlespinasse/qanda" id="X03gjs-y7KjdQwQyzjE4-4">
+                    <mxCell style="text;html=1;strokeColor=none;fillColor=none;align=center;verticalAlign=middle;whiteSpace=wrap;rounded=0;" parent="1" vertex="1">
+                        <mxGeometry x="30" y="170" width="80" height="20" as="geometry"/>
+                    </mxCell>
+                </UserObject>
+            </root>
+        </mxGraphModel>
+    </diagram>
+    <diagram name="Page 2" id="WKCg2NcY1VQb7qcMgWaw">
+        &#xa;        &#xa;&#xa;
+        <mxGraphModel dx="1106" dy="830" grid="1" gridSize="10" guides="1" tooltips="1" connect="1" arrows="1" fold="1" page="1" pageScale="1" pageWidth="827" pageHeight="1169" math="0" shadow="0">
+            &#xa;            &#xa;&#xa;
+            <root>
+                &#xa;                &#xa;&#xa;
+                <mxCell id="RwZS0F2J_Ui9ka5hwAdE-0"/>
+                &#xa;                &#xa;&#xa;
+                <mxCell id="RwZS0F2J_Ui9ka5hwAdE-1" parent="RwZS0F2J_Ui9ka5hwAdE-0"/>
+                &#xa;                &#xa;&#xa;
+                <UserObject label="Some text" link="https://github.com/rlespinasse/qanda" id="RwZS0F2J_Ui9ka5hwAdE-2">
+                    &#xa;                    &#xa;&#xa;
+                    <mxCell style="rounded=1;whiteSpace=wrap;html=1;" vertex="1" parent="RwZS0F2J_Ui9ka5hwAdE-1">
+                        &#xa;                        &#xa;&#xa;
+                        <mxGeometry x="10" y="10" width="120" height="60" as="geometry"/>
+                        &#xa;                        &#xa;&#xa;
+                    </mxCell>
+                    &#xa;                    &#xa;&#xa;
+                </UserObject>
+                &#xa;                &#xa;&#xa;
+                <UserObject label="Some link" link="https://github.com/rlespinasse/qanda" id="RwZS0F2J_Ui9ka5hwAdE-3">
+                    &#xa;                    &#xa;&#xa;
+                    <mxCell style="text;html=1;strokeColor=none;fillColor=none;align=center;verticalAlign=middle;whiteSpace=wrap;rounded=0;" vertex="1" parent="RwZS0F2J_Ui9ka5hwAdE-1">
+                        &#xa;                        &#xa;&#xa;
+                        <mxGeometry x="30" y="90" width="80" height="20" as="geometry"/>
+                        &#xa;                        &#xa;&#xa;
+                    </mxCell>
+                    &#xa;                    &#xa;&#xa;
+                </UserObject>
+                &#xa;                &#xa;&#xa;
+            </root>
+            &#xa;            &#xa;&#xa;
+        </mxGraphModel>
+        &#xa;        &#xa;&#xa;
+    </diagram>
+</mxfile>
diff --git a/tests/expected/export-check-firstrun.log b/tests/expected/export-check-firstrun.log
@@ -0,0 +1 @@
+file3.drawio -> file3.pdf
diff --git a/tests/expected/export-check-secondrun.log b/tests/expected/export-check-secondrun.log
@@ -0,0 +1 @@
+file3.drawio -> file3-1.pdf
diff --git a/tests/expected/export-check-thirdrun.log b/tests/expected/export-check-thirdrun.log
@@ -0,0 +1 @@
+file3.drawio -> file3.pdf
diff --git a/tests/expected/issue-20-frame-bug.svg b/tests/expected/issue-20-frame-bug.svg
diff --git a/tests/expected/output-check-command.log b/tests/expected/output-check-command.log
diff --git a/tests/expected/output-wrong-command.log b/tests/expected/output-wrong-command.log
diff --git a/tests/export.bats b/tests/export.bats
@@ -10,6 +10,12 @@
   docker_test "" 0 "export-file2" "tests/data" -x "file 2.drawio"
 }
 
+@test "Export with check command" {
+  docker_test "" 1 "export-check-firstrun" "tests/data" -export --check file3.drawio
+  docker_test "" 1 "export-check-secondrun" "tests/data" -export --check file3.drawio
+  docker_test "" 1 "export-check-thirdrun" "tests/data" -export file3.drawio
+}
+
 @test "Export using unknown argument" {
   docker_test "" 0 "export-file1" "tests/data" --export file1.drawio --wrong-argument
 }
diff --git a/tests/timeout.bats b/tests/timeout.bats
@@ -6,10 +6,6 @@
   docker_test "-e DRAWIO_DESKTOP_COMMAND_TIMEOUT=2s" 1 "output-create-command" "tests/data" --create
 }
 
-@test "Timeout for using check command" {
-  docker_test "-e DRAWIO_DESKTOP_COMMAND_TIMEOUT=2s" 1 "output-check-command" "tests/data" --check /data/file1.drawio
-}
-
 @test "Timeout for using wrong command" {
   docker_test "-e DRAWIO_DESKTOP_COMMAND_TIMEOUT=2s" 1 "output-wrong-command" "tests/data" --wrong-command
 }