diff --git a/Dockerfile b/Dockerfile index f4f9278..ea4e787 100644 --- 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 index 3fef778..6cc236f 100644 --- 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 new file mode 100755 index 0000000..ee1e54b --- /dev/null +++ b/tests/data/file3.drawio @@ -0,0 +1,60 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/tests/expected/export-check-firstrun.log b/tests/expected/export-check-firstrun.log new file mode 100644 index 0000000..17eb77f --- /dev/null +++ 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 new file mode 100644 index 0000000..6d851e3 --- /dev/null +++ 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 new file mode 100644 index 0000000..17eb77f --- /dev/null +++ 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 index e504b44..5d89f84 100644 --- a/tests/expected/issue-20-frame-bug.svg +++ b/tests/expected/issue-20-frame-bug.svg @@ -1,3 +1,3 @@ -
Good
Good
Bad
BadText is not SVG - cannot display \ No newline at end of file +
Good
Good
Bad
BadText is not SVG - cannot display \ No newline at end of file diff --git a/tests/expected/output-check-command.log b/tests/expected/output-check-command.log deleted file mode 100644 index 8b13789..0000000 --- a/tests/expected/output-check-command.log +++ /dev/null @@ -1 +0,0 @@ - diff --git a/tests/expected/output-wrong-command.log b/tests/expected/output-wrong-command.log deleted file mode 100644 index 8b13789..0000000 --- a/tests/expected/output-wrong-command.log +++ /dev/null @@ -1 +0,0 @@ - diff --git a/tests/export.bats b/tests/export.bats index f752d7e..e04a42a 100755 --- 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 index 24c4f3e..b226762 100755 --- 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 }