From: Martin Erik Werner <martinerikwerner@gmail.com>
To: gitster@pobox.com
Cc: git@vger.kernel.org, trsten@science-computing.de,
Martin Erik Werner <martinerikwerner@gmail.com>
Subject: [PATCH v2 2/3] t9903: add tests for bash.showUntrackedFiles
Date: Wed, 13 Feb 2013 12:01:59 +0100 [thread overview]
Message-ID: <1360753321-5002-2-git-send-email-martinerikwerner@gmail.com> (raw)
In-Reply-To: <1360753321-5002-1-git-send-email-martinerikwerner@gmail.com>
Add 4 test for the bash.showUntrackedFiles config option, covering all
combinations of the shell var being set/unset and the config option
being enabled/disabled.
Signed-off-by: Martin Erik Werner <martinerikwerner@gmail.com>
---
t/t9903-bash-prompt.sh | 40 ++++++++++++++++++++++++++++++++++++++++
1 file changed, 40 insertions(+)
diff --git a/t/t9903-bash-prompt.sh b/t/t9903-bash-prompt.sh
index f17c1f8..cb008e2 100755
--- a/t/t9903-bash-prompt.sh
+++ b/t/t9903-bash-prompt.sh
@@ -437,6 +437,46 @@ test_expect_success 'prompt - untracked files status indicator - untracked files
test_cmp expected "$actual"
'
+test_expect_success 'prompt - untracked files status indicator - shell variable unset with config disabled' '
+ printf " (master)" > expected &&
+ test_config bash.showUntrackedFiles false &&
+ (
+ unset -v GIT_PS1_SHOWUNTRACKEDFILES &&
+ __git_ps1 > "$actual"
+ ) &&
+ test_cmp expected "$actual"
+'
+
+test_expect_success 'prompt - untracked files status indicator - shell variable unset with config enabled' '
+ printf " (master)" > expected &&
+ test_config bash.showUntrackedFiles true &&
+ (
+ unset -v GIT_PS1_SHOWUNTRACKEDFILES &&
+ __git_ps1 > "$actual"
+ ) &&
+ test_cmp expected "$actual"
+'
+
+test_expect_success 'prompt - untracked files status indicator - shell variable set with config disabled' '
+ printf " (master)" > expected &&
+ test_config bash.showUntrackedFiles false &&
+ (
+ GIT_PS1_SHOWUNTRACKEDFILES=y &&
+ __git_ps1 > "$actual"
+ ) &&
+ test_cmp expected "$actual"
+'
+
+test_expect_success 'prompt - untracked files status indicator - shell variable set with config enabled' '
+ printf " (master %%)" > expected &&
+ test_config bash.showUntrackedFiles true &&
+ (
+ GIT_PS1_SHOWUNTRACKEDFILES=y &&
+ __git_ps1 > "$actual"
+ ) &&
+ test_cmp expected "$actual"
+'
+
test_expect_success 'prompt - untracked files status indicator - not shown inside .git directory' '
printf " (GIT_DIR!)" > expected &&
(
--
1.7.10.4
next prev parent reply other threads:[~2013-02-13 11:02 UTC|newest]
Thread overview: 20+ messages / expand[flat|nested] mbox.gz Atom feed top
2013-02-12 20:12 [PATCH 0/2] Add bash.showUntrackedFiles config option Martin Erik Werner
2013-02-12 20:12 ` [PATCH 1/2] bash completion: add bash.showUntrackedFiles option Martin Erik Werner
2013-02-12 22:17 ` Junio C Hamano
2013-02-12 20:12 ` [PATCH 2/2] t9903: add test case for bash.showUntrackedFiles Martin Erik Werner
2013-02-12 22:29 ` Junio C Hamano
2013-02-13 10:58 ` [PATCH v2 0/3] Add bash.showUntrackedFiles config option Martin Erik Werner
2013-02-13 11:01 ` [PATCH v2 1/3] shell prompt: add bash.showUntrackedFiles option Martin Erik Werner
2013-02-13 11:01 ` Martin Erik Werner [this message]
2013-02-13 16:23 ` [PATCH v2 2/3] t9903: add tests for bash.showUntrackedFiles Junio C Hamano
2013-02-13 17:27 ` Martin Erik Werner
2013-02-13 19:51 ` Junio C Hamano
2013-02-13 11:02 ` [PATCH v2 3/3] t9903: add extra tests for bash.showDirtyState Martin Erik Werner
2013-02-13 16:28 ` Junio C Hamano
2013-02-13 17:37 ` Martin Erik Werner
2013-02-13 19:53 ` Junio C Hamano
2013-02-13 20:40 ` Martin Erik Werner
2013-02-13 20:42 ` Junio C Hamano
2013-02-13 20:58 ` [PATCH v3 2/3] t9903: add tests for bash.showUntrackedFiles Martin Erik Werner
2013-02-13 20:58 ` [PATCH v3 3/3] t9903: add extra tests for bash.showDirtyState Martin Erik Werner
2013-02-13 16:12 ` [PATCH v2 1/3] shell prompt: add bash.showUntrackedFiles option Junio C Hamano
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
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1360753321-5002-2-git-send-email-martinerikwerner@gmail.com \
--to=martinerikwerner@gmail.com \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
--cc=trsten@science-computing.de \
/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.
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 NNTP newsgroup(s).