Merge branch 'master' into fix-rprompt-icons-cut-off

1 files changed, 29 insertions, 42 deletions

diff --git a/test/powerlevel9k.spec b/test/powerlevel9k.spec
index 75df29f8..9c5cbeec 100755
--- a/test/powerlevel9k.spec
+++ b/test/powerlevel9k.spec
@@ -17,68 +17,66 @@ function setUp() {
 }
 
 function testJoinedSegments() {
+  local -a POWERLEVEL9K_LEFT_PROMPT_ELEMENTS
   POWERLEVEL9K_LEFT_PROMPT_ELEMENTS=(dir dir_joined)
   cd /tmp
 
-  assertEquals "%K{blue} %F{black}/tmp %K{blue}%F{black}%F{black}/tmp %k%F{blue}%f " "$(build_left_prompt)"
+  assertEquals "%K{004} %F{000}/tmp %K{004}%F{000}%F{000}/tmp %k%F{004}%f " "$(build_left_prompt)"
 
-  unset POWERLEVEL9K_LEFT_PROMPT_ELEMENTS
   cd -
 }
 
 function testTransitiveJoinedSegments() {
+  local -a POWERLEVEL9K_LEFT_PROMPT_ELEMENTS
   POWERLEVEL9K_LEFT_PROMPT_ELEMENTS=(dir root_indicator_joined dir_joined)
   cd /tmp
 
-  assertEquals "%K{blue} %F{black}/tmp %K{blue}%F{black}%F{black}/tmp %k%F{blue}%f " "$(build_left_prompt)"
+  assertEquals "%K{004} %F{000}/tmp %K{004}%F{000}%F{000}/tmp %k%F{004}%f " "$(build_left_prompt)"
 
-  unset POWERLEVEL9K_LEFT_PROMPT_ELEMENTS
   cd -
 }
 
 function testJoiningWithConditionalSegment() {
+  local -a POWERLEVEL9K_LEFT_PROMPT_ELEMENTS
   POWERLEVEL9K_LEFT_PROMPT_ELEMENTS=(dir background_jobs dir_joined)
   cd /tmp
 
-  assertEquals "%K{blue} %F{black}/tmp %K{blue}%F{black} %F{black}/tmp %k%F{blue}%f " "$(build_left_prompt)"
+  assertEquals "%K{004} %F{000}/tmp %K{004}%F{000} %F{000}/tmp %k%F{004}%f " "$(build_left_prompt)"
 
-  unset POWERLEVEL9K_LEFT_PROMPT_ELEMENTS
   cd -
 }
 
 function testDynamicColoringOfSegmentsWork() {
+  local -a POWERLEVEL9K_LEFT_PROMPT_ELEMENTS
   POWERLEVEL9K_LEFT_PROMPT_ELEMENTS=(dir)
-  POWERLEVEL9K_DIR_DEFAULT_BACKGROUND='red'
+  local POWERLEVEL9K_DIR_DEFAULT_BACKGROUND='red'
   cd /tmp
 
-  assertEquals "%K{red} %F{black}/tmp %k%F{red}%f " "$(build_left_prompt)"
+  assertEquals "%K{001} %F{000}/tmp %k%F{001}%f " "$(build_left_prompt)"
 
-  unset POWERLEVEL9K_LEFT_PROMPT_ELEMENTS
-  unset POWERLEVEL9K_DIR_DEFAULT_BACKGROUND
   cd -
 }
 
 function testDynamicColoringOfVisualIdentifiersWork() {
+  local -a POWERLEVEL9K_LEFT_PROMPT_ELEMENTS
   POWERLEVEL9K_LEFT_PROMPT_ELEMENTS=(dir)
-  POWERLEVEL9K_DIR_DEFAULT_VISUAL_IDENTIFIER_COLOR='green'
-  POWERLEVEL9K_FOLDER_ICON="icon-here"
+  local POWERLEVEL9K_DIR_DEFAULT_VISUAL_IDENTIFIER_COLOR='green'
+  local POWERLEVEL9K_FOLDER_ICON="icon-here"
 
   cd /tmp
 
-  assertEquals "%K{blue} %F{green%}icon-here %F{black}/tmp %k%F{blue}%f " "$(build_left_prompt)"
+  assertEquals "%K{004} %F{002}icon-here %F{000}/tmp %k%F{004}%f " "$(build_left_prompt)"
 
-  unset POWERLEVEL9K_LEFT_PROMPT_ELEMENTS
-  unset POWERLEVEL9K_DIR_DEFAULT_VISUAL_IDENTIFIER_COLOR
-  unset POWERLEVEL9K_FOLDER_ICON
   cd -
 }
 
 function testColoringOfVisualIdentifiersDoesNotOverwriteColoringOfSegment() {
+  local -a POWERLEVEL9K_LEFT_PROMPT_ELEMENTS
   POWERLEVEL9K_LEFT_PROMPT_ELEMENTS=(dir)
-  POWERLEVEL9K_DIR_DEFAULT_VISUAL_IDENTIFIER_COLOR='green'
-  POWERLEVEL9K_DIR_DEFAULT_FOREGROUND='red'
-  POWERLEVEL9K_DIR_DEFAULT_BACKGROUND='yellow'
-  POWERLEVEL9K_FOLDER_ICON="icon-here"
+  local POWERLEVEL9K_DIR_DEFAULT_VISUAL_IDENTIFIER_COLOR='green'
+  local POWERLEVEL9K_DIR_DEFAULT_FOREGROUND='red'
+  local POWERLEVEL9K_DIR_DEFAULT_BACKGROUND='yellow'
+  local POWERLEVEL9K_FOLDER_ICON="icon-here"
 
   # Re-Source the icons, as the POWERLEVEL9K_MODE is directly
   # evaluated there.
@@ -86,19 +84,15 @@ function testColoringOfVisualIdentifiersDoesNotOverwriteColoringOfSegment() {
 
   cd /tmp
 
-  assertEquals "%K{yellow} %F{green%}icon-here %F{red}/tmp %k%F{yellow}%f " "$(build_left_prompt)"
+  assertEquals "%K{003} %F{002}icon-here %F{001}/tmp %k%F{003}%f " "$(build_left_prompt)"
 
-  unset POWERLEVEL9K_LEFT_PROMPT_ELEMENTS
-  unset POWERLEVEL9K_DIR_DEFAULT_VISUAL_IDENTIFIER_COLOR
-  unset POWERLEVEL9K_DIR_DEFAULT_FOREGROUND
-  unset POWERLEVEL9K_DIR_DEFAULT_BACKGROUND
-  unset POWERLEVEL9K_FOLDER_ICON
   cd -
 }
 
 function testOverwritingIconsWork() {
+  local -a POWERLEVEL9K_LEFT_PROMPT_ELEMENTS
   POWERLEVEL9K_LEFT_PROMPT_ELEMENTS=(dir)
-  POWERLEVEL9K_FOLDER_ICON='icon-here'
+  local POWERLEVEL9K_FOLDER_ICON='icon-here'
   #local testFolder=$(mktemp -d -p p9k)
   # Move testFolder under home folder
   #mv testFolder ~
@@ -106,31 +100,24 @@ function testOverwritingIconsWork() {
   #cd ~/$testFolder
 
   cd /tmp
-  assertEquals "%K{blue} %F{black%}icon-here %F{black}/tmp %k%F{blue}%f " "$(build_left_prompt)"
+  assertEquals "%K{004} %F{000}icon-here %F{000}/tmp %k%F{004}%f " "$(build_left_prompt)"
 
-  unset POWERLEVEL9K_LEFT_PROMPT_ELEMENTS
-  unset POWERLEVEL9K_DIR_FOLDER_ICON
   cd -
   # rm -fr ~/$testFolder
 }
 
 function testNewlineOnRpromptCanBeDisabled() {
-  POWERLEVEL9K_PROMPT_ON_NEWLINE=true
-  POWERLEVEL9K_RPROMPT_ON_NEWLINE=false
-  POWERLEVEL9K_CUSTOM_WORLD='echo world'
-  POWERLEVEL9K_CUSTOM_RWORLD='echo rworld'
+  local POWERLEVEL9K_PROMPT_ON_NEWLINE=true
+  local POWERLEVEL9K_RPROMPT_ON_NEWLINE=false
+  local POWERLEVEL9K_CUSTOM_WORLD='echo world'
+  local POWERLEVEL9K_CUSTOM_RWORLD='echo rworld'
+  local -a POWERLEVEL9K_LEFT_PROMPT_ELEMENTS
   POWERLEVEL9K_LEFT_PROMPT_ELEMENTS=(custom_world)
+  local -a POWERLEVEL9K_RIGHT_PROMPT_ELEMENTS
   POWERLEVEL9K_RIGHT_PROMPT_ELEMENTS=(custom_rworld)
 
   powerlevel9k_prepare_prompts
   assertEquals '$(print_icon MULTILINE_FIRST_PROMPT_PREFIX) world   $(print_icon MULTILINE_LAST_PROMPT_PREFIX) rworld' "$(print -P ${PROMPT}${RPROMPT})"
-
-  unset POWERLEVEL9K_PROMPT_ON_NEWLINE
-  unset POWERLEVEL9K_RPROMPT_ON_NEWLINE
-  unset POWERLEVEL9K_LEFT_PROMPT_ELEMENTS
-  unset POWERLEVEL9K_RIGHT_PROMPT_ELEMENTS
-  unset POWERLEVEL9K_CUSTOM_WORLD
-  unset POWERLEVEL9K_CUSTOM_RWORLD
 }
 
-source shunit2/source/2.1/src/shunit2
+source shunit2/shunit2