From: Felipe Contreras <felipe.contreras@gmail.com>
To: git@vger.kernel.org
Cc: "SZEDER Gábor" <szeder.dev@gmail.com>,
"Nguyễn Thái Ngọc Duy" <pclouds@gmail.com>,
"Felipe Contreras" <felipe.contreras@gmail.com>
Subject: [PATCH 08/47] test: completion: add run_func() helper
Date: Thu, 31 Dec 2020 20:15:43 -0600 [thread overview]
Message-ID: <20210101021622.798041-9-felipe.contreras@gmail.com> (raw)
In-Reply-To: <20210101021622.798041-1-felipe.contreras@gmail.com>
Pretty straightforward: runs functions.
Signed-off-by: Felipe Contreras <felipe.contreras@gmail.com>
---
t/t9902-completion.sh | 58 ++++++++++++++++++-------------------------
1 file changed, 24 insertions(+), 34 deletions(-)
diff --git a/t/t9902-completion.sh b/t/t9902-completion.sh
index 82bf0ee2e2..f6c60c609a 100755
--- a/t/t9902-completion.sh
+++ b/t/t9902-completion.sh
@@ -75,6 +75,12 @@ run_completion ()
__git_wrap__git_main && print_comp
}
+run_func ()
+{
+ local -a COMPREPLY &&
+ "$@" && print_comp
+}
+
# Test high-level completion
# Arguments are:
# 1: typed text so far (cur)
@@ -452,8 +458,7 @@ test_expect_success '__gitcomp_direct - puts everything into COMPREPLY as-is' '
EOF
(
cur=should_be_ignored &&
- __gitcomp_direct "$(cat expected)" &&
- print_comp
+ run_func __gitcomp_direct "$(cat expected)"
) &&
test_cmp expected out
'
@@ -547,7 +552,7 @@ test_expect_success '__gitcomp - equal skip' '
'
test_expect_success '__gitcomp - doesnt fail because of invalid variable name' '
- __gitcomp "$invalid_variable_name"
+ run_func __gitcomp "$invalid_variable_name"
'
read -r -d "" refs <<-\EOF
@@ -586,7 +591,7 @@ test_expect_success '__gitcomp_nl - no suffix' '
'
test_expect_success '__gitcomp_nl - doesnt fail because of invalid variable name' '
- __gitcomp_nl "$invalid_variable_name"
+ run_func __gitcomp_nl "$invalid_variable_name"
'
test_expect_success '__git_remotes - list remotes from $GIT_DIR/remotes and from config file' '
@@ -1087,8 +1092,7 @@ test_expect_success '__git_complete_refs - simple' '
EOF
(
cur= &&
- __git_complete_refs &&
- print_comp
+ run_func __git_complete_refs
) &&
test_cmp expected out
'
@@ -1100,8 +1104,7 @@ test_expect_success '__git_complete_refs - matching' '
EOF
(
cur=mat &&
- __git_complete_refs &&
- print_comp
+ run_func __git_complete_refs
) &&
test_cmp expected out
'
@@ -1114,8 +1117,7 @@ test_expect_success '__git_complete_refs - remote' '
EOF
(
cur= &&
- __git_complete_refs --remote=other &&
- print_comp
+ run_func __git_complete_refs --remote=other
) &&
test_cmp expected out
'
@@ -1133,8 +1135,7 @@ test_expect_success '__git_complete_refs - track' '
EOF
(
cur= &&
- __git_complete_refs --track &&
- print_comp
+ run_func __git_complete_refs --track
) &&
test_cmp expected out
'
@@ -1146,8 +1147,7 @@ test_expect_success '__git_complete_refs - current word' '
EOF
(
cur="--option=mat" &&
- __git_complete_refs --cur="${cur#*=}" &&
- print_comp
+ run_func __git_complete_refs --cur="${cur#*=}"
) &&
test_cmp expected out
'
@@ -1159,8 +1159,7 @@ test_expect_success '__git_complete_refs - prefix' '
EOF
(
cur=v1.0..mat &&
- __git_complete_refs --pfx=v1.0.. --cur=mat &&
- print_comp
+ run_func __git_complete_refs --pfx=v1.0.. --cur=mat
) &&
test_cmp expected out
'
@@ -1176,8 +1175,7 @@ test_expect_success '__git_complete_refs - suffix' '
EOF
(
cur= &&
- __git_complete_refs --sfx=. &&
- print_comp
+ run_func __git_complete_refs --sfx=.
) &&
test_cmp expected out
'
@@ -1190,8 +1188,7 @@ test_expect_success '__git_complete_fetch_refspecs - simple' '
EOF
(
cur= &&
- __git_complete_fetch_refspecs other &&
- print_comp
+ run_func __git_complete_fetch_refspecs other
) &&
test_cmp expected out
'
@@ -1202,8 +1199,7 @@ test_expect_success '__git_complete_fetch_refspecs - matching' '
EOF
(
cur=br &&
- __git_complete_fetch_refspecs other "" br &&
- print_comp
+ run_func __git_complete_fetch_refspecs other "" br
) &&
test_cmp expected out
'
@@ -1216,8 +1212,7 @@ test_expect_success '__git_complete_fetch_refspecs - prefix' '
EOF
(
cur="+" &&
- __git_complete_fetch_refspecs other "+" "" &&
- print_comp
+ run_func __git_complete_fetch_refspecs other "+" ""
) &&
test_cmp expected out
'
@@ -1230,8 +1225,7 @@ test_expect_success '__git_complete_fetch_refspecs - fully qualified' '
EOF
(
cur=refs/ &&
- __git_complete_fetch_refspecs other "" refs/ &&
- print_comp
+ run_func __git_complete_fetch_refspecs other "" refs/
) &&
test_cmp expected out
'
@@ -1244,8 +1238,7 @@ test_expect_success '__git_complete_fetch_refspecs - fully qualified & prefix' '
EOF
(
cur=+refs/ &&
- __git_complete_fetch_refspecs other + refs/ &&
- print_comp
+ run_func __git_complete_fetch_refspecs other + refs/
) &&
test_cmp expected out
'
@@ -1776,8 +1769,7 @@ test_path_completion ()
# unusual characters in path names. By requesting only
# untracked files we do not have to bother adding any
# paths to the index in those tests.
- __git_complete_index_file --others &&
- print_comp
+ run_func __git_complete_index_file --others
) &&
test_cmp expected out
}
@@ -2281,8 +2273,7 @@ do
(
words=(git push '$flag' other ma) &&
cword=${#words[@]} cur=${words[cword-1]} &&
- __git_complete_remote_or_refspec &&
- print_comp
+ run_func __git_complete_remote_or_refspec
) &&
test_cmp expected out
'
@@ -2294,8 +2285,7 @@ do
(
words=(git push other '$flag' ma) &&
cword=${#words[@]} cur=${words[cword-1]} &&
- __git_complete_remote_or_refspec &&
- print_comp
+ run_func __git_complete_remote_or_refspec
) &&
test_cmp expected out
'
--
2.30.0
next prev parent reply other threads:[~2021-01-01 2:18 UTC|newest]
Thread overview: 48+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-01-01 2:15 [PATCH 00/47] completion: git-completion 1.3 patches Felipe Contreras
2021-01-01 2:15 ` [PATCH 01/47] completion: bash: fix prefix detection in branch.* Felipe Contreras
2021-01-01 2:15 ` [PATCH 02/47] completion: fix for suboptions with value Felipe Contreras
2021-01-01 2:15 ` [PATCH 03/47] completion: bash: fix for multiple dash commands Felipe Contreras
2021-01-01 2:15 ` [PATCH 04/47] completion: bash: add correct suffix in variables Felipe Contreras
2021-01-01 2:15 ` [PATCH 05/47] completion: bash: do not modify COMP_WORDBREAKS Felipe Contreras
2021-01-01 2:15 ` [PATCH 06/47] test: completion: fix currently typed words Felipe Contreras
2021-01-01 2:15 ` [PATCH 07/47] test: completion: switch __gitcomp_nl prefix test Felipe Contreras
2021-01-01 2:15 ` Felipe Contreras [this message]
2021-01-01 2:15 ` [PATCH 09/47] completion: bash: remove non-append functionality Felipe Contreras
2021-01-01 2:15 ` [PATCH 10/47] completion: bash: get rid of _append() functions Felipe Contreras
2021-01-01 2:15 ` [PATCH 11/47] completion: bash: get rid of any non-append code Felipe Contreras
2021-01-01 2:15 ` [PATCH 12/47] completion: zsh: fix options with arguments Felipe Contreras
2021-01-01 2:15 ` [PATCH 13/47] completion: zsh: expand --git-dir file argument Felipe Contreras
2021-01-01 2:15 ` [PATCH 14/47] completion: zsh: add support for general -C opts Felipe Contreras
2021-01-01 2:15 ` [PATCH 15/47] completion: zsh: fix for undefined completions Felipe Contreras
2021-01-01 2:15 ` [PATCH 16/47] completion: zsh: add support for general -c opts Felipe Contreras
2021-01-01 2:15 ` [PATCH 17/47] completion: zsh: fix extra space on foo= Felipe Contreras
2021-01-01 2:15 ` [PATCH 18/47] completion: zsh: add excluded options Felipe Contreras
2021-01-01 2:15 ` [PATCH 19/47] completion: zsh: always set compset Felipe Contreras
2021-01-01 2:15 ` [PATCH 20/47] completion: factor out check in __gitcomp Felipe Contreras
2021-01-01 2:15 ` [PATCH 21/47] completion: simplify equal suffix check Felipe Contreras
2021-01-01 2:15 ` [PATCH 22/47] completion: refactor __gitcomp Felipe Contreras
2021-01-01 2:15 ` [PATCH 23/47] completion: simplify __gitcomp Felipe Contreras
2021-01-01 2:15 ` [PATCH 24/47] completion: bash: change suffix check in __gitcomp Felipe Contreras
2021-01-01 2:16 ` [PATCH 25/47] completion: improve __gitcomp suffix code Felipe Contreras
2021-01-01 2:16 ` [PATCH 26/47] completion: bash: simplify config_variable_name Felipe Contreras
2021-01-01 2:16 ` [PATCH 27/47] test: completion: add missing test Felipe Contreras
2021-01-01 2:16 ` [PATCH 28/47] completion: bash: improve __gitcomp description Felipe Contreras
2021-01-01 2:16 ` [PATCH 29/47] completion: add __gitcomp_opts Felipe Contreras
2021-01-01 2:16 ` [PATCH 30/47] completion: bash: cleanup __gitcomp* invocations Felipe Contreras
2021-01-01 2:16 ` [PATCH 31/47] completion: bash: shuffle __gitcomp functions Felipe Contreras
2021-01-01 2:16 ` [PATCH 32/47] completion: zsh: simplify __gitcomp_direct Felipe Contreras
2021-01-01 2:16 ` [PATCH 33/47] completion: zsh: shuffle __gitcomp* functions Felipe Contreras
2021-01-01 2:16 ` [PATCH 34/47] completion: zsh: fix direct quoting Felipe Contreras
2021-01-01 2:16 ` [PATCH 35/47] completion: zsh: add elements individually in __gitcomp_opts Felipe Contreras
2021-01-01 2:16 ` [PATCH 36/47] completion: zsh: add __gitcompadd helper Felipe Contreras
2021-01-01 2:16 ` [PATCH 37/47] completion: zsh: add correct removable suffix Felipe Contreras
2021-01-01 2:16 ` [PATCH 38/47] completion: bash: simplify _get_comp_words_by_ref() Felipe Contreras
2021-01-01 2:16 ` [PATCH 39/47] completion: bash: refactor _get_comp_words_by_ref() Felipe Contreras
2021-01-01 2:16 ` [PATCH 40/47] completion: bash: cleanup _get_comp_words_by_ref() Felipe Contreras
2021-01-01 2:16 ` [PATCH 41/47] completion: bash: trivial cleanup Felipe Contreras
2021-01-01 2:16 ` [PATCH 42/47] completion: bash: rename _get_comp_words_by_ref() Felipe Contreras
2021-01-01 2:16 ` [PATCH 43/47] completion: bash: add __git_have_func helper Felipe Contreras
2021-01-01 2:16 ` [PATCH 44/47] completion: bash: improve function detection Felipe Contreras
2021-01-01 2:16 ` [PATCH 45/47] test: completion: add tests for __git_complete Felipe Contreras
2021-01-01 2:16 ` [PATCH 46/47] completion: add proper public __git_complete Felipe Contreras
2021-01-01 2:16 ` [PATCH 47/47] completion: zsh: add higher-priority location Felipe Contreras
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
List information: http://vger.kernel.org/majordomo-info.html
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20210101021622.798041-9-felipe.contreras@gmail.com \
--to=felipe.contreras@gmail.com \
--cc=git@vger.kernel.org \
--cc=pclouds@gmail.com \
--cc=szeder.dev@gmail.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
Code repositories for project(s) associated with this public inbox
https://80x24.org/mirrors/git.git
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).