From d3782adb31342d3b25d997a0f4fe79e41ff97c11 Mon Sep 17 00:00:00 2001
From: Craig Jennings <c@cjennings.net>
Date: Sat, 20 Jun 2026 12:40:21 -0400
Subject: refactor(erc): lift cj/erc-generate-buffer-name out of :config

The buffer-name function lived inside the erc use-package :config, so it was unreachable under make test (no package-initialize). Move it to top level; :config keeps the erc-generate-buffer-name-function setq. Adds unit coverage for the server-and-channel, server-only, and missing-piece cases.
---
 modules/erc-config.el                          | 18 +++++++--------
 tests/test-erc-config--generate-buffer-name.el | 31 ++++++++++++++++++++++++++
 2 files changed, 40 insertions(+), 9 deletions(-)
 create mode 100644 tests/test-erc-config--generate-buffer-name.el

diff --git a/modules/erc-config.el b/modules/erc-config.el
index 067b1e577..c0fa9c325 100644
--- a/modules/erc-config.el
+++ b/modules/erc-config.el
@@ -184,6 +184,14 @@ Auto-adds # prefix if missing.  Offers completion from configured channels."
 		  (erc-join-channel channel)))
 	(message "Failed to establish an active ERC connection")))
 
+(defun cj/erc-generate-buffer-name (parms)
+  "Generate buffer name in the format SERVER-CHANNEL."
+  (let ((network (plist-get parms :server))
+        (target (plist-get parms :target)))
+    (if target
+        (concat (or network "") "-" (or target ""))
+      (or network ""))))
+
 ;; Keymap for ERC commands (must be defined before use-package erc)
 (defvar-keymap cj/erc-keymap
   :doc "Keymap for ERC-related commands"
@@ -259,15 +267,7 @@ Auto-adds # prefix if missing.  Offers completion from configured channels."
   ;; Note: erc-rename-buffers is obsolete as of Emacs 29.1 (old behavior is now permanent)
   (setq erc-unique-buffers t)
 
-  ;; Custom buffer naming function
-  (defun cj/erc-generate-buffer-name (parms)
-	"Generate buffer name in the format SERVER-CHANNEL."
-	(let ((network (plist-get parms :server))
-		  (target (plist-get parms :target)))
-	  (if target
-		  (concat (or network "") "-" (or target ""))
-		(or network ""))))
-
+  ;; Custom buffer naming (cj/erc-generate-buffer-name is defined at top level)
   (setq erc-generate-buffer-name-function 'cj/erc-generate-buffer-name)
 
   ;; Configure erc-track (show channel activity in modeline)
diff --git a/tests/test-erc-config--generate-buffer-name.el b/tests/test-erc-config--generate-buffer-name.el
new file mode 100644
index 000000000..cbc716c82
--- /dev/null
+++ b/tests/test-erc-config--generate-buffer-name.el
@@ -0,0 +1,31 @@
+;;; test-erc-config--generate-buffer-name.el --- Tests for cj/erc-generate-buffer-name -*- lexical-binding: t; -*-
+
+;;; Commentary:
+;; cj/erc-generate-buffer-name formats an ERC buffer name as SERVER-CHANNEL.
+;; It was defined inside the erc use-package :config (so unreachable under
+;; `make test'); lifting it to top level makes it unit-testable.
+
+;;; Code:
+
+(require 'ert)
+
+(add-to-list 'load-path (expand-file-name "modules" user-emacs-directory))
+(require 'erc-config)
+
+(ert-deftest test-erc-generate-buffer-name-server-and-channel ()
+  "Normal: a target yields SERVER-CHANNEL."
+  (should (equal (cj/erc-generate-buffer-name '(:server "libera" :target "#emacs"))
+                 "libera-#emacs")))
+
+(ert-deftest test-erc-generate-buffer-name-server-only ()
+  "Boundary: no target yields just the server name."
+  (should (equal (cj/erc-generate-buffer-name '(:server "libera"))
+                 "libera")))
+
+(ert-deftest test-erc-generate-buffer-name-missing-pieces ()
+  "Boundary: missing server/target degrade to empty strings, not nil."
+  (should (equal (cj/erc-generate-buffer-name '(:target "#emacs")) "-#emacs"))
+  (should (equal (cj/erc-generate-buffer-name '()) "")))
+
+(provide 'test-erc-config--generate-buffer-name)
+;;; test-erc-config--generate-buffer-name.el ends here
-- 
cgit v1.2.3