From 88406bb11a6faa6d688852e73779c22a06ff28fc Mon Sep 17 00:00:00 2001
From: Henrik Lissner <henrik@lissner.net>
Date: Wed, 24 Apr 2019 18:07:17 -0400
Subject: [PATCH] Fix unit test runner

---
 core/cli/test.el     |  6 +++---
 core/core-modules.el | 12 ++++++------
 init.test.el         |  8 ++++----
 3 files changed, 13 insertions(+), 13 deletions(-)

diff --git a/core/cli/test.el b/core/cli/test.el
index 3d44c34dd..cb5e32c23 100644
--- a/core/cli/test.el
+++ b/core/cli/test.el
@@ -15,9 +15,9 @@ command line args following a double dash (each arg should be in the
 If neither is available, run all tests in all enabled modules."
   ;; Core libraries aren't fully loaded in a noninteractive session, so we
   ;; reload it with `noninteractive' set to nil to force them to.
-  (quiet! (doom-reload-autoloads))
-  (let ((doom-modules (doom-modules))
-        noninteractive)
+  (let* ((noninteractive t)
+         (doom-modules (doom-modules)))
+    (quiet! (doom-reload-autoloads))
     (let ((target-paths
            ;; Convert targets into a list of string paths, pointing to the root
            ;; directory of modules
diff --git a/core/core-modules.el b/core/core-modules.el
index 763a1e6c6..8b7d4f66b 100644
--- a/core/core-modules.el
+++ b/core/core-modules.el
@@ -433,12 +433,12 @@ module."
          (module-path (doom-module-locate-path ,category ',module)))
      (doom-module-set
       ,category ',module
-      ,@(let ((plist (doom-module-get category module)))
-          (when flags
-            (plist-put plist :flags flags))
-          (unless (plist-member plist :path)
-            (plist-put plist :path (doom-module-locate-path category module)))
-          plist))
+      (let ((plist (doom-module-get ,category ',module)))
+        ,(when flags
+           `(plist-put plist :flags `,flags))
+        (unless (plist-member plist :path)
+          (plist-put plist :path ,(doom-module-locate-path category module)))
+        plist))
      (if (directory-name-p module-path)
          (condition-case-unless-debug ex
              (let ((doom--current-module ',(cons category module))
diff --git a/init.test.el b/init.test.el
index 1d150befc..85e39d13d 100644
--- a/init.test.el
+++ b/init.test.el
@@ -1,13 +1,13 @@
 ;;; init.test.el -- for automated unit tests -*- lexical-binding: t; -*-
 
-(doom! :feature
-       evil
-       workspaces
-       :completion
+(doom! :completion
        company
        :ui
        doom-dashboard
        popup
+       workspaces
+       :editor
+       evil
        :tools
        password-store
        :lang