aboutsummaryrefslogtreecommitdiff
path: root/tests/test-prog-json--json-format-buffer.el
diff options
context:
space:
mode:
authorCraig Jennings <c@cjennings.net>2026-05-25 18:05:55 -0500
committerCraig Jennings <c@cjennings.net>2026-05-25 18:05:55 -0500
commit1ca28f229eb360498b93bd048ef745f32f7761e1 (patch)
tree0395c87d4a25f7223c6c0b3ae7c7f384e14203cd /tests/test-prog-json--json-format-buffer.el
parent9ed2af69be43d889f59ae1ca262af40405c481c5 (diff)
downloaddotemacs-1ca28f229eb360498b93bd048ef745f32f7761e1.tar.gz
dotemacs-1ca28f229eb360498b93bd048ef745f32f7761e1.zip
refactor(prog): run JSON/YAML/webdev formatters via argv, not a shell
cj/json-format-buffer, cj/yaml-format-buffer, and cj/webdev-format-buffer ran their formatters through shell-command-on-region, which goes via a shell. I moved each to call-process-region with an explicit program and argv list, so a filename or buffer content can't be word-split or read as shell syntax. The webdev path dropped its shell-quote-argument dance once the filename became a plain argv element. Point preservation is unchanged. One deliberate improvement, and it's tested: shell-command-on-region with replace replaced the buffer with the formatter's error text on a non-zero exit. The new per-formatter helper captures output to a temp buffer, checks the exit code, replaces only on success, and otherwise raises a user-error carrying stderr — so a failed format leaves the buffer alone. I kept a small format-region helper in each of the three modules rather than one shared helper. They have no common module to live in short of system-lib, and coupling three unrelated domain modules through it wasn't worth saving sixteen lines.
Diffstat (limited to 'tests/test-prog-json--json-format-buffer.el')
-rw-r--r--tests/test-prog-json--json-format-buffer.el31
1 files changed, 31 insertions, 0 deletions
diff --git a/tests/test-prog-json--json-format-buffer.el b/tests/test-prog-json--json-format-buffer.el
index 227eafb9..70d7e98b 100644
--- a/tests/test-prog-json--json-format-buffer.el
+++ b/tests/test-prog-json--json-format-buffer.el
@@ -7,9 +7,40 @@
;;; Code:
(require 'ert)
+(require 'cl-lib)
(require 'json)
(require 'prog-json)
+;;; argv path — process invocation (stubbed, no shell)
+
+(ert-deftest test-prog-json--json-format-buffer-invokes-jq-argv ()
+ "Normal: with jq present, the formatter calls jq via argv, no shell."
+ (let (program args)
+ (cl-letf (((symbol-function 'executable-find) (lambda (_p) "/usr/bin/jq"))
+ ((symbol-function 'call-process-region)
+ (lambda (_start _end prog &rest rest)
+ (setq program prog
+ args (nthcdr 3 rest))
+ (with-current-buffer (nth 1 rest) (insert "{}"))
+ 0)))
+ (with-temp-buffer
+ (insert "{\"a\":1}")
+ (cj/json-format-buffer)))
+ (should (equal "jq" program))
+ (should (equal '("--sort-keys" ".") args))))
+
+(ert-deftest test-prog-json--json-format-buffer-no-clobber-on-failure ()
+ "Error: a non-zero jq exit leaves the buffer untouched and signals an error."
+ (cl-letf (((symbol-function 'executable-find) (lambda (_p) "/usr/bin/jq"))
+ ((symbol-function 'call-process-region)
+ (lambda (_start _end _prog _delete buffer &rest _)
+ (with-current-buffer buffer (insert "jq: parse error"))
+ 1)))
+ (with-temp-buffer
+ (insert "{not valid json}")
+ (should-error (cj/json-format-buffer) :type 'user-error)
+ (should (string= (buffer-string) "{not valid json}")))))
+
;;; Normal Cases — jq path
(ert-deftest test-prog-json--json-format-buffer-normal-formats-object ()