From 4b4ab6ee5e6e6116b8380fec871cc6b3c35c08ef Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Kirill=20M=C3=BCller?= <kirill@cynkra.com>
Date: Sun, 4 Feb 2024 16:54:16 +0100
Subject: [PATCH 1/2] Align snapshot tests

---
 tests/testthat/_snaps/context.md   | 2 +-
 tests/testthat/_snaps/summarise.md | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/tests/testthat/_snaps/context.md b/tests/testthat/_snaps/context.md
index a0b60d1fd4..08b03fb5be 100644
--- a/tests/testthat/_snaps/context.md
+++ b/tests/testthat/_snaps/context.md
@@ -40,5 +40,5 @@
     Code
       group_labels_details(c(a = 1, b = 2))
     Output
-      [1] "`a = 1`, `b = 2`"
+      [1] "`a = 1` and `b = 2`"
 
diff --git a/tests/testthat/_snaps/summarise.md b/tests/testthat/_snaps/summarise.md
index 318edcb751..3f80a60a5a 100644
--- a/tests/testthat/_snaps/summarise.md
+++ b/tests/testthat/_snaps/summarise.md
@@ -124,7 +124,7 @@
       <error/rlang_error>
       Error in `summarise()`:
       i In argument: `a = rlang::env(a = 1)`.
-      i In group 1: `x = 1`, `y = 1`.
+      i In group 1: `x = 1` and `y = 1`.
       Caused by error:
       ! `a` must be a vector, not an environment.
     Code

From 6721f9fc1a862e4f429375941aa57edce50db7cd Mon Sep 17 00:00:00 2001
From: Davis Vaughan <davis@posit.co>
Date: Tue, 13 Feb 2024 16:31:05 -0500
Subject: [PATCH 2/2] Bump rlang and cli for snapshot tests

---
 DESCRIPTION | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/DESCRIPTION b/DESCRIPTION
index 35d2ebcfa0..1c8de59242 100644
--- a/DESCRIPTION
+++ b/DESCRIPTION
@@ -22,7 +22,7 @@ BugReports: https://github.com/tidyverse/dplyr/issues
 Depends:
     R (>= 3.5.0)
 Imports:
-    cli (>= 3.4.0),
+    cli (>= 3.6.2),
     generics,
     glue (>= 1.3.2),
     lifecycle (>= 1.0.3),
@@ -30,7 +30,7 @@ Imports:
     methods,
     pillar (>= 1.9.0),
     R6,
-    rlang (>= 1.1.0),
+    rlang (>= 1.1.3),
     tibble (>= 3.2.0),
     tidyselect (>= 1.2.0),
     utils,