Merge pull request #46 from dduportal/fix-adoc-diagram

Fix #44: Re-Enabling Asciidoctor-diagram usage

Dockerfile

@@ -11,7 +11,9 @@ RUN apk add --no-cache \
     curl \
     ca-certificates \
     findutils \
+    graphviz \
     make \
+    openjdk8-jre \
     py2-pillow \
     python2 \
     ruby \

tests/fixtures/sample-with-diagram.adoc

@@ -0,0 +1,16 @@
+
+= Sample
+
+This is a sample from
+link:https://github.com/asciidoctor/docker-asciidoctor/issues/44#issue-265179207[]
+
+[IMPORTANT]
+====
+Thanks to link:https://github.com/ryosms[]!
+====
+
+[plantuml,sample-diagram,svg]
+----
+class Sample {
+}
+----

tests/test_suite.bats

@@ -5,7 +5,8 @@ TMP_GENERATION_DIR="${BATS_TEST_DIRNAME}/tmp"
 ASCIIDOCTOR_VERSION="1.5.5"
 
 clean_generated_files() {
-  rm -rf "${TMP_GENERATION_DIR}"
+  docker run -t --rm -v "${BATS_TEST_DIRNAME}:${BATS_TEST_DIRNAME}" alpine \
+    rm -rf "${TMP_GENERATION_DIR}"
 }
 
 setup() {
@@ -42,11 +43,24 @@ teardown() {
   docker run -t --rm "${DOCKER_IMAGE_NAME}" which curl
 }
 
+@test "bash is installed and in the path" {
+  docker run -t --rm "${DOCKER_IMAGE_NAME}" which bash
+}
+
+@test "java is installed, in the path, and executable" {
+  docker run -t --rm "${DOCKER_IMAGE_NAME}" which java
+  docker run -t --rm "${DOCKER_IMAGE_NAME}" java -version
+}
+
+@test "dot (from Graphviz) is installed and in the path" {
+  docker run -t --rm "${DOCKER_IMAGE_NAME}" which dot
+}
+
 @test "asciidoctor-confluence is installed and in the path" {
   docker run -t --rm "${DOCKER_IMAGE_NAME}" which asciidoctor-confluence
 }
 
-@test "We can generate a HTML document from basic example" {
+@test "We can generate an HTML document from basic example" {
   docker run -t --rm \
     -v "${BATS_TEST_DIRNAME}":/documents/ \
     "${DOCKER_IMAGE_NAME}" \
@@ -62,3 +76,21 @@ teardown() {
       asciidoctor-pdf -D /documents/tmp -r asciidoctor-mathematical \
       /documents/fixtures/basic-example.adoc
 }
+
+@test "We can generate an HTML document with a diagram with asciidoctor-diagram as backend" {
+  run docker run -t --rm \
+    -v "${BATS_TEST_DIRNAME}":/documents/ \
+    "${DOCKER_IMAGE_NAME}" \
+      asciidoctor -D /documents/tmp -r asciidoctor-diagram \
+      /documents/fixtures/sample-with-diagram.adoc
+
+  # Even when in ERROR with the module, asciidoctor return 0 because a document
+  # has been generated
+  [ "${status}" -eq 0 ]
+
+  echo "-- Output of command:"
+  echo "${output}"
+  echo "--"
+
+  [ "$(echo ${output} | grep -c -i error)" -eq 0 ]
+}