Merge branch 'master' into more-tests

Conflicts:
	Makefile
	test/tests.el

1 files changed, 24 insertions, 2 deletions

diff --git a/test/test-macros.el b/test/test-macros.el
index 2169088..1634603 100644
--- a/test/test-macros.el
+++ b/test/test-macros.el
@@ -9,14 +9,36 @@
   "Test `sx-assoc-let'"
   (sx-test-with-json-data data
     (should
-     (null (let-alist data .site))))
+     (null (let-alist data .site_par))))
 
   (sx-test-with-json-data data
     (should
-     (equal (sx-assoc-let data .site)
+     (equal (sx-assoc-let data .site_par)
             "meta.emacs")))
 
   (sx-test-with-json-data data
     (should
      (equal (sx-assoc-let data (cons .test-one .test-two))
             '(1 . 2)))))
+
+(ert-deftest macro-test--sx-filter-from-nil ()
+  "Test `sx-filter-from-nil'"
+  (should
+   (equal
+    (sx-filter-from-nil
+     (one two (three four five) (six seven)
+          (a b c d e)))
+    '((one two three.four three.five six.seven
+           a.b a.c a.d a.e
+           .backoff
+           .error_id
+           .error_message
+           .error_name
+           .has_more
+           .items
+           .page
+           .page_size
+           .quota_max
+           .quota_remaining
+           .total)
+      nil none))))