TakeV
/
spacemacs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

tests: fix mocks for spacemacs/update-progress-bar

This commit is contained in:
syl20bnr 2018-07-05 00:02:17 -04:00
parent a861177c4a
commit 253a8ed413
1 changed files with 30 additions and 55 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

85
tests/core/core-configuration-layer-utest.el
View File

@ -2116,7 +2116,8 @@
(helper--add-layers `(,(cfgl-layer "layer1" :name 'layer1)) t) (helper--add-layers `(,(cfgl-layer "layer1" :name 'layer1)) t)
(defun layer1/init-pkg nil) (defun layer1/init-pkg nil)
(mocker-let (mocker-let
((spacemacs-buffer/message (m) ((:output nil))) ((spacemacs/update-progress-bar nil ((:output nil)))
(spacemacs-buffer/message (m) ((:output nil)))
(layer1/init-pkg nil ((:output nil :occur 1)))) (layer1/init-pkg nil ((:output nil :occur 1))))
(configuration-layer//configure-package pkg)))) (configuration-layer//configure-package pkg))))
@ -2136,7 +2137,8 @@
(defun layer2/pre-init-pkg () (push 'pre-init witness)) (defun layer2/pre-init-pkg () (push 'pre-init witness))
(defun layer3/post-init-pkg () (push 'post-init witness)) (defun layer3/post-init-pkg () (push 'post-init witness))
(mocker-let (mocker-let
((spacemacs-buffer/message (m) ((:output nil)))) ((spacemacs/update-progress-bar nil ((:output nil)))
(spacemacs-buffer/message (m) ((:output nil))))
(configuration-layer//configure-package pkg) (configuration-layer//configure-package pkg)
(should (equal '(init) witness))))) (should (equal '(init) witness)))))
@ -2156,7 +2158,8 @@
(defun layer2/pre-init-pkg () (push 'pre-init witness)) (defun layer2/pre-init-pkg () (push 'pre-init witness))
(defun layer3/post-init-pkg () (push 'post-init witness)) (defun layer3/post-init-pkg () (push 'post-init witness))
(mocker-let (mocker-let
((spacemacs-buffer/message (m) ((:output nil)))) ((spacemacs/update-progress-bar nil ((:output nil)))
(spacemacs-buffer/message (m) ((:output nil))))
(configuration-layer//pre-configure-package pkg) (configuration-layer//pre-configure-package pkg)
(configuration-layer//configure-package pkg) (configuration-layer//configure-package pkg)
(configuration-layer//post-configure-package pkg) (configuration-layer//post-configure-package pkg)
@ -2178,7 +2181,8 @@
(defun layer2/pre-init-pkg () (push 'pre-init witness)) (defun layer2/pre-init-pkg () (push 'pre-init witness))
(defun layer3/post-init-pkg () (push 'post-init witness)) (defun layer3/post-init-pkg () (push 'post-init witness))
(mocker-let (mocker-let
((spacemacs-buffer/message (m) ((:output nil)))) ((spacemacs/update-progress-bar nil ((:output nil)))
(spacemacs-buffer/message (m) ((:output nil))))
(configuration-layer//configure-package pkg) (configuration-layer//configure-package pkg)
(should (equal '(init) witness))))) (should (equal '(init) witness)))))
@ -2198,7 +2202,8 @@
(defun layer2/pre-init-pkg () (push 'pre-init witness)) (defun layer2/pre-init-pkg () (push 'pre-init witness))
(defun layer3/post-init-pkg () (push 'post-init witness)) (defun layer3/post-init-pkg () (push 'post-init witness))
(mocker-let (mocker-let
((spacemacs-buffer/message (m) ((:output nil)))) ((spacemacs/update-progress-bar nil ((:output nil)))
(spacemacs-buffer/message (m) ((:output nil))))
(configuration-layer//pre-configure-package pkg) (configuration-layer//pre-configure-package pkg)
(configuration-layer//configure-package pkg) (configuration-layer//configure-package pkg)
(should (equal '(init pre-init) witness))))) (should (equal '(init pre-init) witness)))))
@ -2220,11 +2225,8 @@
(helper--add-packages (list pkg) t) (helper--add-packages (list pkg) t)
(defun layer1/init-pkg () (push 'init witness)) (defun layer1/init-pkg () (push 'init witness))
(defun layer2/pre-init-pkg () (push 'pre-init witness)) (defun layer2/pre-init-pkg () (push 'pre-init witness))
(mocker-let (configuration-layer//configure-packages-2 `(,(oref pkg :name)))
(;; (spacemacs/update-progress-bar nil ((:output nil))) (should (equal '(init pre-init) witness))))
)
(configuration-layer//configure-packages-2 `(,(oref pkg :name)))
(should (equal '(init pre-init) witness)))))
(ert-deftest test-configure-packages-2--post-init-is-evaluated-after-init () (ert-deftest test-configure-packages-2--post-init-is-evaluated-after-init ()
(let ((pkg (cfgl-package "pkg" :name 'pkg :owners '(layer1) :post-layers '(layer2))) (let ((pkg (cfgl-package "pkg" :name 'pkg :owners '(layer1) :post-layers '(layer2)))
@ -2239,11 +2241,8 @@
(helper--add-packages (list pkg) t) (helper--add-packages (list pkg) t)
(defun layer1/init-pkg () (push 'init witness)) (defun layer1/init-pkg () (push 'init witness))
(defun layer2/post-init-pkg () (push 'post-init witness)) (defun layer2/post-init-pkg () (push 'post-init witness))
(mocker-let (configuration-layer//configure-packages-2 `(,(oref pkg :name)))
(;; (spacemacs/update-progress-bar nil ((:output nil))) (should (equal '(post-init init) witness))))
)
(configuration-layer//configure-packages-2 `(,(oref pkg :name)))
(should (equal '(post-init init) witness)))))
(ert-deftest test-configure-packages-2--package-w/-layer-owner-is-configured() (ert-deftest test-configure-packages-2--package-w/-layer-owner-is-configured()
(let ((pkg (cfgl-package "pkg" :name 'pkg :owners '(layer1))) (let ((pkg (cfgl-package "pkg" :name 'pkg :owners '(layer1)))
@ -2252,9 +2251,7 @@
(mocker-mock-default-record-cls 'mocker-stub-record)) (mocker-mock-default-record-cls 'mocker-stub-record))
(helper--add-packages (list pkg) t) (helper--add-packages (list pkg) t)
(mocker-let (mocker-let
((configuration-layer//configure-package (p) ((:occur 1))) ((configuration-layer//configure-package (p) ((:occur 1))))
;; (spacemacs/update-progress-bar nil ((:output nil)))
)
(configuration-layer//configure-packages-2 `(,(oref pkg :name)))))) (configuration-layer//configure-packages-2 `(,(oref pkg :name))))))
(ert-deftest test-configure-packages-2--site-package-is-configured() (ert-deftest test-configure-packages-2--site-package-is-configured()
@ -2264,9 +2261,7 @@
(mocker-mock-default-record-cls 'mocker-stub-record)) (mocker-mock-default-record-cls 'mocker-stub-record))
(helper--add-packages (list pkg) t) (helper--add-packages (list pkg) t)
(mocker-let (mocker-let
((configuration-layer//configure-package (p) ((:occur 1))) ((configuration-layer//configure-package (p) ((:occur 1))))
;; (spacemacs/update-progress-bar nil ((:output nil)))
)
(configuration-layer//configure-packages-2 `(,(oref pkg :name)))))) (configuration-layer//configure-packages-2 `(,(oref pkg :name))))))
(ert-deftest test-configure-packages-2--toggle-t-is-configured () (ert-deftest test-configure-packages-2--toggle-t-is-configured ()
@ -2276,9 +2271,7 @@
(mocker-mock-default-record-cls 'mocker-stub-record)) (mocker-mock-default-record-cls 'mocker-stub-record))
(helper--add-packages (list pkg) t) (helper--add-packages (list pkg) t)
(mocker-let (mocker-let
((configuration-layer//configure-package (p) ((:occur 1))) ((configuration-layer//configure-package (p) ((:occur 1))))
;; (spacemacs/update-progress-bar nil ((:output nil)))
)
(configuration-layer//configure-packages-2 `(,(oref pkg :name)))))) (configuration-layer//configure-packages-2 `(,(oref pkg :name))))))
(ert-deftest test-configure-packages-2--toggle-nil-is-not-configured () (ert-deftest test-configure-packages-2--toggle-nil-is-not-configured ()
@ -2289,7 +2282,6 @@
(helper--add-packages (list pkg) t) (helper--add-packages (list pkg) t)
(mocker-let (mocker-let
((configuration-layer//configure-package (p) nil) ((configuration-layer//configure-package (p) nil)
;; (spacemacs/update-progress-bar nil ((:output nil)))
(spacemacs-buffer/message (m) ((:output nil)))) (spacemacs-buffer/message (m) ((:output nil))))
(configuration-layer//configure-packages-2 `(,(oref pkg :name)))))) (configuration-layer//configure-packages-2 `(,(oref pkg :name))))))
@ -2300,9 +2292,7 @@
(mocker-mock-default-record-cls 'mocker-stub-record)) (mocker-mock-default-record-cls 'mocker-stub-record))
(helper--add-packages (list pkg) t) (helper--add-packages (list pkg) t)
(mocker-let (mocker-let
((configuration-layer//configure-package (p) ((:occur 1))) ((configuration-layer//configure-package (p) ((:occur 1))))
;; (spacemacs/update-progress-bar nil ((:output nil)))
)
(configuration-layer//configure-packages-2 `(,(oref pkg :name)))))) (configuration-layer//configure-packages-2 `(,(oref pkg :name))))))
(ert-deftest test-configure-packages-2--protected-excluded-package-is-configured() (ert-deftest test-configure-packages-2--protected-excluded-package-is-configured()
@ -2312,9 +2302,7 @@
(mocker-mock-default-record-cls 'mocker-stub-record)) (mocker-mock-default-record-cls 'mocker-stub-record))
(helper--add-packages (list pkg) t) (helper--add-packages (list pkg) t)
(mocker-let (mocker-let
((configuration-layer//configure-package (p) ((:occur 1))) ((configuration-layer//configure-package (p) ((:occur 1))))
;; (spacemacs/update-progress-bar nil ((:output nil)))
)
(configuration-layer//configure-packages-2 `(,(oref pkg :name)))))) (configuration-layer//configure-packages-2 `(,(oref pkg :name))))))
(ert-deftest test-configure-packages-2--excluded-package-is-not-configured() (ert-deftest test-configure-packages-2--excluded-package-is-not-configured()
@ -2325,7 +2313,6 @@
(helper--add-packages (list pkg) t) (helper--add-packages (list pkg) t)
(mocker-let (mocker-let
((configuration-layer//configure-package (p) nil) ((configuration-layer//configure-package (p) nil)
;; (spacemacs/update-progress-bar nil ((:output nil)))
(spacemacs-buffer/message (m) ((:output nil)))) (spacemacs-buffer/message (m) ((:output nil))))
(configuration-layer//configure-packages-2 `(,(oref pkg :name)))))) (configuration-layer//configure-packages-2 `(,(oref pkg :name))))))
@ -2337,7 +2324,6 @@
(helper--add-packages (list pkg) t) (helper--add-packages (list pkg) t)
(mocker-let (mocker-let
((configuration-layer//configure-package (p) nil) ((configuration-layer//configure-package (p) nil)
;; (spacemacs/update-progress-bar nil ((:output nil)))
(spacemacs-buffer/message (m) ((:output nil)))) (spacemacs-buffer/message (m) ((:output nil))))
(configuration-layer//configure-packages-2 `(,(oref pkg :name)))))) (configuration-layer//configure-packages-2 `(,(oref pkg :name))))))
@ -2350,7 +2336,6 @@
(helper--add-packages (list pkg) t) (helper--add-packages (list pkg) t)
(mocker-let (mocker-let
((configuration-layer//configure-package (p) nil) ((configuration-layer//configure-package (p) nil)
;; (spacemacs/update-progress-bar nil ((:output nil)))
(spacemacs-buffer/message (m) ((:output nil)))) (spacemacs-buffer/message (m) ((:output nil))))
(configuration-layer//configure-packages-2 `(,(oref pkg :name)))))) (configuration-layer//configure-packages-2 `(,(oref pkg :name))))))
@ -2362,7 +2347,6 @@
(helper--add-packages (list pkg) t) (helper--add-packages (list pkg) t)
(mocker-let (mocker-let
((configuration-layer//configure-package (p) nil) ((configuration-layer//configure-package (p) nil)
;; (spacemacs/update-progress-bar nil ((:output nil)))
(spacemacs-buffer/message (m) ((:output nil)))) (spacemacs-buffer/message (m) ((:output nil))))
(configuration-layer//configure-packages-2 `(,(oref pkg :name)))))) (configuration-layer//configure-packages-2 `(,(oref pkg :name))))))
@ -2378,8 +2362,7 @@
(helper--add-layers `(,(cfgl-layer "layer1" :name 'layer1 :dir "/path/")) t) (helper--add-layers `(,(cfgl-layer "layer1" :name 'layer1 :dir "/path/")) t)
(helper--add-packages (list pkg) t) (helper--add-packages (list pkg) t)
(mocker-let (mocker-let
(;; (spacemacs/update-progress-bar nil ((:output nil))) ((configuration-layer//configure-package (p) ((:occur 1))))
(configuration-layer//configure-package (p) ((:occur 1))))
(configuration-layer//configure-packages-2 `(,(oref pkg :name))) (configuration-layer//configure-packages-2 `(,(oref pkg :name)))
(push "/path/local/pkg/" expected-load-path) (push "/path/local/pkg/" expected-load-path)
(should (equal expected-load-path load-path))))) (should (equal expected-load-path load-path)))))
@ -2392,14 +2375,11 @@
(expected-load-path load-path) (expected-load-path load-path)
(mocker-mock-default-record-cls 'mocker-stub-record)) (mocker-mock-default-record-cls 'mocker-stub-record))
(helper--add-packages (list pkg) t) (helper--add-packages (list pkg) t)
(mocker-let (configuration-layer//configure-packages-2 `(,(oref pkg :name)))
(;; (spacemacs/update-progress-bar nil ((:output nil))) (push (file-name-as-directory
) (concat spacemacs-private-directory "local/pkg"))
(configuration-layer//configure-packages-2 `(,(oref pkg :name))) expected-load-path)
(push (file-name-as-directory (should (equal expected-load-path load-path))))
(concat spacemacs-private-directory "local/pkg"))
expected-load-path)
(should (equal expected-load-path load-path)))))
(ert-deftest (ert-deftest
test-configure-packages-2--local-package-w/o-owner-doesnt-update-load-path() test-configure-packages-2--local-package-w/o-owner-doesnt-update-load-path()
@ -2410,8 +2390,7 @@
(mocker-mock-default-record-cls 'mocker-stub-record)) (mocker-mock-default-record-cls 'mocker-stub-record))
(helper--add-packages (list pkg) t) (helper--add-packages (list pkg) t)
(mocker-let (mocker-let
(;; (spacemacs/update-progress-bar nil ((:output nil))) ((spacemacs-buffer/message (m) ((:output nil))))
(spacemacs-buffer/message (m) ((:output nil))))
(configuration-layer//configure-packages-2 `(,(oref pkg :name))) (configuration-layer//configure-packages-2 `(,(oref pkg :name)))
(should (equal load-path old-load-path))))) (should (equal load-path old-load-path)))))
@ -2426,12 +2405,9 @@
(expected-load-path load-path) (expected-load-path load-path)
(mocker-mock-default-record-cls 'mocker-stub-record)) (mocker-mock-default-record-cls 'mocker-stub-record))
(helper--add-packages (list pkg) t) (helper--add-packages (list pkg) t)
(mocker-let (configuration-layer//configure-packages-2 `(,(oref pkg :name)))
(;; (spacemacs/update-progress-bar nil ((:output nil))) (push spacemacs-docs-directory expected-load-path)
) (should (equal expected-load-path load-path))))
(configuration-layer//configure-packages-2 `(,(oref pkg :name)))
(push spacemacs-docs-directory expected-load-path)
(should (equal expected-load-path load-path)))))
(ert-deftest (ert-deftest
test-configure-packages-2--local-package-w/-bad-string-location-gives-warning() test-configure-packages-2--local-package-w/-bad-string-location-gives-warning()
@ -2444,8 +2420,7 @@
(mocker-mock-default-record-cls 'mocker-stub-record)) (mocker-mock-default-record-cls 'mocker-stub-record))
(helper--add-packages (list pkg) t) (helper--add-packages (list pkg) t)
(mocker-let (mocker-let
(;; (spacemacs/update-progress-bar nil ((:output nil))) ((configuration-layer//warning
(configuration-layer//warning
(msg &rest args) (msg &rest args)
((:record-cls 'mocker-stub-record :output nil :occur 1)))) ((:record-cls 'mocker-stub-record :output nil :occur 1))))
(configuration-layer//configure-packages-2 `(,(oref pkg :name)))))) (configuration-layer//configure-packages-2 `(,(oref pkg :name))))))