From d525b5502bc280516f8984202b0c7322b74e86d8 Mon Sep 17 00:00:00 2001
From: Henrik Lissner <henrik@lissner.net>
Date: Thu, 5 Dec 2019 19:50:38 -0500
Subject: [PATCH] Update tests with new arg for doom-initialize

---
 core/cli/test.el       |  2 +-
 core/test/test-core.el | 25 ++++++++++++-------------
 2 files changed, 13 insertions(+), 14 deletions(-)

diff --git a/core/cli/test.el b/core/cli/test.el
index d42c22045..1b307f9ea 100644
--- a/core/cli/test.el
+++ b/core/cli/test.el
@@ -11,7 +11,7 @@
 (defcli! test (&rest targets)
   "Run Doom unit tests."
   :bare t
-  (doom-initialize 'force)
+  (doom-initialize 'force 'noerror)
   (require 'ansi-color)
   (let (files read-files)
     (unless targets
diff --git a/core/test/test-core.el b/core/test/test-core.el
index 6b9305c13..8a0844cd5 100644
--- a/core/test/test-core.el
+++ b/core/test/test-core.el
@@ -13,15 +13,15 @@
         (setq doom-init-p nil))
 
       (it "initializes once"
-        (expect (doom-initialize))
-        (expect (not (doom-initialize)))
-        (expect (not (doom-initialize)))
+        (expect (doom-initialize nil 'noerror))
+        (expect (not (doom-initialize nil 'noerror)))
+        (expect (not (doom-initialize nil 'noerror)))
         (expect doom-init-p))
 
       (it "initializes multiple times, if forced"
-        (expect (doom-initialize))
-        (expect (not (doom-initialize)))
-        (expect (doom-initialize 'force)))
+        (expect (doom-initialize nil 'noerror))
+        (expect (not (doom-initialize nil 'noerror)))
+        (expect (doom-initialize 'force 'noerror)))
 
       (describe "package initialization"
         (before-each
@@ -29,18 +29,18 @@
 
         (it "initializes packages if core autoload file doesn't exist"
           (let ((doom-autoload-file "doesnotexist"))
-            (doom-initialize))
+            (expect (doom-initialize nil 'noerror))
           (expect 'doom-initialize-packages :to-have-been-called))
 
         (it "doesn't initialize packages if core autoload file was loaded"
           (let ((doom-interactive-mode t))
             (spy-on 'doom-load-autoloads-file :and-return-value t)
-            (doom-initialize)
+            (doom-initialize nil 'noerror)
             (expect 'doom-load-autoloads-file :to-have-been-called-with doom-package-autoload-file)
             (expect 'doom-initialize-packages :to-have-been-called)))
 
         (it "initializes packages when forced"
-          (doom-initialize 'force)
+          (doom-initialize 'force 'noerror)
           (expect 'doom-initialize-packages :to-have-been-called)))
 
       (describe "autoloads files"
@@ -49,15 +49,14 @@
           (spy-on 'warn :and-return-value t))
 
         (it "loads autoloads files"
-          (ignore-errors (doom-initialize))
+          (ignore-errors (doom-initialize nil 'noerror))
           (expect 'doom-load-autoloads-file
                   :to-have-been-called-with doom-autoload-file)
           (expect 'doom-load-autoloads-file
                   :to-have-been-called-with doom-package-autoload-file))
 
-        (it "throws doom-autoload-error in interactive session where autoload files don't exist"
-          (let ((doom-interactive-mode t)
-                (doom-autoload-file "doesnotexist")
+        (it "throws doom-autoload-error when autoload files don't exist"
+          (let ((doom-autoload-file "doesnotexist")
                 (doom-package-autoload-file "doesnotexist"))
             (expect (doom-initialize) :to-throw 'doom-autoload-error)))))