From 787d9ccbfa4efad1c2ce3d45fbaf0e08b9a06d9c Mon Sep 17 00:00:00 2001
From: Tw <weii.tan@nio.com>
Date: Mon, 6 Jan 2025 11:13:50 +0800
Subject: [PATCH] chore(ci): Use dedicated action to install latest elvish

---
 .github/workflows/ci.yml                |  5 ++++-
 clap_complete/tests/testsuite/elvish.rs | 10 +++++-----
 2 files changed, 9 insertions(+), 6 deletions(-)

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 34e85409132..9219cd2babc 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -92,9 +92,12 @@ jobs:
       with:
         toolchain: stable
     - uses: Swatinem/rust-cache@v2
+    - uses: elves/setup-elvish@v1
+      with:
+        elvish-version: 0.21.0
     - name: Install shells
       if: runner.os == 'Linux'
-      run: sudo apt-get install -y elvish fish zsh
+      run: sudo apt-get install -y fish zsh
     - name: clap_complete
       run: cargo test -p clap_complete -F unstable-dynamic -F unstable-shell-tests
   shell-integration-nu:
diff --git a/clap_complete/tests/testsuite/elvish.rs b/clap_complete/tests/testsuite/elvish.rs
index c9dc59b6f06..d5819aef33c 100644
--- a/clap_complete/tests/testsuite/elvish.rs
+++ b/clap_complete/tests/testsuite/elvish.rs
@@ -184,7 +184,7 @@ value          value
 
     let input = "exhaustive empty \t";
     let expected = snapbox::str![[r#"
-no candidates
+error: no candidates
 % exhaustive empty 
 "#]];
     let actual = runtime.complete(input, &term).unwrap();
@@ -192,7 +192,7 @@ no candidates
 
     let input = "exhaustive --empty=\t";
     let expected = snapbox::str![[r#"
-no candidates
+error: no candidates
 % exhaustive --empty=
 "#]];
     let actual = runtime.complete(input, &term).unwrap();
@@ -324,8 +324,8 @@ fn complete_dynamic_empty_subcommand() {
 
     let input = "exhaustive empty \t\t";
     let expected = snapbox::str![[r#"
-no candidates
-no candidates
+error: no candidates
+error: no candidates
 % exhaustive empty 
 "#]];
     let actual = runtime.complete(input, &term).unwrap();
@@ -345,7 +345,7 @@ fn complete_dynamic_empty_option_value() {
 
     let input = "exhaustive --empty=\t";
     let expected = snapbox::str![[r#"
-no candidates
+error: no candidates
 % exhaustive --empty=
 "#]];
     let actual = runtime.complete(input, &term).unwrap();