Merge branch 'images' into handle-html-tags

1 files changed, 13 insertions, 6 deletions

diff --git a/test/test-api.el b/test/test-api.el
index 0715a2e..faf2e0a 100644
--- a/test/test-api.el
+++ b/test/test-api.el
@@ -18,12 +18,19 @@
 (ert-deftest request-get-url ()
   (should (sx-request-get-url "http://google.com"))
   (should-error (sx-request-get-url "http://github.com/Bruce-Connor/does-not-exist"))
-  (should
-   ;; If image is not recognized, this returns nil.
-   (create-image (sx-request-get-url "https://raw.githubusercontent.com/vermiculus/sx.el/master/list-and-question.png")
-                 'imagemagick t
-                 :width (min sx-question-mode-image-max-width
-                             (window-body-width nil 'pixel)))))
+  (when sx-question-mode-use-images
+    (should
+     ;; If image is not recognized, this returns nil.
+     (create-image (sx-request-get-url "https://raw.githubusercontent.com/vermiculus/sx.el/master/list-and-question.png")
+                   'imagemagick t
+                   :width sx-question-mode-image-max-width)))
+  ;; In case imagemacgick is not available, let's try png so we at
+  ;; least test the function.
+  (when (image-type-available-p 'png)
+    (should
+     (create-image (sx-request-get-url "https://raw.githubusercontent.com/vermiculus/sx.el/master/list-and-question.png")
+                   'png t
+                   :width sx-question-mode-image-max-width))))
 
 (ert-deftest request-get-data ()
   (should-error (sx-request-get-data "tags/emacs-does-not-exist"))