From 8377275b42a3a3f72a18fbb2cc67dc6979a13557 Mon Sep 17 00:00:00 2001
From: Michael Allen <michael@michaelallen.io>
Date: Sun, 30 Aug 2015 20:02:04 +0100
Subject: Remove color tests from test-commits as test-colors covers it

---
 test-commits.sh | 24 ++++++++++--------------
 1 file changed, 10 insertions(+), 14 deletions(-)

(limited to 'test-commits.sh')

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
-- 
cgit v1.2.3


From 131d04ea52fa194d8e027e495ca3b46e4b36f0ae Mon Sep 17 00:00:00 2001
From: Michael Allen <michael@michaelallen.io>
Date: Wed, 16 Sep 2015 15:15:33 +0100
Subject: Test the new functions directly

---
 test-commits.sh | 5 +++++
 1 file changed, 5 insertions(+)

(limited to 'test-commits.sh')

diff --git a/test-commits.sh b/test-commits.sh
index 8aa2da2..1a4a86c 100755
--- a/test-commits.sh
+++ b/test-commits.sh
@@ -378,6 +378,7 @@ test_local_commits() {
 
   assertEquals "" "$(zsh_color_local_commits)"
   assertEquals "" "$(bash_color_local_commits)"
+  assertEquals "" "$(color_local_commits)"
 
   git init --quiet
   touch README
@@ -394,6 +395,7 @@ test_local_commits() {
 
   assertEquals "" "$(zsh_color_local_commits)"
   assertEquals "" "$(bash_color_local_commits)"
+  assertEquals "" "$(color_local_commits)"
 
   cd "$repo"
   echo "bar" > bar
@@ -402,6 +404,7 @@ test_local_commits() {
 
   assertEquals " 1$up" "$(zsh_color_local_commits)"
   assertEquals " 1$up" "$(bash_color_local_commits)"
+  assertEquals " 1$up" "$(color_local_commits)"
 
   cd "$remote"
   echo "foo" > foo
@@ -413,11 +416,13 @@ test_local_commits() {
 
   assertEquals " 1${both}1" "$(zsh_color_local_commits)"
   assertEquals " 1${both}1" "$(bash_color_local_commits)"
+  assertEquals " 1${both}1" "$(color_local_commits)"
 
   git reset --hard HEAD^ --quiet
 
   assertEquals " 1$down" "$(zsh_color_local_commits)"
   assertEquals " 1$down" "$(bash_color_local_commits)"
+  assertEquals " 1$down" "$(color_local_commits)"
 }
 
 . ./shunit/shunit2
-- 
cgit v1.2.3