Merge branch 'add_tests' into prepare_066

1 files changed, 21 insertions, 19 deletions

diff --git a/test/segments/laravel_version.spec b/test/segments/laravel_version.spec
index 6133b19a..c83edfaf 100755
--- a/test/segments/laravel_version.spec
+++ b/test/segments/laravel_version.spec
@@ -7,8 +7,6 @@ SHUNIT_PARENT=$0
 
 function setUp() {
   export TERM="xterm-256color"
-  # Load Powerlevel9k
-  source powerlevel9k.zsh-theme
 }
 
 function mockLaravelVersion() {
@@ -28,43 +26,47 @@ function mockNoLaravelVersion() {
 }
 
 function testLaravelVersionSegment() {
-  alias php=mockLaravelVersion
-  POWERLEVEL9K_LARAVEL_ICON='x'
+  local -a POWERLEVEL9K_LEFT_PROMPT_ELEMENTS
   POWERLEVEL9K_LEFT_PROMPT_ELEMENTS=(laravel_version)
+  local POWERLEVEL9K_LARAVEL_ICON='x'
+  alias php=mockLaravelVersion
+
+  # Load Powerlevel9k
+  source powerlevel9k.zsh-theme
 
   assertEquals "%K{001} %F{white%}x %f%F{white}5.4.23 %k%F{maroon}%f " "$(build_left_prompt)"
 
-  unset POWERLEVEL9K_LEFT_PROMPT_ELEMENTS
-  unset POWERLEVEL9K_LARAVEL_ICON
   unalias php
 }
 
 function testLaravelVersionSegmentIfArtisanIsNotAvailable() {
-  alias php=mockNoLaravelVersion
-  POWERLEVEL9K_CUSTOM_WORLD='echo world'
-  POWERLEVEL9K_LARAVEL_ICON='x'
+  local -a POWERLEVEL9K_LEFT_PROMPT_ELEMENTS
   POWERLEVEL9K_LEFT_PROMPT_ELEMENTS=(custom_world laravel_version)
+  local POWERLEVEL9K_CUSTOM_WORLD='echo world'
+  local POWERLEVEL9K_LARAVEL_ICON='x'
+  alias php=mockNoLaravelVersion
+
+  # Load Powerlevel9k
+  source powerlevel9k.zsh-theme
 
   assertEquals "%K{white} %F{black}world %k%F{white}%f " "$(build_left_prompt)"
 
-  unset POWERLEVEL9K_LEFT_PROMPT_ELEMENTS
-  unset POWERLEVEL9K_LARAVEL_ICON
-  unset POWERLEVEL9K_CUSTOM_WORLD
   unalias php
 }
 
 function testLaravelVersionSegmentPrintsNothingIfPhpIsNotAvailable() {
-  alias php=noPhp
-  POWERLEVEL9K_CUSTOM_WORLD='echo world'
-  POWERLEVEL9K_LARAVEL_ICON='x'
+  local -a POWERLEVEL9K_LEFT_PROMPT_ELEMENTS
   POWERLEVEL9K_LEFT_PROMPT_ELEMENTS=(custom_world laravel_version)
+  local POWERLEVEL9K_CUSTOM_WORLD='echo world'
+  local POWERLEVEL9K_LARAVEL_ICON='x'
+  alias php=noPhp
+
+  # Load Powerlevel9k
+  source powerlevel9k.zsh-theme
 
   assertEquals "%K{white} %F{black}world %k%F{white}%f " "$(build_left_prompt)"
 
-  unset POWERLEVEL9K_LEFT_PROMPT_ELEMENTS
-  unset POWERLEVEL9K_LARAVEL_ICON
-  unset POWERLEVEL9K_CUSTOM_WORLD
   unalias php
 }
 
-source shunit2/source/2.1/src/shunit2
+source shunit2/shunit2