Skip to content

Commit

Permalink
t9903: remove redundant tests
Browse files Browse the repository at this point in the history
After refactoring __git_ps1_colorize_gitstring, codepaths for bash and zsh
became mostly common and tests for bash and zsh became redundant.

Remove tests for zsh. Keep one minimal test that stress the difference
in codepaths for bash and zsh.

Suggested-by: SZEDER Gábor <szeder@ira.uka.de>
Signed-off-by: Eduardo R. D'Avila <erdavila@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
  • Loading branch information
Eduardo R. D'Avila authored and Junio C Hamano committed Jun 26, 2013
1 parent 7fe9031 commit f3bd62d
Showing 1 changed file with 1 addition and 114 deletions.
115 changes: 1 addition & 114 deletions t/t9903-bash-prompt.sh
Original file line number Diff line number Diff line change
Expand Up @@ -665,7 +665,7 @@ test_expect_success 'prompt - bash color pc mode - untracked files status indica
test_cmp expected "$actual"
'

test_expect_success 'prompt - zsh color pc mode - branch name' '
test_expect_success 'prompt - zsh color pc mode' '
printf "BEFORE: (%%F{green}master%%f%%f):AFTER" >expected &&
(
ZSH_VERSION=5.0.0 &&
Expand All @@ -676,117 +676,4 @@ test_expect_success 'prompt - zsh color pc mode - branch name' '
test_cmp expected "$actual"
'

test_expect_success 'prompt - zsh color pc mode - detached head' '
printf "BEFORE: (%%F{red}(%s...)%%f%%f):AFTER" $(git log -1 --format="%h" b1^) >expected &&
git checkout b1^ &&
test_when_finished "git checkout master" &&
(
ZSH_VERSION=5.0.0 &&
GIT_PS1_SHOWCOLORHINTS=y &&
__git_ps1 "BEFORE:" ":AFTER" &&
printf "%s" "$PS1" >"$actual"
) &&
test_cmp expected "$actual"
'

test_expect_success 'prompt - zsh color pc mode - dirty status indicator - dirty worktree' '
printf "BEFORE: (%%F{green}master%%f %%F{red}*%%f):AFTER" >expected &&
echo "dirty" >file &&
test_when_finished "git reset --hard" &&
(
ZSH_VERSION=5.0.0 &&
GIT_PS1_SHOWDIRTYSTATE=y &&
GIT_PS1_SHOWCOLORHINTS=y &&
__git_ps1 "BEFORE:" ":AFTER" &&
printf "%s" "$PS1" >"$actual"
) &&
test_cmp expected "$actual"
'

test_expect_success 'prompt - zsh color pc mode - dirty status indicator - dirty index' '
printf "BEFORE: (%%F{green}master%%f %%F{green}+%%f):AFTER" >expected &&
echo "dirty" >file &&
test_when_finished "git reset --hard" &&
git add -u &&
(
ZSH_VERSION=5.0.0 &&
GIT_PS1_SHOWDIRTYSTATE=y &&
GIT_PS1_SHOWCOLORHINTS=y &&
__git_ps1 "BEFORE:" ":AFTER" &&
printf "%s" "$PS1" >"$actual"
) &&
test_cmp expected "$actual"
'

test_expect_success 'prompt - zsh color pc mode - dirty status indicator - dirty index and worktree' '
printf "BEFORE: (%%F{green}master%%f %%F{red}*%%F{green}+%%f):AFTER" >expected &&
echo "dirty index" >file &&
test_when_finished "git reset --hard" &&
git add -u &&
echo "dirty worktree" >file &&
(
ZSH_VERSION=5.0.0 &&
GIT_PS1_SHOWCOLORHINTS=y &&
GIT_PS1_SHOWDIRTYSTATE=y &&
__git_ps1 "BEFORE:" ":AFTER" &&
printf "%s" "$PS1" >"$actual"
) &&
test_cmp expected "$actual"
'

test_expect_success 'prompt - zsh color pc mode - dirty status indicator - before root commit' '
printf "BEFORE: (%%F{green}master%%f %%F{green}#%%f):AFTER" >expected &&
(
ZSH_VERSION=5.0.0 &&
GIT_PS1_SHOWDIRTYSTATE=y &&
GIT_PS1_SHOWCOLORHINTS=y &&
cd otherrepo &&
__git_ps1 "BEFORE:" ":AFTER" &&
printf "%s" "$PS1" >"$actual"
) &&
test_cmp expected "$actual"
'

test_expect_success 'prompt - zsh color pc mode - inside .git directory' '
printf "BEFORE: (%%F{green}GIT_DIR!%%f%%f):AFTER" >expected &&
echo "dirty" >file &&
test_when_finished "git reset --hard" &&
(
ZSH_VERSION=5.0.0 &&
GIT_PS1_SHOWDIRTYSTATE=y &&
GIT_PS1_SHOWCOLORHINTS=y &&
cd .git &&
__git_ps1 "BEFORE:" ":AFTER" &&
printf "%s" "$PS1" >"$actual"
) &&
test_cmp expected "$actual"
'

test_expect_success 'prompt - zsh color pc mode - stash status indicator' '
printf "BEFORE: (%%F{green}master%%f %%F{blue}$%%f):AFTER" >expected &&
echo 2 >file &&
git stash &&
test_when_finished "git stash drop" &&
(
ZSH_VERSION=5.0.0 &&
GIT_PS1_SHOWSTASHSTATE=y &&
GIT_PS1_SHOWCOLORHINTS=y &&
__git_ps1 "BEFORE:" ":AFTER" &&
printf "%s" "$PS1" >"$actual"
) &&
test_cmp expected "$actual"
'

test_expect_success 'prompt - zsh color pc mode - untracked files status indicator' '
printf "BEFORE: (%%F{green}master%%f %%F{red}%%%%%%f):AFTER" >expected &&
(
ZSH_VERSION=5.0.0 &&
GIT_PS1_SHOWUNTRACKEDFILES=y &&
GIT_PS1_SHOWCOLORHINTS=y &&
__git_ps1 "BEFORE:" ":AFTER" &&
printf "%s" "$PS1" >"$actual"
) &&
test_cmp expected "$actual"
'

test_done

0 comments on commit f3bd62d

Please sign in to comment.