1 files changed, 79 insertions, 0 deletions
diff --git a/tests/test-calendar-sync--apply-single-exception.el b/tests/test-calendar-sync--apply-single-exception.el
index 2fcf7c718..f23104d98 100644
--- a/tests/test-calendar-sync--apply-single-exception.el
+++ b/tests/test-calendar-sync--apply-single-exception.el
@@ -63,5 +63,84 @@
     (let ((result (calendar-sync--apply-single-exception occ exc)))
       (should (equal "Keep" (plist-get result :summary))))))
 
+;;; Normal Cases — remaining overridable fields
+
+(ert-deftest test-calendar-sync--apply-single-exception-overrides-description ()
+  "Normal: an exception :description overrides the occurrence's."
+  (let ((occ (list :start '(2026 3 15 14 0) :description "old"))
+        (exc (list :start '(2026 3 15 14 0) :description "new")))
+    (should (equal "new"
+                   (plist-get (calendar-sync--apply-single-exception occ exc)
+                              :description)))))
+
+(ert-deftest test-calendar-sync--apply-single-exception-overrides-location ()
+  "Normal: an exception :location overrides the occurrence's."
+  (let ((occ (list :start '(2026 3 15 14 0) :location "Room A"))
+        (exc (list :start '(2026 3 15 14 0) :location "Room B")))
+    (should (equal "Room B"
+                   (plist-get (calendar-sync--apply-single-exception occ exc)
+                              :location)))))
+
+(ert-deftest test-calendar-sync--apply-single-exception-overrides-attendees ()
+  "Normal: an exception :attendees overrides the occurrence's."
+  (let ((occ (list :start '(2026 3 15 14 0) :attendees '("a")))
+        (exc (list :start '(2026 3 15 14 0) :attendees '("b" "c"))))
+    (should (equal '("b" "c")
+                   (plist-get (calendar-sync--apply-single-exception occ exc)
+                              :attendees)))))
+
+(ert-deftest test-calendar-sync--apply-single-exception-overrides-organizer ()
+  "Normal: an exception :organizer overrides the occurrence's."
+  (let ((occ (list :start '(2026 3 15 14 0) :organizer "old@x"))
+        (exc (list :start '(2026 3 15 14 0) :organizer "new@x")))
+    (should (equal "new@x"
+                   (plist-get (calendar-sync--apply-single-exception occ exc)
+                              :organizer)))))
+
+(ert-deftest test-calendar-sync--apply-single-exception-overrides-url ()
+  "Normal: an exception :url overrides the occurrence's."
+  (let ((occ (list :start '(2026 3 15 14 0) :url "http://old"))
+        (exc (list :start '(2026 3 15 14 0) :url "http://new")))
+    (should (equal "http://new"
+                   (plist-get (calendar-sync--apply-single-exception occ exc)
+                              :url)))))
+
+;;; Status re-derivation from overridden attendees (chime handoff 2026-06-24)
+
+(ert-deftest test-calendar-sync--apply-single-exception-declined-occurrence-rederives-status ()
+  "Normal: a declined single occurrence re-derives :status from the override attendees."
+  (let ((calendar-sync-user-emails '("craig@example.com"))
+        (occ (list :start '(2026 6 24 16 0) :status "accepted" :uid "abc"))
+        (exc (list :start '(2026 6 24 16 0)
+                   :attendees (list (list :email "craig@example.com" :partstat "DECLINED")))))
+    (should (equal "declined"
+                   (plist-get (calendar-sync--apply-single-exception occ exc) :status)))))
+
+(ert-deftest test-calendar-sync--apply-single-exception-no-attendee-override-keeps-status ()
+  "Boundary: an exception with no attendee block leaves the inherited :status intact."
+  (let ((calendar-sync-user-emails '("craig@example.com"))
+        (occ (list :start '(2026 6 24 16 0) :status "accepted" :uid "abc"))
+        (exc (list :start '(2026 6 24 16 0) :summary "Moved")))
+    (should (equal "accepted"
+                   (plist-get (calendar-sync--apply-single-exception occ exc) :status)))))
+
+(ert-deftest test-calendar-sync--apply-single-exception-accepted-override-stays-accepted ()
+  "Normal: an accepted attendee override keeps :status accepted."
+  (let ((calendar-sync-user-emails '("craig@example.com"))
+        (occ (list :start '(2026 6 24 16 0) :status "accepted" :uid "abc"))
+        (exc (list :start '(2026 6 24 16 0)
+                   :attendees (list (list :email "craig@example.com" :partstat "ACCEPTED")))))
+    (should (equal "accepted"
+                   (plist-get (calendar-sync--apply-single-exception occ exc) :status)))))
+
+(ert-deftest test-calendar-sync--apply-single-exception-override-without-user-keeps-status ()
+  "Boundary: override attendees that don't include the user leave :status intact."
+  (let ((calendar-sync-user-emails '("craig@example.com"))
+        (occ (list :start '(2026 6 24 16 0) :status "accepted" :uid "abc"))
+        (exc (list :start '(2026 6 24 16 0)
+                   :attendees (list (list :email "someone@else.com" :partstat "DECLINED")))))
+    (should (equal "accepted"
+                   (plist-get (calendar-sync--apply-single-exception occ exc) :status)))))
+
 (provide 'test-calendar-sync--apply-single-exception)
 ;;; test-calendar-sync--apply-single-exception.el ends here