summaryrefslogtreecommitdiff
blob: 2af36a3560cd30d582a36afa584af5458ecc31e6 (plain)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
From 108d2298cc34d906b196178ad955e3dc139e1779 Mon Sep 17 00:00:00 2001
From: Philipp Stephani <phst@google.com>
Date: Mon, 6 Dec 2021 15:39:53 +0100
Subject: [PATCH] Fix property comparisons in unit tests.
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Before Emacs 29, ‘equal-including-properties’ should not be used to compare
propertized strings due to https://debbugs.gnu.org/cgi/bugreport.cgi?bug=6581.
ERT provides a replacement ‘ert-equal-including-properties’.
---
 tests/test-buttercup.el | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/tests/test-buttercup.el b/tests/test-buttercup.el
index bda3e6f..4b73b78 100644
--- a/tests/test-buttercup.el
+++ b/tests/test-buttercup.el
@@ -1,6 +1,6 @@
 ;;; buttercup-test.el --- Tests for buttercup.el -*-lexical-binding:t-*-
 
-;; Copyright (C) 2015  Jorgen Schaefer <contact@jorgenschaefer.de>
+;; Copyright (C) 2015, 2021  Jorgen Schaefer <contact@jorgenschaefer.de>
 
 ;; This program is free software; you can redistribute it and/or
 ;; modify it under the terms of the GNU General Public License
@@ -27,6 +27,7 @@
 (require 'autoload)
 (require 'ansi-color)
 (require 'ert)
+(require 'ert-x)
 (require 'cl-lib)
 (require 'imenu)
 
@@ -1117,7 +1118,7 @@ text properties using `ansi-color-apply'."
 ;;;;;;;;;;;;;
 ;;; Reporters
 (buttercup-define-matcher-for-binary-function
-    :to-equal-including-properties equal-including-properties)
+    :to-equal-including-properties ert-equal-including-properties)
 
 (describe "The batch reporters"
   :var (print-buffer)