diff options
Diffstat (limited to 'tests/test-prog-webdev-format.el')
| -rw-r--r-- | tests/test-prog-webdev-format.el | 97 |
1 files changed, 66 insertions, 31 deletions
diff --git a/tests/test-prog-webdev-format.el b/tests/test-prog-webdev-format.el index 5abb1f52..694f9e96 100644 --- a/tests/test-prog-webdev-format.el +++ b/tests/test-prog-webdev-format.el @@ -2,9 +2,12 @@ ;;; Commentary: ;; Covers the prettier-formatting path in `modules/prog-webdev.el': -;; - `cj/--webdev-format-command' (pure: file -> "prettier --stdin-filepath ...") -;; - `cj/webdev-format-buffer' (interactive wrapper; `executable-find' and -;; `shell-command-on-region' stubbed) +;; - `cj/--webdev-format-args' (pure: file -> ("--stdin-filepath" file)) +;; - `cj/webdev-format-buffer' (interactive wrapper; `executable-find' and +;; `call-process-region' stubbed) +;; +;; The formatter now runs prettier via `call-process-region' with an +;; explicit argv list (no shell), so there is no command string to quote. ;; ;; `cj/webdev-keybindings' (the C-; f mount) is already covered by ;; `test-prog-webdev--format-wiring.el'. @@ -21,70 +24,102 @@ (format-test--ensure-packages-init) (require 'prog-webdev) -;; --------------------------- cj/--webdev-format-command ---------------------- +;; --------------------------- cj/--webdev-format-args ------------------------- -(ert-deftest test-prog-webdev--format-command-normal () - "Normal: a plain .ts path yields the stdin-filepath prettier command." - (should (equal "prettier --stdin-filepath /home/me/app.ts" - (cj/--webdev-format-command "/home/me/app.ts")))) +(ert-deftest test-prog-webdev--format-args-normal () + "Normal: a plain .ts path yields the stdin-filepath argv list." + (should (equal '("--stdin-filepath" "/home/me/app.ts") + (cj/--webdev-format-args "/home/me/app.ts")))) -(ert-deftest test-prog-webdev--format-command-spaces-quoted () - "Boundary: a path with spaces is shell-quoted." - (should (equal (format "prettier --stdin-filepath %s" - (shell-quote-argument "/home/me/my app/index.tsx")) - (cj/--webdev-format-command "/home/me/my app/index.tsx")))) +(ert-deftest test-prog-webdev--format-args-spaces-not-quoted () + "Boundary: a path with spaces is passed verbatim — argv needs no quoting." + (should (equal '("--stdin-filepath" "/home/me/my app/index.tsx") + (cj/--webdev-format-args "/home/me/my app/index.tsx")))) -(ert-deftest test-prog-webdev--format-command-tsx-extension () +(ert-deftest test-prog-webdev--format-args-tsx-extension () "Boundary: a .tsx path is passed through (prettier infers the parser)." - (should (equal "prettier --stdin-filepath /x/Component.tsx" - (cj/--webdev-format-command "/x/Component.tsx")))) + (should (equal '("--stdin-filepath" "/x/Component.tsx") + (cj/--webdev-format-args "/x/Component.tsx")))) ;; ---------------------------- cj/webdev-format-buffer ------------------------ (ert-deftest test-prog-webdev-format-buffer-runs-prettier-on-the-file () - "Normal: with prettier on PATH, the region command targets `buffer-file-name'." - (let (cmd) + "Normal: with prettier on PATH, the argv targets `buffer-file-name'." + (let (program args) (cl-letf (((symbol-function 'executable-find) (lambda (_p) "/usr/bin/prettier")) - ((symbol-function 'shell-command-on-region) - (lambda (_start _end command &rest _) (setq cmd command)))) + ((symbol-function 'call-process-region) + (lambda (_start _end prog &rest rest) + ;; rest = (DELETE BUFFER DISPLAY &rest ARGS) + (setq program prog + args (nthcdr 3 rest)) + 0))) (with-temp-buffer (insert "const x=1\n") (setq buffer-file-name "/home/me/app.ts") (cj/webdev-format-buffer) (setq buffer-file-name nil))) - (should (equal (cj/--webdev-format-command "/home/me/app.ts") cmd)))) + (should (equal "prettier" program)) + (should (equal '("--stdin-filepath" "/home/me/app.ts") args)))) (ert-deftest test-prog-webdev-format-buffer-falls-back-to-file-ts () "Boundary: a buffer with no file uses the \"file.ts\" filename hint." - (let (cmd) + (let (args) (cl-letf (((symbol-function 'executable-find) (lambda (_p) "/usr/bin/prettier")) - ((symbol-function 'shell-command-on-region) - (lambda (_start _end command &rest _) (setq cmd command)))) + ((symbol-function 'call-process-region) + (lambda (_start _end _prog &rest rest) + (setq args (nthcdr 3 rest)) + 0))) (with-temp-buffer (insert "const x=1\n") (should-not buffer-file-name) (cj/webdev-format-buffer))) - (should (equal (cj/--webdev-format-command "file.ts") cmd)))) + (should (equal '("--stdin-filepath" "file.ts") args)))) (ert-deftest test-prog-webdev-format-buffer-clamps-point-to-point-max () "Boundary: after a format that shrinks the buffer, point clamps to point-max." (cl-letf (((symbol-function 'executable-find) (lambda (_p) "/usr/bin/prettier")) - ((symbol-function 'shell-command-on-region) - (lambda (_start _end _command &rest _) - (delete-region (point-min) (point-max)) - (insert "x")))) + ((symbol-function 'call-process-region) + (lambda (_start _end _prog _delete buffer &rest _) + ;; Simulate prettier writing a shorter result to the output buffer. + (with-current-buffer buffer (insert "x")) + 0))) (with-temp-buffer (insert "a really long original buffer body that prettier will shorten\n") (goto-char 40) (cj/webdev-format-buffer) (should (= (point) (point-max)))))) +(ert-deftest test-prog-webdev-format-buffer-replaces-on-success () + "Normal: a zero exit replaces the buffer with the formatter's output." + (cl-letf (((symbol-function 'executable-find) (lambda (_p) "/usr/bin/prettier")) + ((symbol-function 'call-process-region) + (lambda (_start _end _prog _delete buffer &rest _) + (with-current-buffer buffer (insert "const x = 1;\n")) + 0))) + (with-temp-buffer + (insert "const x=1\n") + (cj/webdev-format-buffer) + (should (string= (buffer-string) "const x = 1;\n"))))) + +(ert-deftest test-prog-webdev-format-buffer-no-clobber-on-failure () + "Error: a non-zero exit leaves the buffer untouched and signals an error." + (cl-letf (((symbol-function 'executable-find) (lambda (_p) "/usr/bin/prettier")) + ((symbol-function 'call-process-region) + (lambda (_start _end _prog _delete buffer &rest _) + (with-current-buffer buffer (insert "[error] syntax error")) + 1))) + (with-temp-buffer + (insert "const x=1\n") + (should-error (cj/webdev-format-buffer) :type 'user-error) + ;; Buffer must still hold the original source, not the error text. + (should (string= (buffer-string) "const x=1\n"))))) + (ert-deftest test-prog-webdev-format-buffer-errors-without-prettier () "Error: prettier missing -> `user-error', nothing shells out." (let ((ran nil)) (cl-letf (((symbol-function 'executable-find) (lambda (_p) nil)) - ((symbol-function 'shell-command-on-region) - (lambda (&rest _) (setq ran t)))) + ((symbol-function 'call-process-region) + (lambda (&rest _) (setq ran t) 0))) (with-temp-buffer (should-error (cj/webdev-format-buffer) :type 'user-error))) (should-not ran))) |