Merge remote-tracking branch 'ben/master' into HEAD

This commit is contained in:
Dominik Ritter 2019-02-03 19:35:11 +01:00
commit 06151eeba9
35 changed files with 219 additions and 165 deletions

View file

@ -337,7 +337,7 @@ function testPublicIpSegmentWithVPNTurnedOnLinux() {
# Fake ip command
fakeIp "tun1"
assertEquals "%K{000} %F{007}(vpn) %f%F{007}1.2.3.4 " "$(prompt_public_ip left 1 false "$FOLDER")"
assertEquals "%K{000} %F{007}(vpn) %F{007}1.2.3.4 " "$(prompt_public_ip left 1 false "$FOLDER")"
}
function testPublicIpSegmentWithVPNTurnedOnOsx() {
@ -357,7 +357,7 @@ function testPublicIpSegmentWithVPNTurnedOnOsx() {
# Fake ifconfig
fakeIfconfig "tun1"
assertEquals "%K{000} %F{007}(vpn) %f%F{007}1.2.3.4 " "$(prompt_public_ip left 1 false "$FOLDER")"
assertEquals "%K{000} %F{007}(vpn) %F{007}1.2.3.4 " "$(prompt_public_ip left 1 false "$FOLDER")"
unfunction stat
}
@ -379,7 +379,7 @@ function testPublicIpSegmentWithVPNTurnedOnAndFuzzyMatchingOnOsx() {
# Fake ifconfig
fakeIfconfig "tun3"
assertEquals "%K{000} %F{007}(vpn) %f%F{007}1.2.3.4 " "$(prompt_public_ip left 1 false "$FOLDER")"
assertEquals "%K{000} %F{007}(vpn) %F{007}1.2.3.4 " "$(prompt_public_ip left 1 false "$FOLDER")"
unfunction stat
}