Merge branch 'fix_colors' into prepare_066

This commit is contained in:
Dominik Ritter 2018-08-08 01:54:55 +02:00
commit c7e543ff23
39 changed files with 589 additions and 601 deletions

View file

@ -40,7 +40,7 @@ function testColorOverridingForCleanStateWorks() {
# Load Powerlevel9k
source ${P9K_HOME}/powerlevel9k.zsh-theme
assertEquals "%K{white} %F{cyan} default %k%F{white}%f " "$(build_left_prompt)"
assertEquals "%K{015} %F{014} default %k%F{015}%f " "$(build_left_prompt)"
}
function testColorOverridingForModifiedStateWorks() {
@ -57,7 +57,7 @@ function testColorOverridingForModifiedStateWorks() {
# Load Powerlevel9k
source ${P9K_HOME}/powerlevel9k.zsh-theme
assertEquals "%K{yellow} %F{red} default %k%F{yellow}%f " "$(build_left_prompt)"
assertEquals "%K{011} %F{009} default %k%F{011}%f " "$(build_left_prompt)"
}
# There is no staging area in mercurial, therefore there are no "untracked"
@ -74,7 +74,7 @@ function testAddedFilesIconWorks() {
# Load Powerlevel9k
source ${P9K_HOME}/powerlevel9k.zsh-theme
assertEquals "%K{yellow} %F{black} default %k%F{yellow}%f " "$(build_left_prompt)"
assertEquals "%K{011} %F{000} default %k%F{011}%f " "$(build_left_prompt)"
}
# We don't support tagging in mercurial right now..
@ -92,7 +92,7 @@ function testTagIconWorks() {
# Load Powerlevel9k
source ${P9K_HOME}/powerlevel9k.zsh-theme
assertEquals "%K{green} %F{black} default Tv0.0.1 %k%F{green}%f " "$(build_left_prompt)"
assertEquals "%K{002} %F{000} default Tv0.0.1 %k%F{002}%f " "$(build_left_prompt)"
}
function testTagIconInDetachedHeadState() {
@ -114,7 +114,7 @@ function testTagIconInDetachedHeadState() {
# Load Powerlevel9k
source ${P9K_HOME}/powerlevel9k.zsh-theme
assertEquals "%K{green} %F{black} ${hash} Tv0.0.1 %k%F{green}%f " "$(build_left_prompt)"
assertEquals "%K{002} %F{000} ${hash} Tv0.0.1 %k%F{002}%f " "$(build_left_prompt)"
}
function testActionHintWorks() {
@ -137,7 +137,7 @@ function testActionHintWorks() {
# Load Powerlevel9k
source ${P9K_HOME}/powerlevel9k.zsh-theme
assertEquals "%K{yellow} %F{black} default %F{red}| merging%f %k%F{yellow}%f " "$(build_left_prompt)"
assertEquals "%K{011} %F{000} default %F{red}| merging%f %k%F{011}%f " "$(build_left_prompt)"
}
function testShorteningCommitHashWorks() {
@ -158,7 +158,7 @@ function testShorteningCommitHashWorks() {
# the changeset is truncated.
powerlevel9k_vcs_init
assertEquals "%K{green} %F{black}${hash} default %k%F{green}%f " "$(build_left_prompt)"
assertEquals "%K{002} %F{000}${hash} default %k%F{002}%f " "$(build_left_prompt)"
}
function testShorteningCommitHashIsNotShownIfShowChangesetIsFalse() {
@ -178,7 +178,7 @@ function testShorteningCommitHashIsNotShownIfShowChangesetIsFalse() {
# the changeset is truncated.
powerlevel9k_vcs_init
assertEquals "%K{green} %F{black} default %k%F{green}%f " "$(build_left_prompt)"
assertEquals "%K{002} %F{000} default %k%F{002}%f " "$(build_left_prompt)"
}
function testMercurialIconWorks() {
@ -189,7 +189,7 @@ function testMercurialIconWorks() {
# Load Powerlevel9k
source ${P9K_HOME}/powerlevel9k.zsh-theme
assertEquals "%K{green} %F{black%}HG-Icon %f%F{black} default %k%F{green}%f " "$(build_left_prompt)"
assertEquals "%K{002} %F{000%}HG-Icon %f%F{000} default %k%F{002}%f " "$(build_left_prompt)"
}
function testBookmarkIconWorks() {
@ -201,7 +201,7 @@ function testBookmarkIconWorks() {
# Load Powerlevel9k
source ${P9K_HOME}/powerlevel9k.zsh-theme
assertEquals "%K{green} %F{black} default Binitial %k%F{green}%f " "$(build_left_prompt)"
assertEquals "%K{002} %F{000} default Binitial %k%F{002}%f " "$(build_left_prompt)"
}
source shunit2/shunit2