summaryrefslogtreecommitdiffstats
path: root/test-commits.sh
diff options
context:
space:
mode:
authorMichael Allen <michael@michaelallen.io>2015-08-30 20:02:04 +0100
committerMichael Allen <michael@michaelallen.io>2015-08-30 20:02:04 +0100
commit8377275b42a3a3f72a18fbb2cc67dc6979a13557 (patch)
tree195ae86cd3ce6cbd636611ea07ce529145eda231 /test-commits.sh
parent8f62ad94da6058ac8f66a37caac518b643ccafe3 (diff)
downloadgit-sonar-8377275b42a3a3f72a18fbb2cc67dc6979a13557.tar.gz
git-sonar-8377275b42a3a3f72a18fbb2cc67dc6979a13557.zip
Remove color tests from test-commits as test-colors covers it
Diffstat (limited to 'test-commits.sh')
-rwxr-xr-xtest-commits.sh24
1 files changed, 10 insertions, 14 deletions
diff --git a/test-commits.sh b/test-commits.sh
index 95addf9..8aa2da2 100755
--- a/test-commits.sh
+++ b/test-commits.sh
@@ -369,14 +369,10 @@ test_quiet_if_no_remote_master() {
rm_tmp
}
-test_zsh_and_bash_local_commits() {
- local zsh_up="%{[green]%}↑%{%}"
- local zsh_both="%{[yellow]%}⇵%{%}"
- local zsh_down="%{[red]%}↓%{%}"
-
- printf -v bash_up "\x01\033[1;32m\x02↑\x01\033[0m\x02"
- printf -v bash_both "\x01\033[1;33m\x02⇵\x01\033[0m\x02"
- printf -v bash_down "\x01\033[1;31m\x02↓\x01\033[0m\x02"
+test_local_commits() {
+ local up="↑"
+ local both="⇵"
+ local down="↓"
cd_to_tmp "remote"
@@ -404,8 +400,8 @@ test_zsh_and_bash_local_commits() {
git add .
git commit -m "test commit" --quiet
- assertEquals " 1$zsh_up" "$(zsh_color_local_commits)"
- assertEquals " 1$bash_up" "$(bash_color_local_commits)"
+ assertEquals " 1$up" "$(zsh_color_local_commits)"
+ assertEquals " 1$up" "$(bash_color_local_commits)"
cd "$remote"
echo "foo" > foo
@@ -415,13 +411,13 @@ test_zsh_and_bash_local_commits() {
cd "$repo"
git fetch origin --quiet
- assertEquals " 1${zsh_both}1" "$(zsh_color_local_commits)"
- assertEquals " 1${bash_both}1" "$(bash_color_local_commits)"
+ assertEquals " 1${both}1" "$(zsh_color_local_commits)"
+ assertEquals " 1${both}1" "$(bash_color_local_commits)"
git reset --hard HEAD^ --quiet
- assertEquals " 1$zsh_down" "$(zsh_color_local_commits)"
- assertEquals " 1$bash_down" "$(bash_color_local_commits)"
+ assertEquals " 1$down" "$(zsh_color_local_commits)"
+ assertEquals " 1$down" "$(bash_color_local_commits)"
}
. ./shunit/shunit2