Merge branch 'master' into more-ordering

2 files changed, 40 insertions, 9 deletions

diff --git a/test/test-api.el b/test/test-api.el
index b7d5dbb..faf2e0a 100644
--- a/test/test-api.el
+++ b/test/test-api.el
@@ -14,3 +14,26 @@
 (ert-deftest test-method-get-all ()
   "Tests sx-method interface to `sx-request-all-items'"
   (should (< 250 (length (sx-method-call 'sites :get-all t)))))
+
+(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"))
+  (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"))
+  (let ((emacs-tags (sx-request-get-data 'tags/emacs)))
+    (should (> (length emacs-tags) 450))
+    (should (not (cl-remove-if #'stringp emacs-tags)))))
diff --git a/test/test-printing.el b/test/test-printing.el
index 6fa77b9..4c72f68 100644
--- a/test/test-printing.el
+++ b/test/test-printing.el
@@ -13,7 +13,7 @@
 (defmacro question-list-regex (title votes answers &rest tags)
   "Construct a matching regexp for TITLE, VOTES, and ANSWERS.
 Each element of TAGS is appended at the end of the expression
-after being run through `sx-question--tag-format'."
+after being run through `sx-tag--format'."
   `(rx line-start
        (+ whitespace) ,(number-to-string votes)
        (+ whitespace) ,(number-to-string answers)
@@ -22,8 +22,7 @@ after being run through `sx-question--tag-format'."
        (+ (any whitespace digit))
        (or "y" "d" "h" "m" "mo" "s") " ago"
        (+ whitespace)
-       (eval (mapconcat #'sx-question--tag-format
-                        (list ,@tags) " "))))
+       (eval (mapconcat #'sx-tag--format (list ,@tags) " "))))
 
 
 ;;; Tests
@@ -40,11 +39,18 @@ after being run through `sx-question--tag-format'."
       (sx-time-since 1420105000.)))))
 
 (ert-deftest question-list-tag ()
-  "Test `sx-question--tag-format'."
+  "Test `sx-tag--format'."
   (should
-   (string=
-    (sx-question--tag-format "tag")
-    "[tag]")))
+   (string= (sx-tag--format "tag") "[tag]"))
+  (with-temp-buffer
+    (insert (sx-tag--format "tag"))
+    (should (get-char-property (point-min) 'button))
+    (should
+     (eq (get-char-property (point-min) 'face) 'sx-tag))
+    (should
+     (string= (get-char-property (point-min) 'sx-tag) "tag"))
+    (should
+     (string= (get-char-property (point-min) 'sx-button-copy) "tag"))))
 
 (ert-deftest question-list-display ()
   (cl-letf (((symbol-function #'sx-request-make)
@@ -162,8 +168,9 @@ after being run through `sx-question--tag-format'."
   "Check complicated questions are filled correctly."
   (should
    (equal
-    (sx-question-mode--fill-and-fontify
-     "Creating an account on a new site requires you to log into that site using *the same credentials you used on existing sites.* For instance, if you used the Stack Exchange login method, you'd...
+    (with-temp-buffer
+      (sx-question-mode--insert-markdown
+       "Creating an account on a new site requires you to log into that site using *the same credentials you used on existing sites.* For instance, if you used the Stack Exchange login method, you'd...
 
 1. Click the \"Log in using Stack Exchange\" button:
 
@@ -187,6 +194,7 @@ after being run through `sx-question--tag-format'."
   [1]: http://i.stack.imgur.com/ktFTs.png
   [2]: http://i.stack.imgur.com/5l2AY.png
   [3]: http://i.stack.imgur.com/22myl.png")
+      (buffer-string))
     "Creating an account on a new site requires you to log into that site
 using *the same credentials you used on existing sites.* For instance,
 if you used the Stack Exchange login method, you'd...