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

1 files changed, 52 insertions, 44 deletions

diff --git a/test/segments/command_execution_time.spec b/test/segments/command_execution_time.spec
index 7ad2cb5c..6d2d7ad9 100755
--- a/test/segments/command_execution_time.spec
+++ b/test/segments/command_execution_time.spec
@@ -7,90 +7,98 @@ SHUNIT_PARENT=$0
 
 function setUp() {
   export TERM="xterm-256color"
-  # Load Powerlevel9k
-  source powerlevel9k.zsh-theme
 }
 
 function testCommandExecutionTimeIsNotShownIfTimeIsBelowThreshold() {
+  local -a POWERLEVEL9K_LEFT_PROMPT_ELEMENTS
   POWERLEVEL9K_LEFT_PROMPT_ELEMENTS=(custom_world command_execution_time)
-  POWERLEVEL9K_CUSTOM_WORLD='echo world'
-  _P9K_COMMAND_DURATION=2
+  local POWERLEVEL9K_CUSTOM_WORLD='echo world'
+
+  # Load Powerlevel9k
+  source powerlevel9k.zsh-theme
 
-  assertEquals "%K{white} %F{black}world %k%F{white}%f " "$(build_left_prompt)"
+  # Override payload
+  local _P9K_COMMAND_DURATION=2
 
-  unset POWERLEVEL9K_LEFT_PROMPT_ELEMENTS
-  unset POWERLEVEL9K_CUSTOM_WORLD
-  unset _P9K_COMMAND_DURATION
+  assertEquals "%K{007} %F{000}world %k%F{007}%f " "$(build_left_prompt)"
 }
 
 function testCommandExecutionTimeThresholdCouldBeChanged() {
+  local -a POWERLEVEL9K_LEFT_PROMPT_ELEMENTS
   POWERLEVEL9K_LEFT_PROMPT_ELEMENTS=(command_execution_time)
-  POWERLEVEL9K_COMMAND_EXECUTION_TIME_THRESHOLD=1
-  _P9K_COMMAND_DURATION=2.03
+  local POWERLEVEL9K_COMMAND_EXECUTION_TIME_THRESHOLD=1
 
-  assertEquals "%K{red} %F{yellow1%}Dur %F{yellow1}2.03 %k%F{red}%f " "$(build_left_prompt)"
+  # Load Powerlevel9k
+  source powerlevel9k.zsh-theme
+
+  # Override payload
+  local _P9K_COMMAND_DURATION=2.03
 
-  unset POWERLEVEL9K_LEFT_PROMPT_ELEMENTS
-  unset _P9K_COMMAND_DURATION
-  unset POWERLEVEL9K_COMMAND_EXECUTION_TIME_THRESHOLD
+  assertEquals "%K{001} %F{226}Dur %F{226}2.03 %k%F{001}%f " "$(build_left_prompt)"
 }
 
 function testCommandExecutionTimeThresholdCouldBeSetToZero() {
+  local -a POWERLEVEL9K_LEFT_PROMPT_ELEMENTS
   POWERLEVEL9K_LEFT_PROMPT_ELEMENTS=(command_execution_time)
-  POWERLEVEL9K_COMMAND_EXECUTION_TIME_THRESHOLD=0
-  _P9K_COMMAND_DURATION=0.03
-
-  assertEquals "%K{red} %F{yellow1%}Dur %F{yellow1}0.03 %k%F{red}%f " "$(build_left_prompt)"
+  local POWERLEVEL9K_COMMAND_EXECUTION_TIME_THRESHOLD=0
+  local _P9K_COMMAND_DURATION=0.03
 
-  unset POWERLEVEL9K_LEFT_PROMPT_ELEMENTS
-  unset _P9K_COMMAND_DURATION
-  unset POWERLEVEL9K_COMMAND_EXECUTION_TIME_THRESHOLD
+  assertEquals "%K{001} %F{226}Dur %F{226}0.03 %k%F{001}%f " "$(build_left_prompt)"
 }
 
 function testCommandExecutionTimePrecisionCouldBeChanged() {
+  local -a POWERLEVEL9K_LEFT_PROMPT_ELEMENTS
   POWERLEVEL9K_LEFT_PROMPT_ELEMENTS=(command_execution_time)
-  POWERLEVEL9K_COMMAND_EXECUTION_TIME_THRESHOLD=0
-  POWERLEVEL9K_COMMAND_EXECUTION_TIME_PRECISION=4
-  _P9K_COMMAND_DURATION=0.0001
+  local POWERLEVEL9K_COMMAND_EXECUTION_TIME_THRESHOLD=0
+  local POWERLEVEL9K_COMMAND_EXECUTION_TIME_PRECISION=4
 
-  assertEquals "%K{red} %F{yellow1%}Dur %F{yellow1}0.0001 %k%F{red}%f " "$(build_left_prompt)"
+  # Load Powerlevel9k
+  source powerlevel9k.zsh-theme
 
-  unset POWERLEVEL9K_LEFT_PROMPT_ELEMENTS
-  unset _P9K_COMMAND_DURATION
-  unset POWERLEVEL9K_COMMAND_EXECUTION_TIME_PRECISION
-  unset POWERLEVEL9K_COMMAND_EXECUTION_TIME_THRESHOLD
+  # Override payload
+  local _P9K_COMMAND_DURATION=0.0001
+
+  assertEquals "%K{001} %F{226}Dur %F{226}0.0001 %k%F{001}%f " "$(build_left_prompt)"
 }
 
 function testCommandExecutionTimePrecisionCouldBeSetToZero() {
+  local -a POWERLEVEL9K_LEFT_PROMPT_ELEMENTS
   POWERLEVEL9K_LEFT_PROMPT_ELEMENTS=(command_execution_time)
-  POWERLEVEL9K_COMMAND_EXECUTION_TIME_PRECISION=0
-  _P9K_COMMAND_DURATION=23.5001
+  local POWERLEVEL9K_COMMAND_EXECUTION_TIME_PRECISION=0
 
-  assertEquals "%K{red} %F{yellow1%}Dur %F{yellow1}23 %k%F{red}%f " "$(build_left_prompt)"
+  # Load Powerlevel9k
+  source powerlevel9k.zsh-theme
 
-  unset POWERLEVEL9K_LEFT_PROMPT_ELEMENTS
-  unset _P9K_COMMAND_DURATION
-  unset POWERLEVEL9K_COMMAND_EXECUTION_TIME_PRECISION
+  # Override payload
+  local _P9K_COMMAND_DURATION=23.5001
+
+  assertEquals "%K{001} %F{226}Dur %F{226}23 %k%F{001}%f " "$(build_left_prompt)"
 }
 
 function testCommandExecutionTimeIsFormattedHumandReadbleForMinuteLongCommand() {
+  local -a POWERLEVEL9K_LEFT_PROMPT_ELEMENTS
   POWERLEVEL9K_LEFT_PROMPT_ELEMENTS=(command_execution_time)
-  _P9K_COMMAND_DURATION=180
 
-  assertEquals "%K{red} %F{yellow1%}Dur %F{yellow1}03:00 %k%F{red}%f " "$(build_left_prompt)"
+  # Load Powerlevel9k
+  source powerlevel9k.zsh-theme
+
+  # Override payload
+  local _P9K_COMMAND_DURATION=180
 
-  unset POWERLEVEL9K_LEFT_PROMPT_ELEMENTS
-  unset _P9K_COMMAND_DURATION
+  assertEquals "%K{001} %F{226}Dur %F{226}03:00 %k%F{001}%f " "$(build_left_prompt)"
 }
 
 function testCommandExecutionTimeIsFormattedHumandReadbleForHourLongCommand() {
+  local -a POWERLEVEL9K_LEFT_PROMPT_ELEMENTS
   POWERLEVEL9K_LEFT_PROMPT_ELEMENTS=(command_execution_time)
-  _P9K_COMMAND_DURATION=7200
 
-  assertEquals "%K{red} %F{yellow1%}Dur %F{yellow1}02:00:00 %k%F{red}%f " "$(build_left_prompt)"
+  # Load Powerlevel9k
+  source powerlevel9k.zsh-theme
+
+  # Override payload
+  local _P9K_COMMAND_DURATION=7200
 
-  unset POWERLEVEL9K_LEFT_PROMPT_ELEMENTS
-  unset _P9K_COMMAND_DURATION
+  assertEquals "%K{001} %F{226}Dur %F{226}02:00:00 %k%F{001}%f " "$(build_left_prompt)"
 }
 
-source shunit2/source/2.1/src/shunit2
\ No newline at end of file
+source shunit2/shunit2
\ No newline at end of file